fix: wrong schema queries in SQLite, always shows columns and indexes of first database file

ansgarbecker · ansgarbecker · commit 7072986d630d · 2026-02-12T18:20:32.000+01:00
Closes #1823
diff --git a/source/dbconnection.pas b/source/dbconnection.pas
@@ -6099,7 +6099,7 @@ function TSQLiteConnection.GetTableColumns(Table: TDBObject): TTableColumnList;
   // Todo: include database name
   // Todo: default values
   Result := TTableColumnList.Create(True);
-  ColQuery := GetResults('SELECT * FROM '+QuoteIdent(Table.Database)+'.pragma_table_xinfo('+EscapeString(Table.Name)+')');
+  ColQuery := GetResults('SELECT * FROM pragma_table_xinfo('+EscapeString(Table.Name)+', '+EscapeString(Table.Database)+')');
   while not ColQuery.Eof do begin
     Col := TTableColumn.Create(Self);
     Result.Add(Col);
@@ -6386,7 +6386,7 @@ function TSQLiteConnection.GetTableKeys(Table: TDBObject): TTableKeyList;
 begin
   Result := TTableKeyList.Create(True);
   ColQuery := GetResults('SELECT * '+
-    'FROM '+QuoteIdent(Table.Database)+'.pragma_table_xinfo('+EscapeString(Table.Name)+') '+
+    'FROM pragma_table_xinfo('+EscapeString(Table.Name)+', '+EscapeString(Table.Database)+') '+
     'WHERE pk!=0 ORDER BY pk');
   NewKey := nil;
   while not ColQuery.Eof do begin
@@ -6406,7 +6406,7 @@ function TSQLiteConnection.GetTableKeys(Table: TDBObject): TTableKeyList;
   ColQuery.Free;
 
   KeyQuery := GetResults('SELECT * '+
-    'FROM '+QuoteIdent(Table.Database)+'.pragma_index_list('+EscapeString(Table.Name)+') '+
+    'FROM pragma_index_list('+EscapeString(Table.Name)+', '+EscapeString(Table.Database)+') '+
     'WHERE origin!='+EscapeString('pk'));
   while not KeyQuery.Eof do begin
     NewKey := TTableKey.Create(Self);
@@ -6416,7 +6416,7 @@ function TSQLiteConnection.GetTableKeys(Table: TDBObject): TTableKeyList;
     NewKey.IndexType := IfThen(KeyQuery.Col('unique')='0', TTableKey.KEY, TTableKey.UNIQUE);
     NewKey.OldIndexType := NewKey.IndexType;
     ColQuery := GetResults('SELECT * '+
-      'FROM '+QuoteIdent(Table.Database)+'.pragma_index_info('+EscapeString(NewKey.Name)+')');
+      'FROM pragma_index_info('+EscapeString(NewKey.Name)+', '+EscapeString(Table.Database)+')');
     while not ColQuery.Eof do begin
       NewKey.Columns.Add(ColQuery.Col('name'));
       NewKey.SubParts.Add('');
@@ -6631,7 +6631,7 @@ function TSQLiteConnection.GetTableForeignKeys(Table: TDBObject): TForeignKeyLis
   // SQLite: query PRAGMA foreign_key_list
   Result := TForeignKeyList.Create(True);
   ForeignQuery := GetResults('SELECT * '+
-    'FROM '+QuoteIdent(Table.Database)+'.pragma_foreign_key_list('+EscapeString(Table.Name)+')');
+    'FROM pragma_foreign_key_list('+EscapeString(Table.Name)+', '+EscapeString(Table.Database)+')');
   ForeignKey := nil;
   while not ForeignQuery.Eof do begin
     if (not Assigned(ForeignKey)) or (ForeignKey.KeyName <> ForeignQuery.Col('id')) then begin
