refactor: prefer qAutoInc in SQLProvider over dedicated AutoIncName method

Author: ansgarbecker

source/copytable.pas

@@ -419,7 +419,7 @@ procedure TCopyTableForm.btnOKClick(Sender: TObject);
   for Column in SelectedColumns do begin
     AutoIncGetsKey := False;
     AutoIncRemoved := False;
-    AutoIncName := Column.AutoIncName;
+    AutoIncName := FConnection.SqlProvider.GetSql(qAutoInc);
     if Column.DefaultType = cdtAutoInc then begin
       for Key in SelectedKeys do begin
         // Don't check index type, MySQL allows auto-increment columns on nearly all indexes

source/dbconnection.pas

@@ -64,7 +64,6 @@   TTableColumn = class(TPersistent)
       function CastAsText: String;
       property Status: TEditingStatus read FStatus write SetStatus;
       property Connection: TDBConnection read FConnection;
-      function AutoIncName: String;
       function FullDataType: String;
   end;
   PTableColumn = ^TTableColumn;
@@ -5738,7 +5737,7 @@ function TDBConnection.GetTableColumns(Table: TDBObject): TTableColumnList;
     else if ExecRegExpr('\bauto_increment\b', ExtraText.ToLowerInvariant) then begin
       // MySQL auto increment
       Col.DefaultType := cdtAutoInc;
-      Col.DefaultText := Col.AutoIncName;
+      Col.DefaultText := FSqlProvider.GetSql(qAutoInc);
     end
     else if DefText.ToLowerInvariant = 'null' then begin
       Col.DefaultType := cdtNull;
@@ -5829,7 +5828,7 @@ function TMySQLConnection.GetTableColumns(Table: TDBObject): TTableColumnList;
       Col.OnUpdateType := cdtNothing;
       if ExecRegExpr('^auto_increment$', ExtraText.ToLowerInvariant) then begin
         Col.DefaultType := cdtAutoInc;
-        Col.DefaultText := Col.AutoIncName;
+        Col.DefaultText := FSqlProvider.GetSql(qAutoInc);
       end else if ColQuery.IsNull('Default') then begin
         Col.DefaultType := cdtNothing;
       end else if IsTextDefault(DefText, Col.DataType) then begin
@@ -10721,7 +10720,7 @@ function TTableColumn.SQLCode(OverrideCollation: String=''; Parts: TColumnParts=
         cdtAutoInc: begin
           case FConnection.Parameters.NetTypeGroup of
             ngPgSQL:;
-            else Result := Result + AutoIncName;
+            else Result := Result + FConnection.SqlProvider.GetSql(qAutoInc);
           end;
         end;
         cdtExpression: begin
@@ -10843,15 +10842,6 @@ function TTableColumn.CastAsText: String;
 end;
 
 
-function TTableColumn.AutoIncName: String;
-begin
-  case FConnection.Parameters.NetTypeGroup of
-    ngPgSQL: Result := 'SERIAL';
-    else Result := 'AUTO_INCREMENT';
-  end;
-end;
-
-
 function TTableColumn.FullDataType: String;
 begin
   Result := DataType.Name;

source/dbstructures.pas

@@ -49,7 +49,8 @@ interface
     qGetReverseForeignKeys, qExplain, qSetTimezone,
     qShowFunctionStatus, qShowProcedureStatus, qShowTriggers, qShowEvents, qShowCreateTrigger,
     qHelpKeyword, qShowWarnings, qGetEnumTypes,
-    qDropUser, qCreateRole, qDropRole, qReloadPrivileges, qGrantRole, qRevokeRole, qSetDefaultRole);
+    qDropUser, qCreateRole, qDropRole, qReloadPrivileges, qGrantRole, qRevokeRole, qSetDefaultRole,
+    qAutoInc);
   TSqlProvider = class
     strict protected
       FNetType: TNetType;
@@ -210,6 +211,7 @@ function TSqlProvider.GetSql(AId: TQueryId): string;
     qOrderAsc: Result := 'ASC';
     qOrderDesc: Result := 'DESC';
     qGetRowCountExact: Result := 'SELECT COUNT(*) FROM :QuotedDbAndTableName';
+    qAutoInc: Result := 'AUTO_INCREMENT';
     else Result := '';
   end;
 end;

source/dbstructures.postgresql.pas

@@ -744,6 +744,7 @@ function TPostgreSQLProvider.GetSql(AId: TQueryId): string;
       'ORDER BY UPPER(t.typname)',
       '' // ServerVersion < 9
       );
+    qAutoInc: Result := 'SERIAL';
     else Result := inherited;
   end;
 end;

source/grideditlinks.pas

@@ -1414,7 +1414,7 @@ constructor TColumnDefaultEditorLink.Create(Tree: TVirtualStringTree; AllowEdit:
   FRadioAutoInc.Width := FRadioAutoInc.Parent.Width - 2 * FRadioAutoInc.Left;
   FRadioAutoInc.OnClick := RadioClick;
   FRadioAutoInc.OnKeyDown := DoKeyDown;
-  FRadioAutoInc.Caption := Col.AutoIncName;
+  FRadioAutoInc.Caption := FTableColumn.Connection.SqlProvider.GetSql(qAutoInc);
 
   FBtnOk := TButton.Create(FPanel);
   FBtnOk.Parent := FPanel;
@@ -1578,7 +1578,7 @@ function TColumnDefaultEditorLink.EndEdit: Boolean; stdcall;
       cdtText: Col.DefaultText := FTextEdit.Text;
       cdtNull: Col.DefaultText := 'NULL';
       cdtExpression: Col.DefaultText := FExpressionEdit.Text;
-      cdtAutoInc: Col.DefaultText := Col.AutoIncName;
+      cdtAutoInc: Col.DefaultText := Col.Connection.SqlProvider.GetSql(qAutoInc);
     end;
 
     if FOnUpdateEdit.Text <> '' then

source/table_editor.pas

@@ -1537,7 +1537,7 @@ procedure TfrmTableEditor.listColumnsGetText(Sender: TBaseVirtualTree;
         cdtText:         CellText := Col.Connection.EscapeString(Col.DefaultText);
         cdtNull:         CellText := 'NULL';
         cdtExpression:   CellText := Col.DefaultText;
-        cdtAutoInc:      CellText := Col.AutoIncName;
+        cdtAutoInc:      CellText := Col.Connection.SqlProvider.GetSql(qAutoInc);
       end;
       case Col.OnUpdateType of
         // cdtNothing: leave clause away