Merge remote-tracking branch 'origin/master' into add_cleanup_journal

* origin/master: (80 commits)
  increment build number
  Fix conversion warnings in TableValueFunctionScan
  Fix conversion warnings in inf
  Fix compiler warning in filters
  Silence unused warning in ExtDS
  Fix conversion warnings in blob
  Fix conversion warnings in ConfigTable
  Fix conversion warnings in dsql and Parser/parse
  Fix regression in #6278 pointed by Pavel Zotov.
  Fix conversion warnings in gen, dfw, scl
  Fix conversion warnings in ini
  Fix conversion warnings gbak (burp)
  Fix conversion warnings in TracePluginImpl
  Fix conversion warnings
  Fix conversion warnings in inet/remote
  Fix conversion warnings in ISQL
  increment build number
  Fix conversion warning in LegacyManagement
  Fix conversion warning in DoublyLinkedList
  Fix conversion warnings in tests
  ...

Author: XaBbl4

doc/sql.extensions/README.schemas.md

@@ -76,6 +76,8 @@ you can reset the current search path to its initial configuration with the `ALT
 
 Nonexistent schemas can be included in the search path but are ignored during name resolution.
 
+If `SYSTEM` is not included in the schema list, it is automatically added as the last schema in the search path.
+
 The first existing schema in the search path is referred to as the **current schema** and is exclusively used in some 
 operations.
 
@@ -103,7 +105,7 @@ create or alter function F1 returns integer as begin end;
 grant create table to user USER1;
 ```
 
-For `ALTER`, `DROP`, and others statements, the system searches for the specified object across all schemas in the 
+For `ALTER`, `DROP`, and others statements, Firebird searches for the specified object across all schemas in the 
 search path. The reference is bound to the first matching object found. If no matching object exists in any schema, an 
 error is raised.
 
@@ -133,8 +135,7 @@ In this case, the search path is used to locate `TABLE1`, `DOMAIN1`, and `TABLE2
 
 For DDL statements, the search path operates similarly, but with a subtle difference. Once the object being created or 
 modified is bound to a schema during statement preparation, the search path is implicitly and temporarily modified. 
-This adjustment sets the search path to the schema of the object. Additionally, if the `SYSTEM` schema was already 
-present in the search path, it is appended as the last schema.
+This adjustment sets the search path to the schema of the object with `SYSTEM` added as the final schema in the path.
 
 ```sql
 create schema SCHEMA1;
@@ -198,8 +199,8 @@ grant select on table SCHEMA1.TABLE1 to user USER2;
 ## The SYSTEM schema
 
 All system schema-bound objects (e.g., `RDB$*` and `MON$*`) are now created in a dedicated schema called `SYSTEM`. 
-The `SYSTEM` schema has a default `USAGE` permission granted to `PUBLIC` and is included in the default search path. 
-This ensures backward compatibility with previous Firebird versions.
+The `SYSTEM` schema has a default `USAGE` permission granted to `PUBLIC` and is automatically included in the 
+search path. This ensures backward compatibility with previous Firebird versions.
 
 While the `SYSTEM` schema allows operations like index creation and manipulation of those indexes, it is otherwise 
 locked for DDL changes. Modifying objects within the `SYSTEM` schema through DDL operations is strongly discouraged.
@@ -265,6 +266,8 @@ schema exists, it returns `NULL`.
 SET SEARCH_PATH TO <schema name> [, <schema name>]...
 ```
 
+If `SYSTEM` is not included in the schema list, it is automatically added as the last schema in the search path.
+
 ### RDB$GET_CONTEXT
 
 #### CURRENT_SCHEMA (SYSTEM)
@@ -626,8 +629,7 @@ slave side. This allows mapping database objects to a specific schema using a se
 ## System packages and functions
 
 Firebird includes system packages such as `RDB$TIME_ZONE_UTIL`, `RDB$PROFILER`, and others. These system packages 
-are now located in the `SYSTEM` schema. If the `SYSTEM` schema is not included in the search path, their usage 
-requires explicit qualification with `SYSTEM`, as with any other object bound to the `SYSTEM` schema.
+are now located in the `SYSTEM` schema.
 
 In contrast, Firebird also provides non-packaged built-in functions like `RDB$GET_CONTEXT`, `ABS`, and `DATEDIFF`. 
 These functions are not listed in the database metadata (`RDB$FUNCTIONS`) and neither require nor accept the 

examples/dbcrypt/CryptApplication.cpp

@@ -113,7 +113,7 @@ class App
 			throw "setDbCryptCallback";
 
 		char s[256];
-		sprintf(s, "localhost:%s", dbName);
+		snprintf(s, sizeof(s), "localhost:%s", dbName);
 		att = p->attachDatabase(status, s, 0, NULL);
 		if (status->getState() & IStatus::STATE_ERRORS)
 			throw "attachDatabase";

examples/empbuild/empbuild.epp

@@ -74,7 +74,7 @@ else
 /* Create the database */
 
 printf ("creating database %s\n", Db_name);
-sprintf (cmd, "CREATE DATABASE \"%s\"", Db_name);
+snprintf(cmd, sizeof(cmd), "CREATE DATABASE \"%s\"", Db_name);
 gds_trans = 0;
 
 EXEC SQL EXECUTE IMMEDIATE :cmd;
@@ -94,39 +94,39 @@ if (SQLCODE)
     }
 
 printf ("Turning forced writes off\n");
-sprintf (cmd, "gfix -write async %s", Db_name);
+snprintf(cmd, sizeof(cmd), "gfix -write async %s", Db_name);
 if (system (cmd))
     {
     printf ("Couldn't turn forced writes off\n");
     exit (FINI_ERROR);
     }
 
 printf ("Creating tables\n");
-sprintf (cmd, "isql %s -q -i empddl.sql", Db_name);
+snprintf(cmd, sizeof(cmd), "isql %s -q -i empddl.sql", Db_name);
 if (system (cmd))
     {
     printf ("Couldn't create tables \n");
     exit (FINI_ERROR);
     }
 
 printf ("Turning  off indices and triggers \n");
-sprintf (cmd, "isql %s -i indexoff.sql", Db_name);
+snprintf(cmd, sizeof(cmd), "isql %s -i indexoff.sql", Db_name);
 if (system (cmd))
     {
     printf ("Couldn't turn off indices and triggers \n");
     exit (FINI_ERROR);
     }
 
 printf ("Loading  column data\n");
-sprintf (cmd, "isql %s -i empdml.sql", Db_name);
+snprintf(cmd, sizeof(cmd), "isql %s -i empdml.sql", Db_name);
 if (system (cmd))
     {
     printf ("Couldn't load column data \n");
     exit (FINI_ERROR);
     }
 
 printf ("Turning  on indices and triggers \n");
-sprintf (cmd, "isql %s -i indexon.sql", Db_name);
+snprintf(cmd, sizeof(cmd), "isql %s -i indexon.sql", Db_name);
 if (system (cmd))
     {
     printf ("Couldn't turn on indices and triggers \n");

examples/extauth/TcWrapper.cpp

@@ -58,7 +58,7 @@ void check(ThrowStatusWrapper* status, int err, const char* text)
 		return;
 
 	char buf[256];
-	sprintf(buf, "%s: %s", text, error_to_string(err));
+	snprintf(buf, sizeof(buf), "%s: %s", text, error_to_string(err));
 	error(status, buf);
 }
 

examples/interfaces/04.print_table.cpp

@@ -106,7 +106,7 @@ int main()
 
 			default:
 				{
-					sprintf(s, "Unknown type %d for %s", t, meta->getField(&status, j));
+					snprintf(s, sizeof(s), "Unknown type %d for %s", t, meta->getField(&status, j));
 					throw s;
 				}
 				continue;

examples/replication/fbSampleReplicator.cpp

@@ -124,7 +124,7 @@ static const ISC_STATUS wrn[] = { isc_arg_gds, isc_random, isc_arg_string, (ISC_
 ReplPlugin::ReplPlugin(IPluginConfig* conf)
 {
 	char fn[100];
-	sprintf(fn, "session_%08x_%d.log", (unsigned)time(nullptr), logCounter++);
+	snprintf(fn, sizeof(fn), "session_%08x_%d.log", (unsigned)time(nullptr), logCounter++);
 	log = fopen(fn, "w");
 	WriteLog(log, "%p\tReplicatedSession constructed\n", this);
 	status = master->getStatus();

examples/udr/Triggers.cpp

@@ -135,7 +135,8 @@ FB_UDR_BEGIN_TRIGGER(replicate)
 			const char* name = triggerMetadata->getField(status, i);
 
 			strcat(buffer, "    p");
-			sprintf(buffer + strlen(buffer), "%d type of column \"%s\".\"%s\" = ?", i, table, name);
+			const size_t buflen = strlen(buffer);
+			snprintf(buffer + buflen, sizeof(buffer) - buflen, "%d type of column \"%s\".\"%s\" = ?", i, table, name);
 		}
 
 		strcat(buffer,
@@ -175,7 +176,8 @@ FB_UDR_BEGIN_TRIGGER(replicate)
 			if (i > 0)
 				strcat(buffer, ", ");
 			strcat(buffer, ":p");
-			sprintf(buffer + strlen(buffer), "%d", i);
+			const size_t buflen = strlen(buffer);
+			snprintf(buffer + buflen, sizeof(buffer) - buflen, "%d", i);
 		}
 
 		strcat(buffer, ")\n        on external data source '");

extern/cloop/src/cloop/Action.cpp

@@ -77,10 +77,13 @@ void IfThenElseAction::generate(const ActionParametersBlock& apb, unsigned ident
 void CallAction::generate(const ActionParametersBlock& apb, unsigned ident)
 {
 	identify(apb, ident);
-	fprintf(apb.out, "%s(", name.c_str());
+	fprintf(apb.out, "%s(", (apb.language == LANGUAGE_PASCAL ? PascalGenerator::escapeName(name) : name).c_str());
 	for (auto itr = parameters.begin(); itr != parameters.end(); ++itr)
 	{
-		fprintf(apb.out, "%s%s", itr == parameters.begin() ? "" : ", ", itr->c_str());
+		string parname = *itr;
+		if (apb.language == LANGUAGE_PASCAL)
+			parname = PascalGenerator::escapeName(parname);
+		fprintf(apb.out, "%s%s", itr == parameters.begin() ? "" : ", ", parname.c_str());
 	}
 	fprintf(apb.out, ");\n");
 }

extern/cloop/src/cloop/Generator.cpp

@@ -1019,7 +1019,7 @@ void PascalGenerator::generate()
 		 ++i)
 	{
 		Interface* interface = *i;
-		fprintf(out, "\t%s = class;\n", escapeName(interface->name, true).c_str());
+		fprintf(out, "\t%s = class;\n", escapeIfaceName(interface->name).c_str());
 	}
 
 	fprintf(out, "\n");
@@ -1077,9 +1077,9 @@ void PascalGenerator::generate()
 				 !method->returnTypeRef.isPointer;
 
 			fprintf(out, "\t%s_%sPtr = %s(this: %s",
-				escapeName(interface->name, true).c_str(), escapeName(method->name).c_str(),
+				escapeIfaceName(interface->name).c_str(), escapeName(method->name).c_str(),
 				(isProcedure ? "procedure" : "function"),
-				escapeName(interface->name, true).c_str());
+				escapeIfaceName(interface->name).c_str());
 
 			for (vector<Parameter*>::iterator k = method->parameters.begin();
 				 k != method->parameters.end();
@@ -1123,15 +1123,15 @@ void PascalGenerator::generate()
 			Method* method = *j;
 
 			fprintf(out, "\t\t%s: %s_%sPtr;\n", escapeName(method->name).c_str(),
-				escapeName(interface->name, true).c_str(), escapeName(method->name).c_str());
+				escapeIfaceName(interface->name).c_str(), escapeName(method->name).c_str());
 		}
 
 		fprintf(out, "\tend;\n\n");
 
-		fprintf(out, "\t%s = class", escapeName(interface->name, true).c_str());
+		fprintf(out, "\t%s = class", escapeIfaceName(interface->name).c_str());
 
 		if (interface->super)
-			fprintf(out, "(%s)", escapeName(interface->super->name, true).c_str());
+			fprintf(out, "(%s)", escapeIfaceName(interface->super->name).c_str());
 
 		fprintf(out, "\n");
 
@@ -1196,7 +1196,7 @@ void PascalGenerator::generate()
 		fprintf(out, "\tend;\n\n");
 
 		fprintf(out, "\t%sImpl = class(%s)\n",
-			escapeName(interface->name, true).c_str(), escapeName(interface->name, true).c_str());
+			escapeIfaceName(interface->name).c_str(), escapeIfaceName(interface->name).c_str());
 		fprintf(out, "\t\tconstructor create;\n\n");
 
 		deque<Method*> methods;
@@ -1262,7 +1262,7 @@ void PascalGenerator::generate()
 
 			fprintf(out, "%s %s.%s(",
 				(isProcedure ? "procedure" : "function"),
-				escapeName(interface->name, true).c_str(),
+				escapeIfaceName(interface->name).c_str(),
 				escapeName(method->name).c_str());
 
 			for (vector<Parameter*>::iterator k = method->parameters.begin();
@@ -1360,9 +1360,9 @@ void PascalGenerator::generate()
 
 			fprintf(out, "%s %sImpl_%sDispatcher(this: %s",
 				(isProcedure ? "procedure" : "function"),
-				escapeName(interface->name, true).c_str(),
+				escapeIfaceName(interface->name).c_str(),
 				escapeName(method->name).c_str(),
-				escapeName(interface->name, true).c_str());
+				escapeIfaceName(interface->name).c_str());
 
 			for (vector<Parameter*>::iterator k = method->parameters.begin();
 				 k != method->parameters.end();
@@ -1390,7 +1390,7 @@ void PascalGenerator::generate()
 			if (!isProcedure)
 				fprintf(out, "Result := ");
 
-			fprintf(out, "%sImpl(this).%s(", escapeName(interface->name, true).c_str(),
+			fprintf(out, "%sImpl(this).%s(", escapeIfaceName(interface->name).c_str(),
 				escapeName(method->name).c_str());
 
 			for (vector<Parameter*>::iterator k = method->parameters.begin();
@@ -1428,7 +1428,7 @@ void PascalGenerator::generate()
 			{
 				fprintf(out, "%s %sImpl.%s(",
 					(isProcedure ? "procedure" : "function"),
-					escapeName(interface->name, true).c_str(),
+					escapeIfaceName(interface->name).c_str(),
 					escapeName(method->name).c_str());
 
 				for (vector<Parameter*>::iterator k = method->parameters.begin();
@@ -1455,11 +1455,11 @@ void PascalGenerator::generate()
 
 		fprintf(out, "var\n");
 		fprintf(out, "\t%sImpl_vTable: %sVTable;\n\n",
-			escapeName(interface->name, true).c_str(), escapeName(interface->name).c_str());
+			escapeIfaceName(interface->name).c_str(), escapeName(interface->name).c_str());
 
-		fprintf(out, "constructor %sImpl.create;\n", escapeName(interface->name, true).c_str());
+		fprintf(out, "constructor %sImpl.create;\n", escapeIfaceName(interface->name).c_str());
 		fprintf(out, "begin\n");
-		fprintf(out, "\tvTable := %sImpl_vTable;\n", escapeName(interface->name, true).c_str());
+		fprintf(out, "\tvTable := %sImpl_vTable;\n", escapeIfaceName(interface->name).c_str());
 		fprintf(out, "end;\n\n");
 	}
 
@@ -1479,18 +1479,18 @@ void PascalGenerator::generate()
 			methods.insert(methods.begin(), p->methods.begin(), p->methods.end());
 
 		fprintf(out, "\t%sImpl_vTable := %sVTable.create;\n",
-			escapeName(interface->name, true).c_str(), escapeName(interface->name).c_str());
+			escapeIfaceName(interface->name).c_str(), escapeName(interface->name).c_str());
 		fprintf(out, "\t%sImpl_vTable.version := %d;\n",
-			escapeName(interface->name, true).c_str(), interface->version);
+			escapeIfaceName(interface->name).c_str(), interface->version);
 
 		for (deque<Method*>::iterator j = methods.begin(); j != methods.end(); ++j)
 		{
 			Method* method = *j;
 
 			fprintf(out, "\t%sImpl_vTable.%s := @%sImpl_%sDispatcher;\n",
-				escapeName(interface->name, true).c_str(),
+				escapeIfaceName(interface->name).c_str(),
 				escapeName(method->name).c_str(),
-				escapeName(interface->name, true).c_str(),
+				escapeIfaceName(interface->name).c_str(),
 				escapeName(method->name).c_str());
 		}
 
@@ -1504,7 +1504,7 @@ void PascalGenerator::generate()
 		 ++i)
 	{
 		Interface* interface = *i;
-		fprintf(out, "\t%sImpl_vTable.destroy;\n", escapeName(interface->name, true).c_str());
+		fprintf(out, "\t%sImpl_vTable.destroy;\n", escapeIfaceName(interface->name).c_str());
 	}
 
 	fprintf(out, "\n");
@@ -1577,7 +1577,7 @@ string PascalGenerator::convertType(const TypeRef& typeRef)
 	return name;
 }
 
-string PascalGenerator::escapeName(string name, bool interfaceName)
+string PascalGenerator::escapeName(string name)
 {
 	//// TODO: Create a table of keywords.
 
@@ -1592,9 +1592,6 @@ string PascalGenerator::escapeName(string name, bool interfaceName)
 		name += "_";
 	}
 
-	if (interfaceName)
-		name = prefix + name;
-
 	return name;
 }
 

extern/cloop/src/cloop/Generator.h

@@ -127,11 +127,15 @@ class PascalGenerator : public FileGenerator
 
 public:
 	virtual void generate();
+	static std::string escapeName(std::string name);
 
 private:
 	std::string convertParameter(const Parameter& parameter);
 	std::string convertType(const TypeRef& typeRef);
-	std::string escapeName(std::string name, bool interfaceName = false);
+	std::string escapeIfaceName(std::string name)
+	{
+		return prefix + name;
+	}
 
 	void insertFile(const std::string& filename);