Implementação parâmetro porta (#9)

glprog · Mar 21, 2020 · 0968ac9 · 0968ac9
1 parent 48eb0be
commit 0968ac9
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 0 deletions.
diff --git a/MiniREST.SQL.SQLDb.pas b/MiniREST.SQL.SQLDb.pas
@@ -24,6 +24,8 @@ interface
     procedure SetLogEvent(const ALogEvent: TLogEvent);
     function GetServerHostName: string;
     procedure SetServerHostName(const AServerHostName: string);
+    function GetServerPort: Integer;
+    procedure SetServerPort(const AServerPort: Integer);
   end;
 
   TMiniRESTSQLConnectionParamsSQLDb = class(TMiniRESTSQLConnectionFactoryParams, IMiniRESTSQLConnectionFactoryParamsSQLDb)
@@ -35,6 +37,7 @@   TMiniRESTSQLConnectionParamsSQLDb = class(TMiniRESTSQLConnectionFactoryParams,
     FDatabaseName: string;
     FLogEvent: TLogEvent;
     FServerHostName: string;
+    FPort: Integer;
   public
     function GetConnectionString: string;
     procedure SetConnectionString(const AConnectionString: string);
@@ -50,6 +53,8 @@   TMiniRESTSQLConnectionParamsSQLDb = class(TMiniRESTSQLConnectionFactoryParams,
     procedure SetLogEvent(const ALogEvent: TLogEvent);
     function GetServerHostName: string;
     procedure SetServerHostName(const AServerHostName: string);
+    function GetServerPort: Integer;
+    procedure SetServerPort(const AServerPort: Integer);
   end;
 
   TMiniRESTSQLConnectionFactorySQLDb = class(TMiniRESTSQLConnectionFactoryBase)
@@ -568,6 +573,12 @@ procedure TMiniRESTSQLConnectionSQLDb.SetConnectionParams;
     FSQLConnection.Password := FConnectionParams.GetPassword;
     FSQLConnection.DatabaseName := FConnectionParams.GetDatabaseName;
     FSQLConnection.HostName := FConnectionParams.GetServerHostName;
+    if (FConnectionParams.GetServerPort > 0) and (FConnectionParams.GetDatabaseType = dbtFirebird) then
+    begin
+      FSQLConnection.HostName := '';
+      FSQLConnection.DatabaseName := FConnectionParams.GetServerHostName + '/' + IntToStr(FConnectionParams.GetServerPort) + ':' +
+        FConnectionParams.GetDatabaseName;
+    end;
     LStringList.Text := FConnectionParams.GetConnectionString;
     for I := 0 to LStringList.Count - 1 do
     begin
@@ -589,4 +600,14 @@ procedure TMiniRESTSQLConnectionParamsSQLDb.SetServerHostName(const AServerHostN
   FServerHostName := AServerHostName;
 end;
 
+function TMiniRESTSQLConnectionParamsSQLDb.GetServerPort: Integer;
+begin
+  Result := FPort;  
+end;
+
+procedure TMiniRESTSQLConnectionParamsSQLDb.SetServerPort(const AServerPort: Integer);
+begin
+  FPort := AServerPort;
+end;
+
 end.
diff --git a/unittest/SQL/Test.SQL.Default.pas b/unittest/SQL/Test.SQL.Default.pas
@@ -10,6 +10,7 @@ interface
   TMiniRESTSQLTest = class({$IFNDEF FPC}TObject{$ELSE}TTestCase{$IFEND})
   private
     FServerHostName: string;
+    FServerPort: Integer;
     procedure MethodThatRaiseException;
   protected
     FConnectionCount: Integer;
@@ -22,6 +23,7 @@   TMiniRESTSQLTest = class({$IFNDEF FPC}TObject{$ELSE}TTestCase{$IFEND})
     function GetSequenceValue(const ASequenceName: string): Integer;
     procedure LogConnectionPoolEvent(const AMessage: string);
     function GetServerHostName: string;
+    function GetServerPort: Integer;
   public
     {$IFNDEF FPC}
     [SetupFixture]
@@ -116,6 +118,14 @@   TMiniRESTSQLTest = class({$IFNDEF FPC}TObject{$ELSE}TTestCase{$IFEND})
     [Test]
     {$IFEND}
     procedure TestFailWithInvalidServerHostName;
+    {$IFNDEF FPC}
+    [Test]
+    {$IFEND}
+    procedure TestFailWithInvalidServerPort;
+    {$IFNDEF FPC}
+    [Test]
+    {$IFEND}
+    procedure TestSuccessWithDefaultServerPort;
 (*     {$IFNDEF FPC}
     [Test]
     {$IFEND}
@@ -210,6 +220,8 @@ procedure TMiniRESTSQLTest.Setup;
 var
   LConnection: IMiniRESTSQLConnection;  
 begin
+  FServerHostName := 'LOCALHOST';
+  FServerPort := 3050;
   {$IFDEF FPC}
   FConnectionFactory := GetConnectionFactory;
   {$IFEND}
@@ -785,4 +797,37 @@ procedure TMiniRESTSQLTest.MethodThatRaiseException;
   LQry.Open;  
 end;
 
+procedure TMiniRESTSQLTest.TestFailWithInvalidServerPort;
+begin
+  FServerPort := 3099;
+  FConnectionFactory := GetConnectionFactory(GetConnectionFactoryParams);
+  CheckException(@MethodThatRaiseException, Exception);
+end;
+
+function TMiniRESTSQLTest.GetServerPort: Integer;
+begin
+  Result := FServerPort;  
+end;
+
+procedure TMiniRESTSQLTest.TestSuccessWithDefaultServerPort;
+var
+  LConn1: IMiniRESTSQLConnection;
+  LQry: IMiniRESTSQLQuery;
+  LTotal: Integer;
+begin
+  FServerPort := 0;
+  FConnectionFactory := GetConnectionFactory(GetConnectionFactoryParams);
+  LConn1 := FConnectionFactory.GetConnection;
+  LQry := LConn1.GetQuery;
+  LQry.SQL := 'SELECT * FROM CUSTOMER WHERE NAME = :NAME';
+  LQry.ParamByName('NAME').AsString := 'HUE';
+  LQry.Open;
+
+  {$IFNDEF FPC}
+  Assert.AreTrue(LQry.DataSet.Active);
+  {$ELSE}
+  CheckTrue(LQry.DataSet.Active);
+  {$IFEND}
+end;
+
 end.
diff --git a/unittest/SQL/test.sql.sqldb.pas b/unittest/SQL/test.sql.sqldb.pas
@@ -113,6 +113,7 @@ function TMiniRESTSQLTestSQLDbFPC.InternalGetConnectionFactoryParams: IMiniRESTS
     Result.SetPassword('masterkey');
     Result.SetLogEvent(@LogEvent);
     Result.SetServerHostName(GetServerHostName);
+    Result.SetServerPort(GetServerPort);
   finally
     LConnectionInfo.Free;
   end;

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