Skip to content

Commit 4cd3b0e

Browse files
authored
Cleanup RelaxedAliasChecking configuration setting (#7982)
1 parent 987d6ac commit 4cd3b0e

File tree

5 files changed

+203
-267
lines changed

5 files changed

+203
-267
lines changed

builds/install/misc/firebird.conf

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -676,32 +676,6 @@
676676
#BugcheckAbort = 0
677677

678678

679-
# ----------------------------
680-
# Relaxing relation alias checking rules in SQL
681-
#
682-
# Since Firebird 2.0, strict alias checking rules were implemented in the SQL
683-
# parser to accord with the SQL standard requirements. This setting allows
684-
# these rules to be relaxed in order to allow legacy applications to run on
685-
# Firebird 2.0.
686-
# A setting of 1 (true) allows the parser to resolve a qualified column reference
687-
# using the relation name, where an alias has been specified for that relation.
688-
#
689-
# For example, it allows a query such as:
690-
# SELECT TABLE.X FROM TABLE A
691-
#
692-
# It is not recommended to enable this setting. It should be regarded as an
693-
# interim workaround for porting untidy legacy code, until it is possible to
694-
# revise such code.
695-
#
696-
# CAUTION!
697-
# There is no guarantee that this setting will be available in future Firebird
698-
# versions.
699-
#
700-
# Type: boolean
701-
#
702-
#RelaxedAliasChecking = 0
703-
704-
705679
# ----------------------------
706680
# The engine currently provides statement-level read consistency in READ COMMITTED
707681
# mode by default. In this mode, rec_version/no_rec_version transaction flags have

src/common/classes/MetaString.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ class MetaString
7070

7171
MetaString& assign(const char* s, FB_SIZE_T l);
7272
MetaString& assign(const char* s) { return assign(s, s ? fb_strlen(s) : 0); }
73+
MetaString& clear() { return assign(nullptr, 0); }
7374
MetaString& operator=(const char* s) { return assign(s); }
7475
MetaString& operator=(const AbstractString& s) { return assign(s.c_str(), s.length()); }
7576
MetaString& operator=(const MetaString& m) { return set(m); }

src/common/config/config.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ enum ConfigKey
153153
KEY_REDIRECTION,
154154
KEY_DATABASE_GROWTH_INCREMENT,
155155
KEY_FILESYSTEM_CACHE_THRESHOLD,
156-
KEY_RELAXED_ALIAS_CHECKING,
157156
KEY_TRACE_CONFIG,
158157
KEY_MAX_TRACELOG_SIZE,
159158
KEY_FILESYSTEM_CACHE_SIZE,
@@ -258,7 +257,6 @@ constexpr ConfigEntry entries[MAX_CONFIG_KEY] =
258257
{TYPE_BOOLEAN, "Redirection", true, false},
259258
{TYPE_INTEGER, "DatabaseGrowthIncrement", false, 128 * 1048576}, // bytes
260259
{TYPE_INTEGER, "FileSystemCacheThreshold", false, 65536}, // page buffers
261-
{TYPE_BOOLEAN, "RelaxedAliasChecking", true, false}, // if true relax strict alias checking rules in DSQL a bit
262260
{TYPE_STRING, "AuditTraceConfigFile", true, ""}, // location of audit trace configuration file
263261
{TYPE_INTEGER, "MaxUserTraceLogSize", true, 10}, // maximum size of user session trace log
264262
{TYPE_INTEGER, "FileSystemCacheSize", true, 0}, // percent
@@ -578,8 +576,6 @@ class Config : public RefCounted, public GlobalStorage
578576

579577
CONFIG_GET_GLOBAL_KEY(FB_UINT64, getFileSystemCacheSize, KEY_FILESYSTEM_CACHE_SIZE, getInt);
580578

581-
CONFIG_GET_GLOBAL_BOOL(getRelaxedAliasChecking, KEY_RELAXED_ALIAS_CHECKING);
582-
583579
CONFIG_GET_GLOBAL_STR(getAuditTraceConfigFile, KEY_TRACE_CONFIG);
584580

585581
CONFIG_GET_GLOBAL_KEY(FB_UINT64, getMaxUserTraceLogSize, KEY_MAX_TRACELOG_SIZE, getInt);

0 commit comments

Comments
 (0)