Changeset 138 for trunk/Packages/CoolWeb/Persistence

Timestamp:

Sep 9, 2022, 8:20:25 PM (2 years ago)

Author:

chronos

Message:

• Modified: Removed TemplateGenerics package. Generics usage replaced by standard Generics.Collections.

File:

• trunk/Packages/CoolWeb/Persistence/USqlDatabase.pas (modified) (6 diffs)

trunk/Packages/CoolWeb/Persistence/USqlDatabase.pas

@@ -6 +6 @@
 
 uses
-  SysUtils, Classes, Dialogs, mysql50, TypInfo, SpecializedDictionary,
-  SpecializedList;
+  SysUtils, Classes, Dialogs, mysql50, TypInfo, UGenerics, Generics.Collections;
 
 type
@@ -21 +20 @@
   TLogEvent = procedure(Sender: TObject; Text: string) of object;
 
-  TDbRows = class(TListObject)
+  TDbRows = class(TList<TDictionaryStringString>)
   private
     function GetData(Index: Integer): TDictionaryStringString;
@@ -155 +154 @@
     TimeParts := TListString.Create;
 
-    Parts.Explode(Value, ' ', StrToStr);
-    DateParts.Explode(Parts[0], '-', StrToStr);
+    Parts.Explode(' ', Value);
+    DateParts.Explode('-', Parts[0]);
     Result := EncodeDate(StrToInt(DateParts[0]), StrToInt(DateParts[1]),
       StrToInt(DateParts[2]));
     if Parts.Count > 1 then begin
-      TimeParts.Explode(Parts[1], ':', StrToStr);
+      TimeParts.Explode(':', Parts[1]);
       Result := Result + EncodeTime(StrToInt(TimeParts[0]), StrToInt(TimeParts[1]),
         StrToInt(TimeParts[2]), 0);
@@ -210 +209 @@
   Value: string;
   DbResult: TDbRows;
+  Item: TPair<string, string>;
 begin
   LastUsedTable := ATable;
   DbNames := '';
   DbValues := '';
-  for I := 0 to Data.Count - 1 do begin
-    Value := Data.Items[I].Value;
+  for Item in Data do begin
+    Value := Item.Value;
     StringReplace(Value, '"', '\"', [rfReplaceAll]);
     if Value = 'NOW()' then DbValues := DbValues + ',' + Value
     else DbValues := DbValues + ',"' + Value + '"';
-    DbNames := DbNames + ',`' + Data.Keys[I] + '`';
+    DbNames := DbNames + ',`' + Item.Key + '`';
   end;
   System.Delete(DbNames, 1, 1);
@@ -274 +274 @@
   I: Integer;
   DbResult: TDbRows;
+  Item: TPair<string, string>;
 begin
   LastUsedTable := ATable;
   DbNames := '';
   DbValues := '';
-  for I := 0 to Data.Count - 1 do begin
-    Value := Data.Items[I].Value;
+  for Item in Data do begin
+    Value := Item.Value;
     StringReplace(Value, '"', '\"', [rfReplaceAll]);
     if Value = 'NOW()' then DbValues := DbValues + ',' + Value
     else DbValues := DbValues + ',"' + Value + '"';
-    DbNames := DbNames + ',`' + Data.Keys[I] + '`';
+    DbNames := DbNames + ',`' + Item.Key + '`';
   end;
   System.Delete(DbNames, 1, 1);
@@ -314 +315 @@
   I: Integer;
   DbResult: TDbRows;
+  Item: TPair<string, string>;
 begin
   LastUsedTable := ATable;
   DbValues := '';
-  for I := 0 to Data.Count - 1 do begin
-    Value := Data.Items[I].Value;
+  for Item in Data do begin
+    Value := Item.Value;
     StringReplace(Value, '"', '\"', [rfReplaceAll]);
     if Value = 'NOW()' then DbValues := DbValues + ',' + Value
-    else DbValues := DbValues + ',`' + Data.Keys[I] + '` =' + '"' + Value + '"';
+    else DbValues := DbValues + ',`' + Item.Key + '` =' + '"' + Value + '"';
   end;
   System.Delete(DbValues, 1, 1);