code cleanup

Author: sglienke

Source/Persistence/Mapping/Spring.Persistence.Mapping.Attributes.pas

@@ -394,10 +394,9 @@ constructor TableAttribute.Create(const tableName: string; const schema: string)
 
 function TableAttribute.GetNamespace: string;
 begin
-  Result := '';
-  if Schema <> '' then
-    Result := Schema + '.';
-  Result := Result + TableName;
+  Result := TableName;
+  if fSchema <> '' then
+    Result := fSchema + '.' + Result;
 end;
 
 function TableAttribute.GetTableName: string;
@@ -416,7 +415,8 @@ function TableAttribute.GetTableName: string;
 
 {$REGION 'SequenceAttribute'}
 
-constructor SequenceAttribute.Create(const sequenceName: string; initialValue: NativeInt; increment: Integer);
+constructor SequenceAttribute.Create(const sequenceName: string;
+  initialValue: NativeInt; increment: Integer);
 begin
   inherited Create;
   fSequenceName := sequenceName;

Source/Persistence/SQL/Spring.Persistence.SQL.Generators.ASA.pas

@@ -65,29 +65,29 @@ function TASASQLGenerator.GenerateGetLastInsertId(
 function TASASQLGenerator.GeneratePagedQuery(const sql: string;
   limit, offset: Integer): string;
 var
-  LBuilder: TStringBuilder;
-  LSQL: string;
+  sqlBuilder: TStringBuilder;
+  s: string;
 begin
-  LBuilder := TStringBuilder.Create;
-  LSQL := sql;
+  sqlBuilder := TStringBuilder.Create;
+  s := sql;
   try
-    if EndsStr(';', LSQL) then
-      SetLength(LSQL, Length(LSQL)-1);
+    if EndsStr(';', s) then
+      SetLength(s, Length(s) - 1);
 
-    LBuilder.Append('SELECT * FROM (')
+    sqlBuilder.Append('SELECT * FROM (')
       .AppendLine
       .Append('  SELECT *, ROW_NUMBER() OVER (ORDER BY (NULL)) AS ORM_ROW_NUM FROM (')
       .AppendLine.Append('    ')
-      .Append(LSQL)
+      .Append(s)
       .Append(') AS ORM_TOTAL_1')
       .AppendLine
       .Append('  ) AS ORM_TOTAL_2')
       .AppendLine
-      .AppendFormat(' WHERE (ORM_ROW_NUM>%0:D) AND (ORM_ROW_NUM <= %0:D+%1:D);', [offset, limit]);
+      .AppendFormat(' WHERE (ORM_ROW_NUM>%0:d) AND (ORM_ROW_NUM <= %0:d+%1:d);', [offset, limit]);
 
-    Result := LBuilder.ToString;
+    Result := sqlBuilder.ToString;
   finally
-    LBuilder.Free;
+    sqlBuilder.Free;
   end;
 end;
 
@@ -96,7 +96,6 @@ function TASASQLGenerator.GetQueryLanguage: TQueryLanguage;
   Result := qlASA;
 end;
 
-
 function TASASQLGenerator.GetSQLDataTypeName(const field: TSQLCreateField): string;
 begin
   Result := inherited GetSQLDataTypeName(field);

Source/Persistence/SQL/Spring.Persistence.SQL.Generators.Ansi.pas

@@ -70,7 +70,7 @@   TAnsiSQLGenerator = class(TAbstractSQLGenerator)
     function GetTempTableName: string; virtual;
     function GetPrimaryKeyDefinition(const field: TSQLCreateField): string; virtual;
     function GetSplitStatementSymbol: string; virtual;
-    procedure ParseFullTablename(const fullTableName: string;
+    procedure ParseFullTableName(const fullTableName: string;
       out tableName, schemaName: string); virtual;
     function GetEscapeChar: Char; override;
     function GetUpdateVersionFieldQuery(const command: TUpdateCommand;
@@ -126,20 +126,20 @@ function TAnsiSQLGenerator.DoGenerateBackupTable(
 begin
   //select old data to temporary table
   SetLength(Result, 2);
-  Result[0] := Format('SELECT * INTO %0:S FROM %1:S',
+  Result[0] := Format('SELECT * INTO %0:s FROM %1:s',
     [GetTempTableName, tableName]);
   //drop table
-  Result[1] := Format('DROP TABLE %0:S ', [tableName]);
+  Result[1] := Format('DROP TABLE %0:s ', [tableName]);
 end;
 
 function TAnsiSQLGenerator.DoGenerateBackupTableUsingCreate(
   const tableName: string): TArray<string>;
 begin
   SetLength(Result, 2);
-  Result[0] := Format('CREATE TABLE %0:S AS SELECT * FROM %1:S',
+  Result[0] := Format('CREATE TABLE %0:s AS SELECT * FROM %1:s',
     [GetTempTableName, tableName]);
   //drop table
-  Result[1] := Format('DROP TABLE %0:S ', [tableName]);
+  Result[1] := Format('DROP TABLE %0:s ', [tableName]);
 end;
 
 function TAnsiSQLGenerator.DoGenerateCreateTable(const tableName: string;
@@ -151,7 +151,7 @@ function TAnsiSQLGenerator.DoGenerateCreateTable(const tableName: string;
 begin
   sqlBuilder := TStringBuilder.Create;
   try
-    sqlBuilder.AppendFormat('CREATE TABLE %0:S ', [tableName])
+    sqlBuilder.AppendFormat('CREATE TABLE %0:s ', [tableName])
       .Append('(')
       .AppendLine;
     for i := 0 to columns.Count - 1 do
@@ -161,7 +161,7 @@ function TAnsiSQLGenerator.DoGenerateCreateTable(const tableName: string;
         sqlBuilder.Append(', ').AppendLine;
 
       //0 - Column name, 1 - Column data type name, 2 - NOT NULL condition
-      sqlBuilder.AppendFormat('%0:S %1:S %2:S %3:S', [
+      sqlBuilder.AppendFormat('%0:s %1:s %2:s %3:s', [
         GetEscapedFieldName(field),
         GetSQLDataTypeName(field),
         IfThen(cpNotNull in field.Properties, 'NOT NULL', 'NULL'),
@@ -182,12 +182,12 @@ function TAnsiSQLGenerator.DoGenerateRestoreTable(const tableName: string;
 begin
   SetLength(Result, 2);
 
-  Result[0] := Format('INSERT INTO %0:S (%2:S) SELECT %3:S FROM %1:S' + sLineBreak,
+  Result[0] := Format('INSERT INTO %0:s (%2:s) SELECT %3:s FROM %1:s' + sLineBreak,
     [tableName, GetTempTableName, GetCreateFieldsAsString(createColumns),
     GetCopyFieldsAsString(createColumns, dbColumns)]);
 
   //drop temporary table
-  Result[1] := Format('DROP TABLE %0:S', [GetTempTableName]);
+  Result[1] := Format('DROP TABLE %0:s', [GetTempTableName]);
 end;
 
 function TAnsiSQLGenerator.GenerateCreateForeignKey(
@@ -202,13 +202,13 @@ function TAnsiSQLGenerator.GenerateCreateForeignKey(
     for field in command.ForeignKeys do
     begin
       sqlBuilder.Clear;
-      sqlBuilder.AppendFormat('ALTER TABLE %0:S ', [command.Table.Name])
+      sqlBuilder.AppendFormat('ALTER TABLE %0:s ', [command.Table.Name])
         .AppendLine
-        .AppendFormat('ADD CONSTRAINT %0:S', [field.ForeignKeyName])
+        .AppendFormat('ADD CONSTRAINT %0:s', [field.ForeignKeyName])
         .AppendLine
-        .AppendFormat('FOREIGN KEY(%0:S)', [GetEscapedFieldName(field)])
+        .AppendFormat('FOREIGN KEY(%0:s)', [GetEscapedFieldName(field)])
         .AppendLine
-        .AppendFormat(' REFERENCES %0:S (%1:S)', [field.ReferencedTableName,
+        .AppendFormat(' REFERENCES %0:s (%1:s)', [field.ReferencedTableName,
           AnsiQuotedStr(field.ReferencedColumnName, GetEscapeChar)])
         .AppendLine
         .Append(field.ConstraintsAsString);
@@ -252,7 +252,7 @@ function TAnsiSQLGenerator.GenerateDelete(const command: TDeleteCommand): string
 
   sqlBuilder := TStringBuilder.Create;
   try
-    sqlBuilder.AppendFormat('DELETE FROM %0:S', [command.Table.Name]);
+    sqlBuilder.AppendFormat('DELETE FROM %0:s', [command.Table.Name]);
 
     for i := 0 to command.WhereFields.Count - 1 do
     begin
@@ -264,7 +264,7 @@ function TAnsiSQLGenerator.GenerateDelete(const command: TDeleteCommand): string
 
       {TODO -oLinas -cGeneral : implement where operators}
 
-      sqlBuilder.AppendFormat('%0:S = %1:S',
+      sqlBuilder.AppendFormat('%0:s = %1:s',
         [GetEscapedFieldName(field), field.ParamName]);
     end;
 
@@ -349,9 +349,9 @@ function TAnsiSQLGenerator.GeneratePagedQuery(const sql: string;
 begin
   sqlStatement := sql;
   if EndsStr(';', sqlStatement) then
-    SetLength(sqlStatement, Length(sqlStatement)-1);
+    SetLength(sqlStatement, Length(sqlStatement) - 1);
 
-  Result := sqlStatement + Format(' LIMIT %1:D,%0:D %2:S',
+  Result := sqlStatement + Format(' LIMIT %1:d,%0:d %2:s',
     [limit, offset, GetSplitStatementSymbol]);
 end;
 
@@ -403,7 +403,7 @@ function TAnsiSQLGenerator.GenerateUpdate(const command: TUpdateCommand): string
       if i > 0 then
         sqlBuilder.Append(', ');
 
-      sqlBuilder.AppendFormat('%0:S = %1:S',
+      sqlBuilder.AppendFormat('%0:s = %1:s',
         [GetEscapedFieldName(updateField), updateField.ParamName]);
     end;
 
@@ -415,7 +415,7 @@ function TAnsiSQLGenerator.GenerateUpdate(const command: TUpdateCommand): string
       else
         sqlBuilder.Append(' AND ');
 
-      sqlBuilder.AppendFormat('%0:S = %1:S',
+      sqlBuilder.AppendFormat('%0:s = %1:s',
         [GetEscapedFieldName(whereField), whereField.ParamName]);
     end;
 
@@ -617,17 +617,21 @@ function TAnsiSQLGenerator.GetQueryLanguage: TQueryLanguage;
   Result := qlAnsiSQL;
 end;
 
-procedure TAnsiSQLGenerator.ParseFullTablename(const fullTableName: string; out tableName, schemaName: string);
+procedure TAnsiSQLGenerator.ParseFullTableName(const fullTableName: string;
+  out tableName, schemaName: string);
 var
   i: Integer;
 begin
   i := Pos('.', fullTableName);
-  tableName := fullTableName;
-  schemaName := '';
   if i > 1 then
   begin
     schemaName := Copy(fullTableName, 1, i - 1);
-    tableName := Copy(fullTableName, i + 1, Length(fullTableName) - 1);
+    tableName := Copy(fullTableName, i + 1);
+  end
+  else
+  begin
+    tableName := fullTableName;
+    schemaName := '';
   end;
 end;
 
@@ -666,7 +670,7 @@ function TAnsiSQLGenerator.GetSQLDataTypeName(const field: TSQLCreateField): str
     tkUnknown: ;
     tkInteger, tkInt64, tkEnumeration, tkSet:
       if field.Precision > 0 then
-        Result := Format('NUMERIC(%0:D, %1:D)', [field.Precision, field.Scale])
+        Result := Format('NUMERIC(%0:d, %1:d)', [field.Precision, field.Scale])
       else
         if typeInfo = System.TypeInfo(Boolean) then
           Result := 'BIT'
@@ -682,7 +686,7 @@ function TAnsiSQLGenerator.GetSQLDataTypeName(const field: TSQLCreateField): str
         Result := 'TIME'
       else
         if field.Precision > 0 then
-          Result := Format('NUMERIC(%0:D, %1:D)', [field.Precision, field.Scale])
+          Result := Format('NUMERIC(%0:d, %1:d)', [field.Precision, field.Scale])
         else
           Result := 'FLOAT';
     tkString, tkLString: Result := Format('VARCHAR(%D)', [field.Length]);
@@ -715,7 +719,7 @@ function TAnsiSQLGenerator.GetSQLSequenceCount(const sequenceName: string): stri
 
 function TAnsiSQLGenerator.GetSQLTableCount(const tableName: string): string;
 begin
-  Result := Format('SELECT COUNT(*) FROM %0:S %1:S', [tableName, GetSplitStatementSymbol]);
+  Result := Format('SELECT COUNT(*) FROM %0:s %1:s', [tableName, GetSplitStatementSymbol]);
 end;
 
 function TAnsiSQLGenerator.GetSQLTableExists(const tableName: string): string;
@@ -725,7 +729,7 @@ function TAnsiSQLGenerator.GetSQLTableExists(const tableName: string): string;
 
 function TAnsiSQLGenerator.GetTableColumns(const tableName: string): string;
 begin
-  Result := Format('SELECT * FROM %0:S WHERE 1<>2 %1:S', [tableName, GetSplitStatementSymbol]);
+  Result := Format('SELECT * FROM %0:s WHERE 1<>2 %1:s', [tableName, GetSplitStatementSymbol]);
 end;
 
 function TAnsiSQLGenerator.GetTableNameWithAlias(const table: TSQLTable): string;
@@ -742,7 +746,7 @@ function TAnsiSQLGenerator.GetUpdateVersionFieldQuery(
   const command: TUpdateCommand; const versionColumn: VersionAttribute;
   const version, primaryKey: Variant): Variant;
 begin
-  Result := Format('UPDATE %0:S SET %1:S = coalesce(%1:S,0) + 1 WHERE (%2:S = %3:S) AND (coalesce(%1:S,0) = %4:S)',
+  Result := Format('UPDATE %0:s SET %1:s = coalesce(%1:s,0) + 1 WHERE (%2:s = %3:s) AND (coalesce(%1:s,0) = %4:s)',
     [command.Table.Name, versionColumn.ColumnName,
     command.PrimaryKeyColumn.ColumnName, VarToStr(primaryKey), VarToStr(version)]);
 end;

Source/Persistence/SQL/Spring.Persistence.SQL.Generators.Firebird.pas

@@ -83,14 +83,12 @@ function TFirebirdSQLGenerator.DoGenerateRestoreTable(const tableName: string;
 function TFirebirdSQLGenerator.GenerateCreateSequence(
   const command: TCreateSequenceCommand): string;
 var
-  LSequence: SequenceAttribute;
+  sequence: SequenceAttribute;
 begin
-  LSequence := command.Sequence;
-  Result := '';
+  sequence := command.Sequence;
+  Result := Format('CREATE SEQUENCE %0:s;', [sequence.SequenceName]);
   if command.SequenceExists then
-    Result := Format('DROP SEQUENCE %0:S; ', [LSequence.SequenceName]);
-
-  Result := Result + Format('CREATE SEQUENCE %0:S;', [LSequence.SequenceName]);
+    Result := Format('DROP SEQUENCE %0:s;', [sequence.SequenceName]) + sLineBreak + Result;
 end;
 
 function TFirebirdSQLGenerator.GenerateGetLastInsertId(
@@ -102,20 +100,19 @@ function TFirebirdSQLGenerator.GenerateGetLastInsertId(
 function TFirebirdSQLGenerator.GenerateGetNextSequenceValue(
   const sequence: SequenceAttribute): string;
 begin
-  Assert(Assigned(sequence));
-  Result := Format('SELECT NEXT VALUE FOR %0:S FROM RDB$DATABASE;', [sequence.SequenceName]);
+  Result := Format('SELECT NEXT VALUE FOR %0:s FROM RDB$DATABASE;', [sequence.SequenceName]);
 end;
 
 function TFirebirdSQLGenerator.GeneratePagedQuery(const sql: string;
   limit, offset: Integer): string;
 var
-  LSQL: string;
+  s: string;
 begin
-  LSQL := sql;
-  if EndsStr(';', LSQL) then
-    SetLength(LSQL, Length(LSQL)-1);
+  s := sql;
+  if EndsStr(';', s) then
+    SetLength(s, Length(s) - 1);
 
-  Result := LSQL + Format(' ROWS %1:D TO %0:D;', [offset + limit, offset]);
+  Result := s + Format(' ROWS %1:d TO %0:d;', [offset + limit, offset]);
 end;
 
 function TFirebirdSQLGenerator.GetQueryLanguage: TQueryLanguage;
@@ -135,16 +132,15 @@ function TFirebirdSQLGenerator.GetSQLDataTypeName(
 
 function TFirebirdSQLGenerator.GetSQLSequenceCount(const sequenceName: string): string;
 begin
-  Result := Format('SELECT COUNT(*) '+
-    'FROM RDB$GENERATORS '+
-    'WHERE (RDB$SYSTEM_FLAG=0) AND (RDB$GENERATOR_NAME = %0:S); ', [QuotedStr(sequenceName)]);
+  Result := Format('SELECT COUNT(*) FROM RDB$GENERATORS WHERE RDB$GENERATOR_NAME = %0:s ' +
+    ' AND RDB$SYSTEM_FLAG = 0;', [QuotedStr(sequenceName)]);
 end;
 
 function TFirebirdSQLGenerator.GetSQLTableExists(const tableName: string): string;
 begin
-  Result := Format('select count(*) from rdb$relations where rdb$relation_name = %0:S '+
-    ' and rdb$view_blr is null and (rdb$system_flag is null or rdb$system_flag = 0)'
-    , [QuotedStr(tableName)]);
+  Result := Format('SELECT COUNT(*) FROM RDB$RELATIONS WHERE RDB$RELATION_NAME = %0:s ' +
+    ' AND RDB$VIEW_BLR IS NULL AND (RDB$SYSTEM_FLAG IS NULL OR RDB$SYSTEM_FLAG = 0);', [
+    QuotedStr(tableName)]);
 end;
 
 {$ENDREGION}