refactor: simplify some more calls to Query() with the overloaded variants

Author: ansgarbecker

source/dbconnection.pas

@@ -3360,7 +3360,7 @@ procedure TDBConnection.DoAfterConnect;
     else
       Offset := '-';
     Offset := Offset + Format('%.2d:%.2d', [Abs(Hours), Abs(Minutes)]);
-    Query(FSqlProvider.GetSql(qSetTimezone, [EscapeString(Offset)]));
+    Query(qSetTimezone, [EscapeString(Offset)]);
   end;
 
   // Process startup script
@@ -4299,7 +4299,6 @@ procedure TDBConnection.PrefetchCreateCode(Objects: TDBObjectList);
 procedure TDBConnection.SetDatabase(Value: String);
 var
   s: String;
-  UseQuery: String;
 begin
   Log(lcDebug, 'SetDatabase('+Value+'), FDatabase: '+FDatabase);
   if Value <> FDatabase then begin
@@ -4319,9 +4318,8 @@ procedure TDBConnection.SetDatabase(Value: String);
           s := s + ', ' + EscapeString('public');
       end else
         s := QuoteIdent(Value);
-      UseQuery := FSqlProvider.GetSql(qUSEQuery);
-      if not UseQuery.IsEmpty then begin
-        Query(FSqlProvider.GetSql(qUSEQuery, [s]), False);
+      if FSqlProvider.Has(qUSEQuery) then begin
+        Query(qUSEQuery, [s]);
       end;
       FDatabase := DeQuoteIdent(Value);
       if Assigned(FOnDatabaseChanged) then

source/dbstructures.interbase.pas

@@ -186,7 +186,7 @@ function TInterbaseProvider.GetSql(AId: TQueryId): string;
 begin
   case AId of
     qDatabaseDrop: Result := 'DROP DATABASE %s';
-    qEmptyTable: Result := 'TRUNCATE ';
+    qEmptyTable: Result := 'TRUNCATE %s';
     qRenameTable: Result := 'RENAME TABLE %s TO %s';
     qRenameView: Result := 'RENAME TABLE %s TO %s';
     qCurrentUserHost: Result := IfThen(

source/dbstructures.mssql.pas

@@ -450,7 +450,6 @@ function TMsSqlProvider.GetSql(AId: TQueryId): string;
       'xtype',
       'type'
       );
-    qEmptyTable: Result := 'DELETE FROM ';
     qRenameTable: Result := 'EXEC sp_rename %s, %s';
     qRenameView: Result := 'EXEC sp_rename %s, %s';
     qCurrentUserHost: Result := 'SELECT SYSTEM_USER';

source/dbstructures.mysql.pas

@@ -3247,7 +3247,7 @@ function TMySqlProvider.GetSql(AId: TQueryId): string;
 begin
   case AId of
     qDatabaseDrop: Result := 'DROP DATABASE %s';
-    qEmptyTable: Result := 'TRUNCATE ';
+    qEmptyTable: Result := 'TRUNCATE %s';
     qRenameTable: Result := 'RENAME TABLE %s TO %s';
     qRenameView: Result := 'RENAME TABLE %s TO %s';
     qCurrentUserHost: Result := 'SELECT CURRENT_USER()';

source/dbstructures.pas

@@ -205,6 +205,7 @@ function TSqlProvider.GetSql(AId: TQueryId): string;
 begin
   // Basic default SQL snippets compatible to all or most servers
   case AId of
+    qEmptyTable: Result := 'DELETE FROM %s';
     qForeignKeyEventAction: Result := 'RESTRICT,CASCADE,SET NULL,NO ACTION';
     qOrderAsc: Result := 'ASC';
     qOrderDesc: Result := 'DESC';

source/dbstructures.postgresql.pas

@@ -599,7 +599,6 @@ function TPostgreSQLProvider.GetSql(AId: TQueryId): string;
 begin
   case AId of
     qDatabaseDrop: Result := 'DROP SCHEMA %s';
-    qEmptyTable: Result := 'DELETE FROM ';
     qRenameTable: Result := 'ALTER TABLE %s RENAME TO %s';
     qRenameView: Result := 'ALTER VIEW %s RENAME TO %s';
     qCurrentUserHost: Result := 'SELECT CURRENT_USER';

source/dbstructures.sqlite.pas

@@ -401,7 +401,6 @@ function TSQLiteProvider.GetSql(AId: TQueryId): string;
 begin
   case AId of
     qDatabaseDrop: Result := 'DROP DATABASE %s';
-    qEmptyTable: Result := 'DELETE FROM ';
     qRenameTable: Result := 'ALTER TABLE %s RENAME TO %s';
     qRenameView: Result := 'ALTER TABLE %s RENAME TO %s';
     qCurrentUserHost: Result := ''; // unsupported

source/main.pas

@@ -4541,7 +4541,7 @@ procedure TMainForm.actEmptyTablesExecute(Sender: TObject);
           Conn.Query(QueryDisableChecks);
         try
           for TableOrView in Objects do begin
-            Conn.Query(Conn.SqlProvider.GetSql(qEmptyTable) + TableOrView.QuotedName);
+            Conn.Query(qEmptyTable, [TableOrView.QuotedName]);
             ProgressStep;
           end;
           actRefresh.Execute;