Changeset 37 for trunk/Common/USqlDatabase.pas

Timestamp:

Oct 30, 2010, 7:36:25 PM (14 years ago)

Author:

george

Message:

• Modified: TAssociativeArray replaced by specialized generic class TDictionaryStringString.
• Modified: All TObjectList replaced by specialized generic class TListObject.

File:

• trunk/Common/USqlDatabase.pas (modified) (11 diffs)

trunk/Common/USqlDatabase.pas

@@ -8 +8 @@
 
 uses
-  SysUtils, Classes, Dialogs, mysql50, TypInfo, Contnrs, UStringListEx;
+  SysUtils, Classes, Dialogs, mysql50, TypInfo, UStringListEx,
+  ListObject, DictionaryStringString;
 
 type
@@ -20 +21 @@
   TSetClientCapabilities = set of TClientCapabilities;
 
-  TAssociativeArray = class(TStringList)
+  TDbRows = class(TListObject)
   private
-    function GetValues(Index: string): string;
-    function GetValuesAtIndex(Index: Integer): string;
-    procedure SetValues(Index: string; const Value: string);
+    function GetData(Index: Integer): TDictionaryStringString;
+    procedure SetData(Index: Integer; const Value: TDictionaryStringString);
   public
-    constructor Create;
-    destructor Destroy; override;
-    function GetAllValues: string;
-    procedure AddKeyValue(Key, Value: string);
-    property ValuesAtIndex[Index: Integer]: string read GetValuesAtIndex;
-    property Values[Index: string]: string read GetValues write SetValues; default;
-  end;
-
-  TDbRows = class(TObjectList)
-  private
-    function GetData(Index: Integer): TAssociativeArray;
-    procedure SetData(Index: Integer; const Value: TAssociativeArray);
-  public
-    property Data[Index: Integer]: TAssociativeArray read GetData write SetData; default;
+    property Data[Index: Integer]: TDictionaryStringString read GetData write SetData; default;
     destructor Destroy; override;
   end;
@@ -68 +55 @@
     function Select(ATable: string; Filter: string = '*'; Condition: string = '1'): TDbRows;
     procedure Delete(ATable: string; Condition: string = '1');
-    procedure Insert(ATable: string; Data: TAssociativeArray);
-    procedure Update(ATable: string; Data: TAssociativeArray; Condition: string = '1');
-    procedure Replace(ATable: string; Data: TAssociativeArray);
+    procedure Insert(ATable: string; Data: TDictionaryStringString);
+    procedure Update(ATable: string; Data: TDictionaryStringString; Condition: string = '1');
+    procedure Replace(ATable: string; Data: TDictionaryStringString);
     procedure Connect;
     procedure Disconnect;
@@ -186 +173 @@
 end;
 
-procedure TSqlDatabase.Insert(ATable: string; Data: TAssociativeArray);
+procedure TSqlDatabase.Insert(ATable: string; Data: TDictionaryStringString);
 var
   DbNames: string;
@@ -198 +185 @@
   DbValues := '';
   for I := 0 to Data.Count - 1 do begin
-    Value := Data.ValuesAtIndex[I];
+    Value := Data.Items[I].Value;
     StringReplace(Value, '"', '\"', [rfReplaceAll]);
     if Value = 'NOW()' then DbValues := DbValues + ',' + Value
     else DbValues := DbValues + ',"' + Value + '"';
-    DbNames := DbNames + ',`' + Data.Names[I] + '`';
+    DbNames := DbNames + ',`' + Data.Keys[I] + '`';
   end;
   System.Delete(DbNames, 1, 1);
@@ -233 +220 @@
     for I := 0 to Result.Count - 1 do begin
       DbRow := mysql_fetch_row(DbResult);
-      Result[I] := TAssociativeArray.Create;
+      Result[I] := TDictionaryStringString.Create;
       with Result[I] do begin
         for II := 0 to mysql_num_fields(DbResult) - 1 do begin
-          Add(mysql_fetch_field_direct(DbResult, II)^.Name +
-            NameValueSeparator + PChar((DbRow + II)^));
+          Add(mysql_fetch_field_direct(DbResult, II)^.Name,
+            PChar((DbRow + II)^));
           end;
         end;
@@ -245 +232 @@
 end;
 
-procedure TSqlDatabase.Replace(ATable: string; Data: TAssociativeArray);
+procedure TSqlDatabase.Replace(ATable: string; Data: TDictionaryStringString);
 var
   DbNames: string;
@@ -257 +244 @@
   DbValues := '';
   for I := 0 to Data.Count - 1 do begin
-    Value := Data.ValuesAtIndex[I];
+    Value := Data.Items[I].Value;
     StringReplace(Value, '"', '\"', [rfReplaceAll]);
     if Value = 'NOW()' then DbValues := DbValues + ',' + Value
     else DbValues := DbValues + ',"' + Value + '"';
-    DbNames := DbNames + ',`' + Data.Names[I] + '`';
+    DbNames := DbNames + ',`' + Data.Keys[I] + '`';
   end;
   System.Delete(DbNames, 1, 1);
@@ -278 +265 @@
 end;
 
-procedure TSqlDatabase.Update(ATable: string; Data: TAssociativeArray; Condition: string = '1');
+procedure TSqlDatabase.Update(ATable: string; Data: TDictionaryStringString; Condition: string = '1');
 var
   DbValues: string;
@@ -288 +275 @@
   DbValues := '';
   for I := 0 to Data.Count - 1 do begin
-    Value := Data.ValuesAtIndex[I];
+    Value := Data.Items[I].Value;
     StringReplace(Value, '"', '\"', [rfReplaceAll]);
     if Value = 'NOW()' then DbValues := DbValues + ',' + Value
-    else DbValues := DbValues + ',' + Data.Names[I] + '=' + '"' + Value + '"';
+    else DbValues := DbValues + ',' + Data.Keys[I] + '=' + '"' + Value + '"';
   end;
   System.Delete(DbValues, 1, 1);
@@ -395 +382 @@
 end;
 
-{ TAssociativeArray }
-
-procedure TAssociativeArray.AddKeyValue(Key, Value: string);
-begin
-  Add(Key + NameValueSeparator + Value);
-end;
-
-constructor TAssociativeArray.Create;
-begin
-  NameValueSeparator := '|';
-end;
-
-destructor TAssociativeArray.Destroy;
+{ TDbRows }
+
+destructor TDbRows.Destroy;
 begin
   inherited;
 end;
 
-function TAssociativeArray.GetAllValues: string;
-var
-  I: Integer;
-begin
-  Result := '';
-  for I := 0 to Count - 1 do begin
-    Result := Result + Names[I] + '=' + ValuesAtIndex[I] + ',';
-  end;
-end;
-
-function TAssociativeArray.GetValues(Index: string): string;
-begin
-  Result := inherited Values[Index];
-end;
-
-function TAssociativeArray.GetValuesAtIndex(Index: Integer): string;
-begin
-  Result := inherited Values[Names[Index]];
-end;
-
-procedure TAssociativeArray.SetValues(Index: string; const Value: string);
-begin
-  inherited Values[Index] := Value;
-end;
-
-{ TDbRows }
-
-destructor TDbRows.Destroy;
-begin
-  inherited;
-end;
-
-function TDbRows.GetData(Index: Integer): TAssociativeArray;
-begin
-  Result := TAssociativeArray(Items[Index]);
-end;
-
-procedure TDbRows.SetData(Index: Integer; const Value: TAssociativeArray);
+function TDbRows.GetData(Index: Integer): TDictionaryStringString;
+begin
+  Result := TDictionaryStringString(Items[Index]);
+end;
+
+procedure TDbRows.SetData(Index: Integer; const Value: TDictionaryStringString);
 begin
   Items[Index] := Value;