feature: name columns in SELECT when exporting table with invisible columns

Refs #1890

Author: ansgarbecker

source/dbconnection.pas

@@ -71,6 +71,8 @@   TTableColumnList = class(TObjectList<TTableColumn>)
     public
       procedure Assign(Source: TTableColumnList);
       function FindByName(const Value: String): TTableColumn;
+      function HasInvisibleColumns: Boolean;
+      function QuoteIdents: String;
   end;
   TColumnCache = TDictionary<String,TTableColumnList>;
 
@@ -10876,6 +10878,31 @@ function TTableColumnList.FindByName(const Value: String): TTableColumn;
   end;
 end;
 
+function TTableColumnList.HasInvisibleColumns: Boolean;
+var
+  Col: TTableColumn;
+begin
+  Result := False;
+  for Col in Self do begin
+    if Col.Invisible then begin
+      Result := True;
+      Break;
+    end;
+  end;
+end;
+
+function TTableColumnList.QuoteIdents: String;
+var
+  Col: TTableColumn;
+  QuotedNames: TStringList;
+begin
+  QuotedNames := TStringList.Create;
+  for Col in Self do begin
+    QuotedNames.Add(Col.Connection.QuoteIdent(Col.Name));
+  end;
+  Result := Implode(', ', QuotedNames);
+  QuotedNames.Free;
+end;
 
 
 { *** TTableKey }

source/tabletools.pas

@@ -1767,7 +1767,7 @@ procedure TfrmTableTools.DoExport(DBObj: TDBObject);
   KeyList: TTableKeyList;
   Column: TTableColumn;
   Quoter: TDBConnection;
-  TargetFileName, SetCharsetCode: String;
+  TargetFileName, SetCharsetCode, ColumnsForSelect: String;
   OrderBy: String;
 const
   TempDelim = '//';
@@ -2049,8 +2049,13 @@ procedure TfrmTableTools.DoExport(DBObj: TDBObject);
         TargetDbAndObject := Quoter.QuoteIdent(FinalDbName) + '.' + TargetDbAndObject;
       Offset := 0;
       RowCount := 0;
-      // Sort by primary key if one exists, see issue #2168
+      // Examine columns
       ColumnList := DBObj.TableColumns;
+      if not ColumnList.HasInvisibleColumns then
+        ColumnsForSelect := '*'
+      else
+        ColumnsForSelect := ColumnList.QuoteIdents;
+      // Sort by primary key if one exists, see issue #2168
       KeyList := DBObj.TableKeys;
       KeyColumns := DBObj.Connection.GetKeyColumns(ColumnList, KeyList);
       OrderBy := '';
@@ -2073,7 +2078,7 @@ procedure TfrmTableTools.DoExport(DBObj: TDBObject);
         Data := DBObj.Connection.GetResults(
           DBObj.Connection.ApplyLimitClause(
             'SELECT',
-            '/* '+APPNAME+' '+MainForm.AppVersion+' */ * FROM '+DBObj.QuotedDbAndTableName + OrderBy,
+            '/* '+APPNAME+' '+MainForm.AppVersion+' */ ' + ColumnsForSelect + ' FROM '+DBObj.QuotedDbAndTableName + OrderBy,
             Limit,
             Offset)
           );