Changeset 33 for trunk/Common/USqlDatabase.pas

Timestamp:

Sep 13, 2010, 11:20:24 AM (14 years ago)

Author:

george

Message:

• Přidáno: Druhá varianta projektu pro sestavení TCP serveru.
• Přidáno: Vlastní obsluha vyjímek a zobrazení ve HTTP tvaru.
• Opraveno: Zpracování session třídy THTTPSessionStorageMySQL.

Location:

trunk

Files:

• . (modified) (1 prop)
• Common/USqlDatabase.pas (modified) (10 diffs)

trunk

@@ -2 +2 @@
 UConfig.pas
 bin
+lib

@@ -2 +2 @@
 UConfig.pas
 bin
+lib

trunk/Common/USqlDatabase.pas

@@ -52 +52 @@
     function GetLastErrorMessage: string;
     function GetLastErrorNumber: Integer;
-    function CheckError: Boolean;
     function GetCharset: string;
     procedure SetDatabase(const Value: string);
@@ -91 +90 @@
 implementation
 
-uses DateUtils, Math;
+uses
+  DateUtils, Math;
+
+resourcestring
+  SDatabaseQueryError = 'Database query error: "%s"';
 
 const
@@ -172 +175 @@
     FSession := NewSession;
   end else FConnected := False;
-  CheckError;
-  Rows := Query('SET NAMES ' + Encoding);
-  Rows.Free;
+
+  if LastErrorNumber <> 0 then
+    raise EQueryError.Create(Format(SDatabaseQueryError, [LastErrorMessage]));
+
+  try
+    Rows := Query('SET NAMES ' + Encoding);
+  finally
+    Rows.Free;
+  end;
 end;
 
@@ -197 +206 @@
   System.Delete(DbNames, 1, 1);
   System.Delete(DbValues, 1, 1);
-  DbResult := Query('INSERT INTO `' + Table + '` (' + DbNames + ') VALUES (' + DbValues + ')');
-  DbResult.Free;
+  try
+    DbResult := Query('INSERT INTO `' + Table + '` (' + DbNames + ') VALUES (' + DbValues + ')');
+  finally
+    DbResult.Free;
+  end;
 end;
 
@@ -210 +222 @@
   RepeatLastAction := False;
   LastQuery := Data;
-  //if not Connected then NastaveniPripojeni.ShowModal;
   Result := TDbRows.Create;
-  //repeat
   mysql_query(FSession, PChar(Data));
-  //until not
-  CheckError;
-  //if not CheckError then
-  begin
-    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
-        DbRow := mysql_fetch_row(DbResult);
-        Result[I] := TAssociativeArray.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)^));
+  if LastErrorNumber <> 0 then begin
+    raise EQueryError.Create(Format(SDatabaseQueryError, [Data]));
+  end;
+
+  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
+      DbRow := mysql_fetch_row(DbResult);
+      Result[I] := TAssociativeArray.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)^));
           end;
         end;
       end;
-    end;
   end;
   mysql_free_result(DbResult);
-  (*
-  if Assigned(DatabaseIntegrity) then
-  with DatabaseIntegrity do if not Checking then begin
-    Check;
-    DebugLog('Database integrity: Unreferenced='+IntToStr(Unreferenced)+' BadReferences='+IntToStr(BadReferences));
-  end;
-  *)
 end;
 
@@ -263 +265 @@
   System.Delete(DbNames, 1, 1);
   System.Delete(DbValues, 1, 1);
-  DbResult := Query('REPLACE INTO `' + Table + '` (' + DbNames + ') VALUES (' + DbValues + ')');
-  DbResult.Free;
+  try
+    DbResult := Query('REPLACE INTO `' + Table + '` (' + DbNames + ') VALUES (' + DbValues + ')');
+  finally
+    DbResult.Free;
+  end;
 end;
 
@@ -270 +275 @@
 begin
   Table := ATable;
-  Result := Query('SELECT ' + Filter + ' FROM `' + Table + '` WHERE '+Condition);
+  Result := Query('SELECT ' + Filter + ' FROM `' + Table + '` WHERE ' + Condition);
 end;
 
@@ -289 +294 @@
   end;
   System.Delete(DbValues, 1, 1);
-  DbResult := Query('UPDATE `' + Table + '` SET (' + DbValues + ') WHERE ' + Condition);
-  DbResult.Free;
+  try
+    DbResult := Query('UPDATE `' + Table + '` SET (' + DbValues + ') WHERE ' + Condition);
+  finally
+    DbResult.Free;
+  end;
 end;
 
@@ -303 +311 @@
 begin
   Table := ATable;
-  DbResult := Query('DELETE FROM `' + Table + '` WHERE ' + Condition);
-  DbResult.Free;
+  try
+    DbResult := Query('DELETE FROM `' + Table + '` WHERE ' + Condition);
+  finally
+    DbResult.Free;
+  end;
 end;
 
@@ -338 +349 @@
 begin
   Result := mysql_errno(FSession);
-end;
-
-function TSqlDatabase.CheckError: Boolean;
-begin
-  Result := LastErrorNumber <> 0;
-  if Result then
-    raise EQueryError.Create('Database query error: "' + LastErrorMessage + '"');
 end;
 

@@ -2 +2 @@
 UConfig.pas
 bin
+lib