Fix insert5 (#2)

* 'Implementação' * Implementação
glprog · Sep 7, 2019 · fbe3856 · fbe3856
1 parent ebf9dee
commit fbe3856
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/MiniREST.SQL.SQLDb.pas b/MiniREST.SQL.SQLDb.pas
@@ -199,7 +199,9 @@ 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);
+  if (AParams.GetDatabaseType = dbtFirebird) then
+    FTransaction.Params.Text := 'isc_tpb_read_committed';
   //FTransaction.Options := [stoUseImplicit];
   FSQLConnection.Transaction := FTransaction;
   FSQLConnection.OnLog := Log;

diff --git a/unittest/SQL/Test.SQL.Default.pas b/unittest/SQL/Test.SQL.Default.pas
@@ -46,11 +46,7 @@   TMiniRESTSQLTest = class({$IFNDEF FPC}TObject{$ELSE}TTestCase{$IFEND})
     {$IFNDEF FPC}
     [Test]
     {$IFEND}
-    procedure TestInsert4;
-    {$IFNDEF FPC}
-    [Test]
-    {$IFEND}
-    procedure TestInsert5;
+    procedure TestInsert4;    
     {$IFNDEF FPC}
     [Test]
     {$IFEND}
@@ -67,6 +63,10 @@   TMiniRESTSQLTest = class({$IFNDEF FPC}TObject{$ELSE}TTestCase{$IFEND})
     [Test]
     {$IFEND}
     procedure TestTransaction2;
+    {$IFNDEF FPC}
+    [Test]
+    {$IFEND}
+    procedure TestInsert5;
 (*     {$IFNDEF FPC}
     [Test]
     {$IFEND}
@@ -487,9 +487,15 @@ procedure TMiniRESTSQLTest.TestInsert4;
 procedure TMiniRESTSQLTest.TestInsert5;
 var
   LConn1: IMiniRESTSQLConnection;
+  LConn2: IMiniRESTSQLConnection;
   LQry, LQryID, LQryCheck: IMiniRESTSQLQuery;
+  LTotal: Integer;
 begin  
   LConn1 := FConnectionFactory.GetConnection;
+  LConn2 := FConnectionFactory.GetConnection;
+  LQryCheck := LConn2.GetQuery('SELECT COUNT(*) AS TOTAL FROM CUSTOMER');
+  LQryCheck.Open;
+  LTotal := LQryCheck.DataSet.FieldByName('TOTAL').AsInteger;
   LQry := LConn1.GetQuery;
   LQryID := LConn1.GetQuery;
   LQry.SQL := 'SELECT * FROM CUSTOMER WHERE 1=0';
@@ -501,13 +507,12 @@ procedure TMiniRESTSQLTest.TestInsert5;
   LQry.DataSet.Post;    
   LQry.ApplyUpdates(0);
 
-  LQryCheck := LConn1.GetQuery('SELECT * FROM CUSTOMER WHERE ID = :ID');
-  LQryCheck.ParamByName('ID').AsInteger := 456;
+  LQryCheck.Close;  
   LQryCheck.Open;
   {$IFNDEF FPC}
-  Assert.AreEqual(1, LQryCheck.DataSet.RecordCount);
+  Assert.AreEqual(LTotal + 1, LQryCheck.DataSet.FieldByName('TOTAL').AsInteger);
   {$ELSE}
-  CheckEquals(1, LQryCheck.DataSet.RecordCount);
+  CheckEquals(LTotal + 1, LQryCheck.DataSet.FieldByName('TOTAL').AsInteger);
   {$IFEND}
 end;
 

diff --git a/unittest/TEST.FDB b/unittest/TEST.FDB