Implementação

MiniREST.SQL.Base.pas

@@ -30,7 +30,8 @@   TMiniRESTSQLConnectionFactoryBase = class abstract(TInterfacedObject, IMiniRES
     FConnectionCounter: Integer;
     FConnectionsCount: Integer;
     procedure AddConnectionToNotifyFree(AConnection: IMiniRESTSQLConnection);
-    procedure ReleaseConnection(AConnection: IMiniRESTSQLConnection);
+    procedure RemoveConnectionToNotifyFree(AConnection: IMiniRESTSQLConnection);
+    procedure ReleaseConnection(AConnection: IMiniRESTSQLConnection); virtual;
     function InternalGetconnection: IMiniRESTSQLConnection; virtual; abstract;
     constructor Create(const AConnectionCount: Integer);
   public
@@ -48,7 +49,7 @@   TMiniRESTSQLConnectionBase = class abstract(TInterfacedObject, IMiniRESTSQLCon
     function _Release: Integer; stdcall;
     function GetObject: TObject; virtual; abstract;
     procedure SetOwner(AOwner: Pointer);
-    constructor Create(AOwner : IMiniRESTSQLConnectionFactory);
+    constructor Create(AOwner : IMiniRESTSQLConnectionFactory);    
   public
     procedure StartTransaction; virtual; abstract;
     procedure Commit; virtual; abstract;
@@ -213,18 +214,7 @@ procedure TMiniRESTSQLConnectionFactoryBase.ReleaseConnection(
   finally
     FCriticalSection.Leave;
   end;
-  {$ELSE}
-  RTLeventWaitFor(FConnectionGetEvent);
-  try    
-    FQueue.Add(AConnection);
-    TMiniRESTSQLConnectionBase(AConnection.GetObject).FEstaNoPool := True;
-    FConnectionsToNotifyFree.Remove(AConnection.GetObject);
-    Inc(FAvailableConnections);
-  finally
-    RTLeventSetEvent(FConnectionReleaseEvent);
-    RTLeventSetEvent(FConnectionGetEvent);
-  end;    
-  {$IFEND}
+  {$IFEND}  
 end;
 
 { TMiniRESTSQLConnectionBase }
@@ -347,4 +337,9 @@ procedure TMiniRESTSQLConnectionFactoryBase.AddConnectionToNotifyFree(AConnectio
   FConnectionsToNotifyFree.Add(AConnection.GetObject);
 end;
 
+procedure TMiniRESTSQLConnectionFactoryBase.RemoveConnectionToNotifyFree(AConnection: IMiniRESTSQLConnection);
+begin
+  FConnectionsToNotifyFree.Remove(AConnection.GetObject);
+end;
+
 end.

MiniREST.SQL.SQLDb.pas

@@ -50,6 +50,7 @@   TMiniRESTSQLConnectionFactorySQLDb = class(TMiniRESTSQLConnectionFactoryBase)
   protected
     FConnectionString: string;
     FConnectionParams: IMiniRESTSQLConnectionParamsSQLDb;
+    procedure ReleaseConnection(AConnection: IMiniRESTSQLConnection); override;
     function InternalGetconnection: IMiniRESTSQLConnection; override;
   public
     constructor Create(AParams: IMiniRESTSQLConnectionParamsSQLDb); overload;
@@ -63,6 +64,7 @@   TMiniRESTSQLConnectionSQLDb = class(TMiniRESTSQLConnectionBase)
     //FTransaction: TDBXTransaction;
     FConnectionParams: IMiniRESTSQLConnectionParamsSQLDb;
     FTransaction: TSQLTransaction;
+    FInExplicitTransaction: Boolean;
     function GetObject: TObject; override;
     function GetDriverName(const ADatabaseType: TMiniRESTSQLDatabaseType): string;
   public
@@ -104,6 +106,9 @@   TMiniRESTSQLQuerySQLDb = class(TInterfacedObject, IMiniRESTSQLQuery)
 
 implementation
 
+type
+  TMiniRESTSQLConnectionBaseCrack = class(TMiniRESTSQLConnectionBase);
+
 class function TMiniRESTSQLConnectionParamsSQLDb.New: IMiniRESTSQLConnectionParamsSQLDb;
 begin
   Result := Create;
@@ -179,10 +184,12 @@ constructor TMiniRESTSQLConnectionFactorySQLDb.Create(AParams: IMiniRESTSQLConne
 constructor TMiniRESTSQLConnectionSQLDb.Create(AOwner: IMiniRESTSQLConnectionFactory; AParams: IMiniRESTSQLConnectionParamsSQLDb);
 begin
   FSQLConnection := TSQLConnector.Create(nil);
-  FTransaction := TSQLTransaction.Create(nil);  
+  FTransaction := TSQLTransaction.Create(nil);    
   //FTransaction.Options := [stoUseImplicit];
   FSQLConnection.Transaction := FTransaction;
+  FTransaction.Action := caCommit;
   FConnectionParams := AParams;
+  FInExplicitTransaction := False;
   inherited Create(AOwner);
 end;
 
@@ -224,18 +231,21 @@ procedure TMiniRESTSQLConnectionSQLDb.Connect;
 procedure TMiniRESTSQLConnectionSQLDb.StartTransaction;
 begin
   if FTransaction.Active then
-    FTransaction.Rollback;
+    FTransaction.Rollback;  
   FTransaction.StartTransaction;
+  FInExplicitTransaction := True;
 end;
 
 procedure TMiniRESTSQLConnectionSQLDb.Commit;
 begin  
   FTransaction.Commit;
+  FInExplicitTransaction := False;
 end;
 
 procedure TMiniRESTSQLConnectionSQLDb.Rollback;
 begin
   FTransaction.Rollback;
+  FInExplicitTransaction := False;
 end;
 
 function TMiniRESTSQLConnectionSQLDb.GetQuery: IMiniRESTSQLQuery;
@@ -310,9 +320,13 @@ function TMiniRESTSQLQuerySQLDb.AddParam(AParam: IMiniRESTSQLParam): IMiniRESTSQ
 end;
 
 function TMiniRESTSQLQuerySQLDb.ApplyUpdates(const AMaxErrors: Integer): Integer;
-begin  
+var
+  LConnectionInExplicitTransaction: Boolean;
+begin    
+  LConnectionInExplicitTransaction := TMiniRESTSQLConnectionSQLDb(FConnection.GetObject).FInExplicitTransaction;
   FQry.ApplyUpdates;
-  FTransaction.Commit;  
+  if not LConnectionInExplicitTransaction then
+    FConnection.Commit;
   Result := 0;
   {TODO: Tratar o retorno. Transformar em procedure?}
 end;
@@ -331,17 +345,19 @@ constructor TMiniRESTSQLQuerySQLDb.Create(AConnection: IMiniRESTSQLConnection);
 begin
   FConnection := AConnection;
   FQry := TSQLQuery.Create(nil);
-  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;
 
@@ -364,4 +380,18 @@ function TMiniRESTSQLConnectionParamsSQLDb.SetDatabaseName(const ADatabaseName:
   FDatabaseName := ADatabaseName;
 end;
 
+procedure TMiniRESTSQLConnectionFactorySQLDb.ReleaseConnection(AConnection: IMiniRESTSQLConnection);
+begin
+  RTLeventWaitFor(FConnectionGetEvent);
+  try    
+    FQueue.Add(AConnection);    
+    TMiniRESTSQLConnectionBaseCrack(AConnection.GetObject).FEstaNoPool := True;
+    RemoveConnectionToNotifyFree(AConnection);
+    Inc(FAvailableConnections);
+  finally
+    RTLeventSetEvent(FConnectionReleaseEvent);
+    RTLeventSetEvent(FConnectionGetEvent);
+  end; 
+end;
+
 end.