Implementação PostgreSQL (#12)

glprog · Jun 26, 2020 · 32ca238 · 32ca238
1 parent 78864a9
commit 32ca238
Show file tree

Hide file tree

Showing 10 changed files with 371 additions and 188 deletions.
diff --git a/MiniREST.SQL.Common.pas b/MiniREST.SQL.Common.pas
@@ -5,7 +5,7 @@ interface
 uses SysUtils, Variants{$IFNDEF FPC},DB, Rtti{$ENDIF};
 
 type
-  TMiniRESTSQLDatabaseType = (dbtUnknown, dbtFirebird);
+  TMiniRESTSQLDatabaseType = (dbtUnknown, dbtFirebird, dbtPostgreSQL);
 
   TMiniRESTSQLParamType = (stString, stFloat, stInteger, stDate, stDateTime,
   stBoolean, stVariant, stUndefined);

diff --git a/MiniREST.SQL.SQLDb.pas b/MiniREST.SQL.SQLDb.pas
@@ -4,7 +4,7 @@
 interface
 
 uses Classes, SysUtils, MiniREST.SQL.Intf, MiniREST.SQL.Base, MiniREST.SQL.Common, DB,
-  sqldb, IBConnection, fgl;
+  sqldb, IBConnection, pqconnection, fgl;
 
 type
   TLogEvent = procedure (Sender : TSQLConnection; EventType : TDBEventType; Const Msg : String);
@@ -342,6 +342,7 @@ function TMiniRESTSQLConnectionSQLDb.GetDriverName(const ADatabaseType: TMiniRES
 begin
   case ADatabaseType of
     dbtFirebird: Result := 'Firebird';
+    dbtPostgreSQL: Result := 'PostgreSQL';
   end;
 end;
 
@@ -484,6 +485,7 @@ function TMiniRESTSQLConnectionSQLDb.GetConnectorType(const ADatabaseType: TMini
   case ADatabaseType of
     dbtUnknown: raise Exception.Create('Database Type not supported');
     dbtFirebird: Result := 'Firebird';
+    dbtPostgreSQL: Result := 'PostgreSQL';
   end;  
 end;
 
@@ -588,7 +590,7 @@ procedure TMiniRESTSQLConnectionSQLDb.SetConnectionParams;
     FSQLConnection.UserName := FConnectionParams.GetUserName;
     FSQLConnection.Password := FConnectionParams.GetPassword;
     FSQLConnection.DatabaseName := FConnectionParams.GetDatabaseName;
-    FSQLConnection.HostName := FConnectionParams.GetServerHostName;
+    FSQLConnection.HostName := FConnectionParams.GetServerHostName;     
     if (FConnectionParams.GetServerPort > 0) and (FConnectionParams.GetDatabaseType = dbtFirebird) then
     begin
       FSQLConnection.HostName := '';
@@ -601,6 +603,8 @@ procedure TMiniRESTSQLConnectionSQLDb.SetConnectionParams;
       LName := LStringList.Names[I];
       FSQLConnection.Params.Values[LName] := LStringList.Values[LName];
     end;
+    if (FConnectionParams.GetServerPort > 0) and (FConnectionParams.GetDatabaseType = dbtPostgreSQL) then
+      FSQLConnection.Params.Values['port'] := IntToStr(FConnectionParams.GetServerPort);
   finally
     LStringList.Free;
   end;

diff --git a/unittest/SQL/MiniRESTSQLTest.lpi b/unittest/SQL/MiniRESTSQLTest.lpi
@@ -33,40 +33,47 @@
         <PackageName Value="FCL"/>
       </Item3>
     </RequiredPackages>
-    <Units Count="8">
+    <Units Count="10">
       <Unit0>
         <Filename Value="MiniRESTSQLTest.lpr"/>
         <IsPartOfProject Value="True"/>
       </Unit0>
       <Unit1>
-        <Filename Value="test.sql.sqldb.pas"/>
+        <Filename Value="..\..\MiniREST.SQL.Base.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="Test.SQL.SQLDb"/>
       </Unit1>
       <Unit2>
-        <Filename Value="..\..\MiniREST.SQL.Base.pas"/>
+        <Filename Value="..\..\MiniREST.SQL.Common.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit2>
       <Unit3>
-        <Filename Value="..\..\MiniREST.SQL.Common.pas"/>
+        <Filename Value="..\..\MiniREST.SQL.Firebird.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit3>
       <Unit4>
-        <Filename Value="..\..\MiniREST.SQL.Firebird.pas"/>
+        <Filename Value="..\..\MiniREST.SQL.Intf.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit4>
       <Unit5>
-        <Filename Value="..\..\MiniREST.SQL.Intf.pas"/>
+        <Filename Value="Test.SQL.Default.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit5>
       <Unit6>
-        <Filename Value="Test.SQL.Default.pas"/>
+        <Filename Value="..\..\MiniREST.SQL.SQLDb.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit6>
       <Unit7>
-        <Filename Value="..\..\MiniREST.SQL.SQLDb.pas"/>
+        <Filename Value="Test.SQL.SQLDb.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit7>
+      <Unit8>
+        <Filename Value="Test.SQL.Firebird.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit8>
+      <Unit9>
+        <Filename Value="Test.SQL.PostgreSQL.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit9>
     </Units>
   </ProjectOptions>
   <CompilerOptions>

diff --git a/unittest/SQL/MiniRESTSQLTest.lpr b/unittest/SQL/MiniRESTSQLTest.lpr
@@ -3,7 +3,7 @@
 {$mode objfpc}{$H+}
 
 uses
-  Classes, TextTestRunner, Test.SQL.SQLDb, SysUtils;
+  Classes, TextTestRunner, Test.SQL.Firebird, Test.SQL.PostgreSQL, SysUtils;
 
 begin
   {$DEFINE XMLLISTENER}