Changeset 250 for Network/CoolWeb/Persistence

Timestamp:

Jun 13, 2011, 8:00:17 AM (14 years ago)

Author:

george

Message:

• Modified: Unit UCommon in CoolWeb package used form package Common as dependency.

File:

• Network/CoolWeb/Persistence/USqlDatabase.pas (modified) (13 diffs)

Network/CoolWeb/Persistence/USqlDatabase.pas

@@ -20 +20 @@
 
   TSetClientCapabilities = set of TClientCapabilities;
+
+  TLogEvent = procedure(Sender: TObject; Text: string) of object;
 
   TDbRows = class(TListObject)
@@ -41 +43 @@
     FDatabase: string;
     FUserName: string;
+    FOnLogQuery: TLogEvent;
     procedure mySQLClient1ConnectError(Sender: TObject; Msg: String);
     function GetConnected: Boolean;
@@ -56 +59 @@
     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 Insert(ATable: string; Data: TDictionaryStringString);
-    procedure Update(ATable: string; Data: TDictionaryStringString; Condition: string = '1');
-    procedure Replace(ATable: string; Data: TDictionaryStringString);
+    procedure Delete(ATable: string; Condition: string = '1';
+      Schema: string = '');
+    procedure Insert(ATable: string; Data: TDictionaryStringString;
+      Schema: string = '');
+    procedure Update(ATable: string; Data: TDictionaryStringString;
+      Condition: string = '1'; Schema: string = '');
+    procedure Replace(ATable: string; Data: TDictionaryStringString;
+      Schema: string = '');
     procedure Connect;
     procedure Disconnect;
@@ -75 +82 @@
     property Password: string read FPassword write FPassword;
     property Encoding: string read FEncoding write FEncoding;
+    property OnLogQuery: TLogEvent read FOnLogQuery write FOnLogQuery;
   end;
 
@@ -193 +201 @@
 end;
 
-procedure TSqlDatabase.Insert(ATable: string; Data: TDictionaryStringString);
+procedure TSqlDatabase.Insert(ATable: string; Data: TDictionaryStringString;
+  Schema: string);
 var
   DbNames: string;
@@ -215 +224 @@
   try
     DbResult := TDbRows.Create;
-    Query(DbResult, 'INSERT INTO `' + ATable + '` (' + DbNames + ') VALUES (' + DbValues + ')');
+    if Schema <> '' then Schema := '`' + Schema + '`.';
+    Query(DbResult, 'INSERT INTO ' + Schema + '`' + ATable + '` (' + DbNames + ') VALUES (' + DbValues + ')');
   finally
     DbResult.Free;
@@ -228 +238 @@
 begin
   DbRows.Clear;
-  //DebugLog('SqlDatabase query: '+Data);
+  if Assigned(FOnLogQuery) then FOnLogQuery(Self, Data);
   LastQuery := Data;
   mysql_query(FSession, PChar(Data));
@@ -252 +262 @@
 end;
 
-procedure TSqlDatabase.Replace(ATable: string; Data: TDictionaryStringString);
+procedure TSqlDatabase.Replace(ATable: string; Data: TDictionaryStringString;
+  Schema: string = '');
 var
   DbNames: string;
@@ -274 +285 @@
   try
     DbResult := TDbRows.Create;
-    Query(DbResult, 'REPLACE INTO `' + ATable + '` (' + DbNames + ') VALUES (' + DbValues + ')');
+    if Schema <> '' then Schema := '`' + Schema + '`.';
+    Query(DbResult, 'REPLACE INTO ' + Schema + '`' + ATable + '` (' + DbNames + ') VALUES (' + DbValues + ')');
   finally
     DbResult.Free;
@@ -286 +298 @@
 end;
 
-procedure TSqlDatabase.Update(ATable: string; Data: TDictionaryStringString; Condition: string = '1');
+procedure TSqlDatabase.Update(ATable: string; Data: TDictionaryStringString;
+  Condition: string = '1'; Schema: string = '');
 var
   DbValues: string;
@@ -304 +317 @@
   try
     DbResult := TDbRows.Create;
-    Query(DbResult, 'UPDATE `' + ATable + '` SET (' + DbValues + ') WHERE ' + Condition);
+    if Schema <> '' then Schema := '`' + Schema + '`.';
+    Query(DbResult, 'UPDATE ' + Schema + '`' + ATable + '` SET (' + DbValues + ') WHERE ' + Condition);
   finally
     DbResult.Free;
@@ -315 +329 @@
 end;
 
-procedure TSqlDatabase.Delete(ATable: string; Condition: string = '1');
+procedure TSqlDatabase.Delete(ATable: string; Condition: string = '1';
+  Schema: string = '');
 var
   DbResult: TDbRows;
@@ -322 +337 @@
   try
     DbResult := TDbRows.Create;
-    Query(DbResult, 'DELETE FROM `' + ATable + '` WHERE ' + Condition);
+    if Schema <> '' then Schema := '`' + Schema + '`.';
+    Query(DbResult, 'DELETE FROM ' + Schema + '`' + ATable + '` WHERE ' + Condition);
   finally
     DbResult.Free;