Changeset 38 for trunk/Common/USqlDatabase.pas

Timestamp:

Nov 13, 2010, 4:32:15 PM (14 years ago)

Author:

george

Message:

• Přidáno: Zobrazení seznamu hostovaných projektů.
• Upraveno: Funkce Query jednotky SQLDatabase nyní nevrací novou instanci, ale výsledné řádky vrací v parametru. Bezpečnější metoda předcházející únikům paměti.

File:

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

trunk/Common/USqlDatabase.pas

@@ -3 +3 @@
 {$mode Delphi}{$H+}
 
-// Upraveno: 8.9.2010
+// Upraveno: 28.10.2010
 
 interface
@@ -52 +52 @@
     procedure CreateTable(Name: string);
     procedure CreateColumn(Table, ColumnName: string; ColumnType: TTypeKind);
-    function Query(Data: string): TDbRows;
-    function Select(ATable: string; Filter: string = '*'; Condition: string = '1'): TDbRows;
+    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);
@@ -167 +167 @@
 
   try
-    Rows := Query('SET NAMES ' + Encoding);
+    Rows := TDbRows.Create;
+    Query(Rows, 'SET NAMES ' + Encoding);
   finally
     Rows.Free;
@@ -194 +195 @@
   System.Delete(DbValues, 1, 1);
   try
-    DbResult := Query('INSERT INTO `' + Table + '` (' + DbNames + ') VALUES (' + DbValues + ')');
+    DbResult := TDbRows.Create;
+    Query(DbResult, 'INSERT INTO `' + Table + '` (' + DbNames + ') VALUES (' + DbValues + ')');
   finally
     DbResult.Free;
@@ -200 +202 @@
 end;
 
-function TSqlDatabase.Query(Data: string): TDbRows;
+procedure TSqlDatabase.Query(DbRows: TDbRows; Data: string);
 var
   I, II: Integer;
@@ -206 +208 @@
   DbRow: MYSQL_ROW;
 begin
+  DbRows.Clear;
   //DebugLog('SqlDatabase query: '+Data);
   RepeatLastAction := False;
   LastQuery := Data;
-  Result := TDbRows.Create;
   mysql_query(FSession, PChar(Data));
   if LastErrorNumber <> 0 then begin
@@ -217 +219 @@
   DbResult := mysql_store_result(FSession);
   if Assigned(DbResult) then begin
-    Result.Count := mysql_num_rows(DbResult);
-    for I := 0 to Result.Count - 1 do begin
+    DbRows.Count := mysql_num_rows(DbResult);
+    for I := 0 to DbRows.Count - 1 do begin
       DbRow := mysql_fetch_row(DbResult);
-      Result[I] := TDictionaryStringString.Create;
-      with Result[I] do begin
+      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,
@@ -253 +255 @@
   System.Delete(DbValues, 1, 1);
   try
-    DbResult := Query('REPLACE INTO `' + Table + '` (' + DbNames + ') VALUES (' + DbValues + ')');
+    DbResult := TDbRows.Create;
+    Query(DbResult, 'REPLACE INTO `' + Table + '` (' + DbNames + ') VALUES (' + DbValues + ')');
   finally
     DbResult.Free;
@@ -259 +262 @@
 end;
 
-function TSqlDatabase.Select(ATable: string; Filter: string = '*'; Condition: string = '1'): TDbRows;
+procedure TSqlDatabase.Select(DbRows: TDbRows; ATable: string; Filter: string = '*'; Condition: string = '1');
 begin
   Table := ATable;
-  Result := Query('SELECT ' + Filter + ' FROM `' + Table + '` WHERE ' + Condition);
+  Query(DbRows, 'SELECT ' + Filter + ' FROM `' + Table + '` WHERE ' + Condition);
 end;
 
@@ -282 +285 @@
   System.Delete(DbValues, 1, 1);
   try
-    DbResult := Query('UPDATE `' + Table + '` SET (' + DbValues + ') WHERE ' + Condition);
+    DbResult := TDbRows.Create;
+    Query(DbResult, 'UPDATE `' + Table + '` SET (' + DbValues + ') WHERE ' + Condition);
   finally
     DbResult.Free;
@@ -299 +303 @@
   Table := ATable;
   try
-    DbResult := Query('DELETE FROM `' + Table + '` WHERE ' + Condition);
+    DbResult := TDbRows.Create;
+    Query(DbResult, 'DELETE FROM `' + Table + '` WHERE ' + Condition);
   finally
     DbResult.Free;
@@ -341 +346 @@
 var
   TempDatabase: string;
+  DbRows: TDbRows;
 begin
   TempDatabase := Database;
   Database := 'mysql';
   Connect;
-  Query('CREATE DATABASE ' + TempDatabase);
+  try
+    DbRows := TDbRows.Create;
+    Query(DbRows, 'CREATE DATABASE ' + TempDatabase);
+  finally
+    DbRows.Free;
+  end;
   Disconnect;
   Database := TempDatabase;
@@ -351 +362 @@
 
 procedure TSqlDatabase.CreateTable(Name: string);
-begin
-  Query('CREATE TABLE `' + Name + '`' +
-  ' (`Id` INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (`Id`));');
+var
+  DbRows: TDbRows;
+begin
+  try
+    DbRows := TDbRows.Create;
+    Query(DbRows, 'CREATE TABLE `' + Name + '`' +
+    ' (`Id` INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (`Id`));');
+  finally
+    DbRows.Free;
+  end;
 end;
 
@@ -361 +379 @@
   ColTypes: array[0..17] of string = ('', 'INT', 'CHAR', 'INT', 'DOUBLE',
   'VARCHAR(255)', 'SET', 'INT', '', '', 'TEXT', 'TEXT', '', '', '', '', '', '');
-begin
-  Query('ALTER TABLE `' + Table + '` ADD `' + ColumnName + '` ' +
-    ColTypes[Integer(ColumnType)] + ' NOT NULL');
+var
+  DbRows: TDbRows;
+begin
+  try
+    DbRows := TDbRows.Create;
+    Query(DbRows, 'ALTER TABLE `' + Table + '` ADD `' + ColumnName + '` ' +
+      ColTypes[Integer(ColumnType)] + ' NOT NULL');
+  finally
+    DbRows.Free;
+  end;
 end;