Changeset 238 for Network/CoolWeb/Persistence/USqlDatabase.pas

Timestamp:

Apr 30, 2011, 11:49:00 PM (14 years ago)

Author:

george

Message:

• Modified: TSqlDatabase is now TComponent descendant.

File:

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

Network/CoolWeb/Persistence/USqlDatabase.pas

@@ -30 +30 @@
   end;
 
-  TSqlDatabase = class
-    procedure mySQLClient1ConnectError(Sender: TObject; Msg: String);
+  { TSqlDatabase }
+
+  TSqlDatabase = class(TComponent)
   private
+    FEncoding: string;
+    FHostName: string;
+    FPassword: string;
     FSession: PMYSQL;
     FConnected: Boolean;
     FDatabase: string;
+    FUserName: string;
+    procedure mySQLClient1ConnectError(Sender: TObject; Msg: String);
     function GetConnected: Boolean;
     function GetLastErrorMessage: string;
     function GetLastErrorNumber: Integer;
     function GetCharset: string;
+    procedure SetConnected(const AValue: Boolean);
     procedure SetDatabase(const Value: string);
   public
-    Hostname: string;
-    UserName: string;
-    Password: string;
-    Encoding: string;
-    Table: string;
-    RepeatLastAction: Boolean;
+    LastUsedTable: string;
     LastQuery: string;
     procedure CreateDatabase;
@@ -63 +65 @@
     property LastErrorMessage: string read GetLastErrorMessage;
     property LastErrorNumber: Integer read GetLastErrorNumber;
-    property Connected: Boolean read GetConnected;
-    constructor Create;
+    constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
     property Charset: string read GetCharset;
+  published
+    property Connected: Boolean read GetConnected write SetConnected;
     property Database: string read FDatabase write SetDatabase;
+    property HostName: string read FHostName write FHostName;
+    property UserName: string read FUserName write FUserName;
+    property Password: string read FPassword write FPassword;
+    property Encoding: string read FEncoding write FEncoding;
   end;
 
@@ -74 +81 @@
   function SQLToDateTime(Value: string): TDateTime;
   function DateTimeToSQL(Value: TDateTime): string;
+
+procedure Register;
+
 
 implementation
@@ -98 +108 @@
   CLIENT_TRANSACTIONS = 8192;    // Client knows about transactions
 
+procedure Register;
+begin
+  RegisterComponents('CoolWeb', [TSqlDatabase]);
+end;
+
 function MySQLFloatToStr(F: Real): string;
 var
@@ -157 +172 @@
   Rows: TDbRows;
 begin
-  RepeatLastAction := False;
 //  mySQLClient1.Connect;
   FSession := mysql_init(FSession);
@@ -187 +201 @@
   DbResult: TDbRows;
 begin
-  Table := ATable;
+  LastUsedTable := ATable;
   DbNames := '';
   DbValues := '';
@@ -201 +215 @@
   try
     DbResult := TDbRows.Create;
-    Query(DbResult, 'INSERT INTO `' + Table + '` (' + DbNames + ') VALUES (' + DbValues + ')');
+    Query(DbResult, 'INSERT INTO `' + ATable + '` (' + DbNames + ') VALUES (' + DbValues + ')');
   finally
     DbResult.Free;
@@ -215 +229 @@
   DbRows.Clear;
   //DebugLog('SqlDatabase query: '+Data);
-  RepeatLastAction := False;
   LastQuery := Data;
   mysql_query(FSession, PChar(Data));
@@ -247 +260 @@
   DbResult: TDbRows;
 begin
-  Table := ATable;
+  LastUsedTable := ATable;
   DbNames := '';
   DbValues := '';
@@ -261 +274 @@
   try
     DbResult := TDbRows.Create;
-    Query(DbResult, 'REPLACE INTO `' + Table + '` (' + DbNames + ') VALUES (' + DbValues + ')');
+    Query(DbResult, 'REPLACE INTO `' + ATable + '` (' + DbNames + ') VALUES (' + DbValues + ')');
   finally
     DbResult.Free;
@@ -269 +282 @@
 procedure TSqlDatabase.Select(DbRows: TDbRows; ATable: string; Filter: string = '*'; Condition: string = '1');
 begin
-  Table := ATable;
-  Query(DbRows, 'SELECT ' + Filter + ' FROM `' + Table + '` WHERE ' + Condition);
+  LastUsedTable := ATable;
+  Query(DbRows, 'SELECT ' + Filter + ' FROM `' + ATable + '` WHERE ' + Condition);
 end;
 
@@ -280 +293 @@
   DbResult: TDbRows;
 begin
-  Table := ATable;
+  LastUsedTable := ATable;
   DbValues := '';
   for I := 0 to Data.Count - 1 do begin
@@ -291 +304 @@
   try
     DbResult := TDbRows.Create;
-    Query(DbResult, 'UPDATE `' + Table + '` SET (' + DbValues + ') WHERE ' + Condition);
+    Query(DbResult, 'UPDATE `' + ATable + '` SET (' + DbValues + ') WHERE ' + Condition);
   finally
     DbResult.Free;
@@ -306 +319 @@
   DbResult: TDbRows;
 begin
-  Table := ATable;
+  LastUsedTable := ATable;
   try
     DbResult := TDbRows.Create;
-    Query(DbResult, 'DELETE FROM `' + Table + '` WHERE ' + Condition);
+    Query(DbResult, 'DELETE FROM `' + ATable + '` WHERE ' + Condition);
   finally
     DbResult.Free;
@@ -326 +339 @@
 end;
 
-constructor TSqlDatabase.Create;
+constructor TSqlDatabase.Create(AOwner: TComponent);
 begin
   inherited;
@@ -406 +419 @@
 end;
 
+procedure TSqlDatabase.SetConnected(const AValue: Boolean);
+begin
+  if AValue = FConnected then Exit;
+  if AValue then Connect
+    else Disconnect;
+end;
+
 procedure TSqlDatabase.SetDatabase(const Value: string);
 begin