Implementação

glprog · Mar 6, 2019 · 3b24541 · 3b24541
1 parent c448ff2
commit 3b24541
Show file tree

Hide file tree

Showing 9 changed files with 324 additions and 120 deletions.
diff --git a/MiniREST.SQL.Base.pas b/MiniREST.SQL.Base.pas
@@ -40,6 +40,8 @@   TMiniRESTSQLConnectionFactoryBase = class abstract(TInterfacedObject, IMiniRES
     function GetObject: TObject;
   end;
 
+  { TMiniRESTSQLConnectionBase }
+
   TMiniRESTSQLConnectionBase = class abstract(TInterfacedObject, IMiniRESTSQLConnection)
   strict private
     FOwner : TObject;
@@ -246,7 +248,7 @@ procedure TMiniRESTSQLConnectionBase.SetOwner(AOwner: Pointer);
   FOwner := AOwner;
 end;
 
-function TMiniRESTSQLConnectionBase._Release: Integer;
+function TMiniRESTSQLConnectionBase._Release: Integer; stdcall;
 begin
   if (FRefCount = 1) and (FOwner <> nil) and (not FEstaNoPool) then
     TMiniRESTSQLConnectionFactoryBase(FOwner).ReleaseConnection(Self);

diff --git a/MiniREST.SQL.SQLDb.pas b/MiniREST.SQL.SQLDb.pas
@@ -6,6 +6,7 @@ interface
   sqldb, IBConnection;
 
 type
+  TLogEvent = procedure (Sender : TSQLConnection; EventType : TDBEventType; Const Msg : String);
   IMiniRESTSQLConnectionParamsSQLDb = interface
   ['{F2FB358A-6369-4FCE-AA9B-75FFECA18E88}']
     function GetConnectionsCount: Integer;
@@ -20,6 +21,8 @@ interface
     function SetDatabseType(const ADatabaseType: TMiniRESTSQLDatabaseType): IMiniRESTSQLConnectionParamsSQLDb;
     function GetDatabaseName: string;
     function SetDatabaseName(const ADatabaseName: string): IMiniRESTSQLConnectionParamsSQLDb;
+    function GetLogEvent: TLogEvent;
+    function SetLogEvent(const ALogEvent: TLogEvent): IMiniRESTSQLConnectionParamsSQLDb;
   end;
 
   TMiniRESTSQLConnectionParamsSQLDb = class(TInterfacedObject, IMiniRESTSQLConnectionParamsSQLDb)
@@ -30,6 +33,7 @@   TMiniRESTSQLConnectionParamsSQLDb = class(TInterfacedObject, IMiniRESTSQLConne
     FPassword: string;
     FDatabaseType: TMiniRESTSQLDatabaseType;
     FDatabaseName: string;
+    FLogEvent: TLogEvent;
   public
     class function New: IMiniRESTSQLConnectionParamsSQLDb; 
     function GetConnectionsCount: Integer;
@@ -44,6 +48,8 @@   TMiniRESTSQLConnectionParamsSQLDb = class(TInterfacedObject, IMiniRESTSQLConne
     function SetDatabseType(const ADatabaseType: TMiniRESTSQLDatabaseType): IMiniRESTSQLConnectionParamsSQLDb;
     function GetDatabaseName: string;
     function SetDatabaseName(const ADatabaseName: string): IMiniRESTSQLConnectionParamsSQLDb;
+    function GetLogEvent: TLogEvent;
+    function SetLogEvent(const ALogEvent: TLogEvent): IMiniRESTSQLConnectionParamsSQLDb;
   end;
 
   TMiniRESTSQLConnectionFactorySQLDb = class(TMiniRESTSQLConnectionFactoryBase)
@@ -56,6 +62,8 @@   TMiniRESTSQLConnectionFactorySQLDb = class(TMiniRESTSQLConnectionFactoryBase)
     constructor Create(AParams: IMiniRESTSQLConnectionParamsSQLDb); overload;
   end;
 
+  { TMiniRESTSQLConnectionSQLDb }
+
   TMiniRESTSQLConnectionSQLDb = class(TMiniRESTSQLConnectionBase)
   private
     function GetConnectorType(const ADatabaseType: TMiniRESTSQLDatabaseType): String;
@@ -65,8 +73,10 @@   TMiniRESTSQLConnectionSQLDb = class(TMiniRESTSQLConnectionBase)
     FConnectionParams: IMiniRESTSQLConnectionParamsSQLDb;
     FTransaction: TSQLTransaction;
     FInExplicitTransaction: Boolean;
+    FLogEvent: TLogEvent;
     function GetObject: TObject; override;
     function GetDriverName(const ADatabaseType: TMiniRESTSQLDatabaseType): string;
+    procedure Log(Sender : TSQLConnection; EventType : TDBEventType; Const Msg : String);
   public
     constructor Create(AOwner: IMiniRESTSQLConnectionFactory; AParams: IMiniRESTSQLConnectionParamsSQLDb);
     destructor Destroy; override;
@@ -187,9 +197,11 @@ constructor TMiniRESTSQLConnectionSQLDb.Create(AOwner: IMiniRESTSQLConnectionFac
   FTransaction := TSQLTransaction.Create(nil);    
   //FTransaction.Options := [stoUseImplicit];
   FSQLConnection.Transaction := FTransaction;
+  FSQLConnection.OnLog := @Log;
   FTransaction.Action := caCommit;
   FConnectionParams := AParams;
   FInExplicitTransaction := False;
+  FLogEvent := AParams.GetLogEvent;  
   inherited Create(AOwner);
 end;
 
@@ -287,6 +299,13 @@ function TMiniRESTSQLConnectionSQLDb.GetDriverName(const ADatabaseType: TMiniRES
   raise Exception.Create('Not implemented');
 end;
 
+procedure TMiniRESTSQLConnectionSQLDb.Log(Sender: TSQLConnection;
+  EventType: TDBEventType; const Msg: String);
+begin
+  if Assigned(FLogEvent) then
+    FLogEvent(Sender, EventType, Msg);
+end;
+
 procedure TMiniRESTSQLQuerySQLDb.Open;
 begin
   FConnection.Connect;
@@ -326,7 +345,8 @@ function TMiniRESTSQLQuerySQLDb.ApplyUpdates(const AMaxErrors: Integer): Integer
   LConnectionInExplicitTransaction := TMiniRESTSQLConnectionSQLDb(FConnection.GetObject).FInExplicitTransaction;
   FQry.ApplyUpdates;
   if not LConnectionInExplicitTransaction then
-    FConnection.Commit;
+    FTransaction.Commit;
+    //FConnection.Commit;  
   Result := 0;
   {TODO: Tratar o retorno. Transformar em procedure?}
 end;
@@ -345,19 +365,19 @@ constructor TMiniRESTSQLQuerySQLDb.Create(AConnection: IMiniRESTSQLConnection);
 begin
   FConnection := AConnection;
   FQry := TSQLQuery.Create(nil);
-  FQry.Options := [sqoKeepOpenOnCommit];
-  //FTransaction := TSQLTransaction.Create(nil);
+  //FQry.Options := [sqoKeepOpenOnCommit];
+  FTransaction := TSQLTransaction.Create(nil);
   //FTransaction.Action := caNone;
   //FTransaction.Options := [stoUseImplicit];
-  //FTransaction.Database := TMiniRESTSQLConnectionSQLDb(AConnection.GetObject).FSQLConnection;
-  //FQry.Transaction := FTransaction;
+  FTransaction.Database := TMiniRESTSQLConnectionSQLDb(AConnection.GetObject).FSQLConnection;
+  FQry.Transaction := FTransaction;
   FQry.SQLConnection := TMiniRESTSQLConnectionSQLDb(AConnection.GetObject).FSQLConnection;  
 end;
 
 destructor TMiniRESTSQLQuerySQLDb.Destroy;
 begin
   FQry.Free;
-  //FTransaction.Free;
+  FTransaction.Free;
   inherited Destroy;
 end;
 
@@ -384,7 +404,7 @@ procedure TMiniRESTSQLConnectionFactorySQLDb.ReleaseConnection(AConnection: IMin
 begin
   RTLeventWaitFor(FConnectionGetEvent);
   try    
-    FQueue.Add(AConnection);    
+    FQueue.Add(AConnection);       
     TMiniRESTSQLConnectionBaseCrack(AConnection.GetObject).FEstaNoPool := True;
     RemoveConnectionToNotifyFree(AConnection);
     Inc(FAvailableConnections);
@@ -394,4 +414,14 @@ procedure TMiniRESTSQLConnectionFactorySQLDb.ReleaseConnection(AConnection: IMin
   end; 
 end;
 
+function TMiniRESTSQLConnectionParamsSQLDb.GetLogEvent: TLogEvent;
+begin
+  Result := FLogEvent;
+end;
+
+function TMiniRESTSQLConnectionParamsSQLDb.SetLogEvent(const ALogEvent: TLogEvent): IMiniRESTSQLConnectionParamsSQLDb;
+begin
+  FLogEvent := ALogEvent;
+end;
+
 end.
diff --git a/unittest/SQL/MiniRESTSQLTest.lpi b/unittest/SQL/MiniRESTSQLTest.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
       <SessionStorage Value="InProjectDir"/>
@@ -17,9 +17,10 @@
       <Version Value="2"/>
     </PublishOptions>
     <RunParams>
-      <local>
-        <FormatVersion Value="1"/>
-      </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default"/>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="3">
       <Item1>