Changeset 34 for trunk/Application

Timestamp:

Nov 24, 2011, 2:06:10 PM (13 years ago)

Author:

chronos

Message:

• Modified: Report loading is now done by TChronisClient.

Location:

trunk/Application

Files:

• Clients/UChronisClientMySQL.pas (modified) (1 diff)
• UChronisClient.pas (modified) (2 diffs)

trunk/Application/Clients/UChronisClientMySQL.pas

@@ -61 +61 @@
       Filter := '';
       for I := 0 to AList.ColumnsFilter.Count - 1 do
-        Filter := Filter + AList.ColumnsFilter[I] + ',';
-      Delete(Filter, Length(Filter), 1);
+        Filter := Filter + '`' + AList.ColumnsFilter[I] + '`, ';
+      Delete(Filter, Length(Filter) - 1, 2);
     end else Filter := '*';
     if AList.ConditionUse then Condition := '`' + AList.ConditionColumn + '` = "' +
       AList.ConditionValue + '"'
       else Condition := '1';
-    Database.Select(DbRows, AList.ObjectName, Filter, Condition);
+    Database.Query(DbRows, 'SELECT ' + Filter + ' FROM `' + AList.SchemaName + '`.`' +
+      AList.ObjectName + '` WHERE ' + Condition);
     AList.Objects.Clear;
-    for I := 0 to DbRows.Count - 1 do
+    for I := 0 to DbRows.Count - 1 do begin
       NewObject := TObjectProxy.Create;
       NewObject.Client := AList.Client;
       NewObject.Properties.Assign(TDictionaryStringString(DbRows[I]));
       AList.Objects.Add(NewObject);
+    end;
   finally
     DbRows.Free;

trunk/Application/UChronisClient.pas

@@ -43 +43 @@
     ConditionUse: Boolean;
     ObjectName: string;
+    SchemaName: string;
     Objects: TListObject; // TListObject<TObjectProxy>
+    procedure SetCondition(ColumnName: string; Value: string);
     procedure Clear;
     constructor Create;
@@ -105 +107 @@
 { TListProxy }
 
+procedure TListProxy.SetCondition(ColumnName: string; Value: string);
+begin
+  ConditionColumn := ColumnName;
+  ConditionValue := Value;
+  ConditionUse := True;
+end;
+
 procedure TListProxy.Clear;
 begin