Changeset 137 for trunk/Packages/CoolWeb/Persistence/USqlDatabase.pas

Timestamp:

Sep 9, 2022, 1:16:58 AM (2 years ago)

Author:

chronos

Message:

• Added: Robots page.
• Modified: Canonical URL for webcams.
• Modified: Removed compiler mode delphi as it is already set in project.
• Modified: Updated Common package.
• Modified: Use Generics.Collections instead of fgl.

File:

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

trunk/Packages/CoolWeb/Persistence/USqlDatabase.pas

@@ -1 +1 @@
 unit USqlDatabase;
 
-{$mode Delphi}{$H+}
-
-// Modified: 2010-12-24
+// Modified: 2022-09-08
 
 interface
 
 uses
-  SysUtils, Classes, Dialogs, mysql50, TypInfo,
-  SpecializedDictionary, SpecializedList;
+  SysUtils, Classes, Dialogs, mysql50, TypInfo, SpecializedDictionary,
+  SpecializedList;
 
 type
@@ -61 +59 @@
     procedure CreateColumn(Table, ColumnName: string; ColumnType: TTypeKind);
     procedure Query(DbRows: TDbRows; Data: string);
-    procedure Select(DbRows: TDbRows; ATable: string; Filter: string = '*'; Condition: string = '1');
-    procedure Delete(ATable: string; Condition: string = '1';
+    procedure Select(DbRows: TDbRows; ATable: string; Filter: string = '*';
+      Condition: string = '');
+    procedure Delete(ATable: string; Condition: string = '';
       Schema: string = '');
     procedure Insert(ATable: string; Data: TDictionaryStringString;
       Schema: string = '');
     procedure Update(ATable: string; Data: TDictionaryStringString;
-      Condition: string = '1'; Schema: string = '');
+      Condition: string = ''; Schema: string = '');
     procedure Replace(ATable: string; Data: TDictionaryStringString;
       Schema: string = '');
@@ -100 +99 @@
 
 uses
-  DateUtils, Math;
+  DateUtils;
 
 resourcestring
@@ -184 +183 @@
   Rows: TDbRows;
 begin
-//  mySQLClient1.Connect;
   FSession := mysql_init(FSession);
-//  FSession.charset := 'latin2';
   NewSession := mysql_real_connect(FSession, PChar(HostName), PChar(UserName),
     PChar(Password), PChar(Database), FPort, nil, CLIENT_LONG_PASSWORD + CLIENT_CONNECT_WITH_DB);
@@ -250 +247 @@
 
   DbResult := mysql_store_result(FSession);
-  if Assigned(DbResult) then begin
-    DbRows.Count := mysql_num_rows(DbResult);
-    for I := 0 to DbRows.Count - 1 do begin
-      DbRow := mysql_fetch_row(DbResult);
-      DbRows[I] := TDictionaryStringString.Create;
-      with DbRows[I] do begin
-        for II := 0 to mysql_num_fields(DbResult) - 1 do begin
-          Add(mysql_fetch_field_direct(DbResult, II)^.Name,
-            PChar((DbRow + II)^));
+  try
+    if Assigned(DbResult) then begin
+      DbRows.Count := mysql_num_rows(DbResult);
+      for I := 0 to DbRows.Count - 1 do begin
+        DbRow := mysql_fetch_row(DbResult);
+        DbRows[I] := TDictionaryStringString.Create;
+        with DbRows[I] do begin
+          for II := 0 to mysql_num_fields(DbResult) - 1 do begin
+            Add(mysql_fetch_field_direct(DbResult, II)^.Name,
+              PChar((DbRow + II)^));
           end;
         end;
       end;
-  end;
-  mysql_free_result(DbResult);
+    end;
+  finally
+    mysql_free_result(DbResult);
+  end;
 end;
 
@@ -296 +296 @@
 end;
 
-procedure TSqlDatabase.Select(DbRows: TDbRows; ATable: string; Filter: string = '*'; Condition: string = '1');
+procedure TSqlDatabase.Select(DbRows: TDbRows; ATable: string; Filter: string = '*'; Condition: string = '');
+var
+  QueryText: string;
 begin
   LastUsedTable := ATable;
-  Query(DbRows, 'SELECT ' + Filter + ' FROM `' + ATable + '` WHERE ' + Condition);
+  QueryText := 'SELECT ' + Filter + ' FROM `' + ATable + '`';
+  if Condition <> '' then QueryText := QueryText + ' WHERE ' + Condition;
+  Query(DbRows, QueryText);
 end;
 
 procedure TSqlDatabase.Update(ATable: string; Data: TDictionaryStringString;
-  Condition: string = '1'; Schema: string = '');
-var
+  Condition: string = ''; Schema: string = '');
+var
+  QueryText: string;
   DbValues: string;
   Value: string;
@@ -322 +327 @@
     DbResult := TDbRows.Create;
     if Schema <> '' then Schema := '`' + Schema + '`.';
-    Query(DbResult, 'UPDATE ' + Schema + '`' + ATable + '` SET ' + DbValues + ' WHERE ' + Condition);
+    QueryText := 'UPDATE ' + Schema + '`' + ATable + '` SET ' + DbValues;
+    if Condition <> '' then QueryText := QueryText + ' WHERE ' + Condition;
+    Query(DbResult, QueryText);
   finally
     DbResult.Free;
@@ -333 +340 @@
 end;
 
-procedure TSqlDatabase.Delete(ATable: string; Condition: string = '1';
+procedure TSqlDatabase.Delete(ATable: string; Condition: string = '';
   Schema: string = '');
 var
+  QueryText: string;
   DbResult: TDbRows;
 begin
@@ -342 +350 @@
     DbResult := TDbRows.Create;
     if Schema <> '' then Schema := '`' + Schema + '`.';
-    Query(DbResult, 'DELETE FROM ' + Schema + '`' + ATable + '` WHERE ' + Condition);
+    QueryText := 'DELETE FROM ' + Schema + '`' + ATable + '`';
+    if Condition <> '' then QueryText := QueryText + ' WHERE ' + Condition;
+    Query(DbResult, QueryText);
   finally
     DbResult.Free;
@@ -497 +507 @@
 end.
 
-