Add Firebird 4 dialect

.github/workflows/NetCoreTests.yml

@@ -20,6 +20,10 @@ jobs:
             CONNECTION_STRING: "DataSource=localhost;Database=nhibernate;User=SYSDBA;Password=nhibernate;charset=utf8;"
             DB_INIT: |
               docker run --name firebird -e EnableWireCrypt=true -e FIREBIRD_USER=nhibernate -e FIREBIRD_PASSWORD=nhibernate -e ISC_PASSWORD=nhibernate -e FIREBIRD_DATABASE=nhibernate -p 3050:3050 -d jacobalberty/firebird:v3.0
+          - DB: Firebird4
+            CONNECTION_STRING: "DataSource=localhost;Database=nhibernate;User=SYSDBA;Password=nhibernate;charset=utf8;"
+            DB_INIT: |
+              docker run --name firebird -e EnableWireCrypt=true -e FIREBIRD_USER=nhibernate -e FIREBIRD_PASSWORD=nhibernate -e ISC_PASSWORD=nhibernate -e FIREBIRD_DATABASE=nhibernate -p 3050:3050 -d jacobalberty/firebird:v4.0
           - DB: MySQL
             CONNECTION_STRING: "Server=localhost;Uid=root;Password=nhibernate;Database=nhibernate;Old Guids=True;SslMode=none;"
             DB_INIT: |

appveyor.yml

@@ -7,6 +7,7 @@ environment:
   - DB: PostgreSQL
     CONNECTION_STRING: Host=localhost;Port=5432;Username=postgres;Password=Password12!;Database=nhibernate;Enlist=true;
   - DB: Firebird
+  - DB: Firebird4
   - DB: MySQL
     CONNECTION_STRING: Server=127.0.0.1;Uid=root;Pwd=Password12!;Database=nhibernate;Old Guids=True;SslMode=none;CharSet=utf8;
   - DB: SQLite
@@ -38,6 +39,27 @@ before_test:
         .\firebird.exe -a
         Pop-Location
       }
+      'Firebird4' {
+        $FireBirdPath = 'C:\firebird'
+        # Install Firebird
+        New-Item -ItemType Directory -Force $FireBirdPath > $null
+        Push-Location $FireBirdPath
+        Invoke-WebRequest 'https://github.com/FirebirdSQL/firebird/releases/download/v4.0.2/Firebird-4.0.2.2816-0-x64.zip' -OutFile firebird.zip
+        Unblock-File firebird.zip
+        7z x firebird.zip
+        New-Item -ItemType Directory -Force Data
+        # Declare nhibernate db
+        Add-Content -Path '.\databases.conf' -Value "`r`nnhibernate = $FireBirdPath\Data\nhibernate.fdb"
+        # Minimal db settings
+        Add-Content -Path '.\firebird.conf' -Value "`r`nAuthServer = Srp`r`nAuthClient = Srp`r`nUserManager = Srp`r`nWireCrypt = Enabled"
+        # Create SYSDBA account
+        New-Item SYSDBA.sql -Type File
+        Add-Content -Path '.\SYSDBA.sql' -Value "CREATE USER SYSDBA PASSWORD 'masterkey';`r`nCOMMIT;`r`nQUIT;"
+        .\isql -user sysdba employee -input SYSDBA.sql
+        # Start Firebird
+        .\firebird.exe -a
+        Pop-Location
+      }
       'MySQL' {
         Start-Service 'MySQL57'
         # Create nhibernate database (not handled by NHibernate.TestDatabaseSetup.dll)

build-common/NHibernate.props

@@ -2,10 +2,10 @@
   <Import Condition="Exists('NHibernate.dev.props')" Project="NHibernate.dev.props"/>
 
   <PropertyGroup>
-    <NhVersion     Condition="'$(NhVersion)' == ''"    >5.4</NhVersion>
+    <NhVersion     Condition="'$(NhVersion)' == ''"    >5.5</NhVersion>
     <VersionPatch  Condition="'$(VersionPatch)'  == ''">0</VersionPatch>
     <!-- Clear VersionSuffix for making release and set it to dev for making development builds -->
-    <VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
+    <VersionSuffix Condition="'$(VersionSuffix)' == ''">dev</VersionSuffix>
     <LangVersion Condition="'$(MSBuildProjectExtension)' != '.vbproj'">9.0</LangVersion>
 
     <VersionPrefix Condition="'$(VersionPrefix)' == ''">$(NhVersion).$(VersionPatch)</VersionPrefix>

lib/teamcity/firebird/firebird_installation.txt

@@ -1,7 +1,7 @@
 
 Installation steps for Firebird for NH TeamCity:
 
-1.  Download Firebird (Firebird-3.0.2.32703_0_x64):  https://www.firebirdsql.org/en/server-packages/;
+1.  Download Firebird (Firebird-4.0.2.2816-0-x64):  https://www.firebirdsql.org/en/server-packages/;
 2.  Run the installer AS ADMINISTRATOR... Use the default firebird password when prompted: masterkey.
 3.  Leave other settings with their defaults.
 4.  The setup should install Firebird on the machine;

psake.ps1

@@ -14,6 +14,11 @@ Task Set-Configuration {
             'connection.driver_class' = 'NHibernate.Driver.FirebirdClientDriver';
             'dialect' = 'NHibernate.Dialect.FirebirdDialect'
         };
+        'Firebird4' = @{
+            'connection.connection_string' = 'DataSource=localhost;Database=nhibernate;User ID=SYSDBA;Password=masterkey;MaxPoolSize=200;';
+            'connection.driver_class' = 'NHibernate.Driver.FirebirdClientDriver';
+            'dialect' = 'NHibernate.Dialect.Firebird4Dialect'
+        };
         'MySQL' = @{
             'connection.connection_string' = 'Server=127.0.0.1;Uid=root;Pwd=Password12!;Database=nhibernate;Old Guids=True;SslMode=none;';
             'connection.driver_class' = 'NHibernate.Driver.MySqlDataDriver';

src/NHibernate.Test/GeneratedTest/ComponentOwner.hbm.xml

@@ -72,6 +72,7 @@
 			<![CDATA[DROP TRIGGER t_iu_part_gen_comp]]>
 		</drop>
 		<dialect-scope name="NHibernate.Dialect.FirebirdDialect"/>
+		<dialect-scope name="NHibernate.Dialect.Firebird4Dialect"/>
 	</database-object>
 
-</hibernate-mapping>
+</hibernate-mapping>

src/NHibernate.Test/Generatedkeys/Select/MyEntity.hbm.xml

@@ -21,6 +21,7 @@ CREATE GENERATOR MYGENERATOR;
 DROP GENERATOR MYGENERATOR;
 		</drop>
 		<dialect-scope name="NHibernate.Dialect.FirebirdDialect"/>
+		<dialect-scope name="NHibernate.Dialect.Firebird4Dialect"/>
 	</database-object>
 
 	<database-object>
@@ -37,6 +38,7 @@ END
 DROP TRIGGER my_entity_BI;
 		</drop>
         <dialect-scope name="NHibernate.Dialect.FirebirdDialect"/>
+        <dialect-scope name="NHibernate.Dialect.Firebird4Dialect"/>
     </database-object>
 
 	<database-object>
@@ -71,4 +73,4 @@ DROP TRIGGER my_entity_BI;
 	</database-object>
 
 
-</hibernate-mapping>
+</hibernate-mapping>

src/NHibernate.Test/TestDialects/Firebird4TestDialect.cs

@@ -0,0 +1,9 @@
+namespace NHibernate.Test.TestDialects
+{
+	public class Firebird4TestDialect : FirebirdTestDialect
+	{
+		public Firebird4TestDialect(Dialect.Dialect dialect) : base(dialect)
+		{
+		}
+	}
+}

src/NHibernate/Async/Type/ByteType.cs

@@ -12,6 +12,7 @@
 using System.Collections;
 using System.Data;
 using System.Data.Common;
+using System.Numerics;
 using NHibernate.Engine;
 using NHibernate.SqlTypes;
 

src/NHibernate/Async/Type/Int16Type.cs

@@ -15,6 +15,7 @@
 using NHibernate.SqlTypes;
 using System.Collections.Generic;
 using System.Data;
+using System.Numerics;
 
 namespace NHibernate.Type
 {

src/NHibernate/Async/Type/Int32Type.cs

@@ -15,6 +15,7 @@
 using NHibernate.SqlTypes;
 using System.Collections.Generic;
 using System.Data;
+using System.Numerics;
 
 namespace NHibernate.Type
 {

src/NHibernate/Async/Type/Int64Type.cs

@@ -13,6 +13,7 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
+using System.Numerics;
 using NHibernate.Engine;
 using NHibernate.SqlTypes;
 

src/NHibernate/Async/Type/UInt16Type.cs

@@ -13,6 +13,7 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
+using System.Numerics;
 using NHibernate.Engine;
 using NHibernate.SqlTypes;
 

src/NHibernate/Async/Type/UInt32Type.cs

@@ -13,6 +13,7 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
+using System.Numerics;
 using NHibernate.Engine;
 using NHibernate.SqlTypes;
 

src/NHibernate/Async/Type/UInt64Type.cs

@@ -13,6 +13,7 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
+using System.Numerics;
 using NHibernate.Engine;
 using NHibernate.SqlTypes;
 

src/NHibernate/Dialect/Firebird4Dialect.cs

@@ -0,0 +1,15 @@
+using NHibernate.Dialect.Function;
+
+namespace NHibernate.Dialect
+{
+	public class Firebird4Dialect: FirebirdDialect
+	{
+		public override string CurrentTimestampSelectString => "select LOCALTIMESTAMP from RDB$DATABASE";
+
+		protected override void RegisterFunctions()
+		{
+			base.RegisterFunctions();
+			RegisterFunction("current_timestamp", new NoArgSQLFunction("localtimestamp", NHibernateUtil.LocalDateTime, false));
+		}
+	}
+}

src/NHibernate/Dialect/FirebirdDialect.cs

@@ -152,19 +152,6 @@ public override SqlString Render(IList args, ISessionFactoryImplementor factory)
 			}
 		}
 
-		[Serializable]
-		private class CurrentTimeStamp : NoArgSQLFunction
-		{
-			public CurrentTimeStamp() : base("current_timestamp", NHibernateUtil.LocalDateTime, true)
-			{
-			}
-
-			public override SqlString Render(IList args, ISessionFactoryImplementor factory)
-			{
-				return new SqlString(Name);
-			}
-		}
-
 		public override IDataBaseSchema GetDataBaseSchema(DbConnection connection)
 		{
 			return new FirebirdDataBaseSchema(connection);
@@ -474,7 +461,7 @@ protected virtual void RegisterFunctions()
 
 		private void OverrideStandardHQLFunctions()
 		{
-			RegisterFunction("current_timestamp", new CurrentTimeStamp());
+			RegisterFunction("current_timestamp", new NoArgSQLFunction("current_timestamp", NHibernateUtil.LocalDateTime, false));
 			RegisterFunction("current_date", new NoArgSQLFunction("current_date", NHibernateUtil.LocalDate, false));
 			RegisterFunction("length", new StandardSafeSQLFunction("char_length", NHibernateUtil.Int64, 1));
 			RegisterFunction("nullif", new StandardSafeSQLFunction("nullif", 2));

src/NHibernate/Type/ByteType.cs

@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Data;
 using System.Data.Common;
+using System.Numerics;
 using NHibernate.Engine;
 using NHibernate.SqlTypes;
 
@@ -23,12 +24,21 @@ public ByteType()
 
 		public override object Get(DbDataReader rs, int index, ISessionImplementor session)
 		{
-			return Convert.ToByte(rs[index]);
+			return rs[index] switch
+			{
+
+				BigInteger bi => (byte) bi,
+				var c => Convert.ToByte(c)
+			};
 		}
 
 		public override object Get(DbDataReader rs, string name, ISessionImplementor session)
 		{
-			return Convert.ToByte(rs[name]);
+			return rs[name] switch
+			{
+				BigInteger bi => (byte) bi,
+				var c => Convert.ToByte(c)
+			};
 		}
 
 		public override System.Type ReturnedClass

src/NHibernate/Type/DoubleType.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Data;
 using System.Data.Common;
+using System.Numerics;
 using NHibernate.Engine;
 using NHibernate.SqlTypes;
 
@@ -22,12 +23,20 @@ public DoubleType(SqlType sqlType) : base(sqlType) {}
 
 		public override object Get(DbDataReader rs, int index, ISessionImplementor session)
 		{
-			return Convert.ToDouble(rs[index]);
+			return rs[index] switch
+			{
+				BigInteger bi => (double) bi,
+				var v => Convert.ToDouble(v)
+			};
 		}
 
 		public override object Get(DbDataReader rs, string name, ISessionImplementor session)
 		{
-			return Convert.ToDouble(rs[name]);
+			return rs[name] switch
+			{
+				BigInteger bi => (double) bi,
+				var v => Convert.ToDouble(v)
+			};
 		}
 
 		/// <summary></summary>

src/NHibernate/Type/Int16Type.cs

@@ -5,6 +5,7 @@
 using NHibernate.SqlTypes;
 using System.Collections.Generic;
 using System.Data;
+using System.Numerics;
 
 namespace NHibernate.Type
 {
@@ -31,7 +32,11 @@ public override object Get(DbDataReader rs, int index, ISessionImplementor sessi
 		{
 			try
 			{
-				return Convert.ToInt16(rs[index]);
+				return rs[index] switch
+				{
+					BigInteger bi => (short) bi,
+					var c => Convert.ToInt16(c)
+				};
 			}
 			catch (Exception ex)
 			{
@@ -43,7 +48,11 @@ public override object Get(DbDataReader rs, string name, ISessionImplementor ses
 		{
 			try
 			{
-				return Convert.ToInt16(rs[name]);
+				return rs[name]switch
+				{
+					BigInteger bi => (short) bi,
+					var c => Convert.ToInt16(c)
+				};
 			}
 			catch (Exception ex)
 			{

src/NHibernate/Type/Int32Type.cs

@@ -5,6 +5,7 @@
 using NHibernate.SqlTypes;
 using System.Collections.Generic;
 using System.Data;
+using System.Numerics;
 
 namespace NHibernate.Type
 {
@@ -27,11 +28,16 @@ public override string Name
 		}
 
 		private static readonly Int32 ZERO = 0;
+
 		public override object Get(DbDataReader rs, int index, ISessionImplementor session)
 		{
 			try
 			{
-				return Convert.ToInt32(rs[index]);
+				return rs[index] switch
+				{
+					BigInteger bi => (int) bi,
+					var c => Convert.ToInt32(c)
+				};
 			}
 			catch (Exception ex)
 			{
@@ -43,7 +49,11 @@ public override object Get(DbDataReader rs, string name, ISessionImplementor ses
 		{
 			try
 			{
-				return Convert.ToInt32(rs[name]);
+				return rs[name] switch
+				{
+					BigInteger bi => (int) bi,
+					var c => Convert.ToInt32(c)
+				};
 			}
 			catch (Exception ex)
 			{

src/NHibernate/Type/Int64Type.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
+using System.Numerics;
 using NHibernate.Engine;
 using NHibernate.SqlTypes;
 
@@ -31,7 +32,11 @@ public override object Get(DbDataReader rs, int index, ISessionImplementor sessi
 		{
 			try
 			{
-				return Convert.ToInt64(rs[index]);
+				return rs[index] switch
+				{
+					BigInteger bi => (long) bi,
+					var c => Convert.ToInt64(c)
+				};
 			}
 			catch (Exception ex)
 			{
@@ -43,7 +48,11 @@ public override object Get(DbDataReader rs, string name, ISessionImplementor ses
 		{
 			try
 			{
-				return Convert.ToInt64(rs[name]);
+				return rs[name] switch
+				{
+					BigInteger bi => (long) bi,
+					var c => Convert.ToInt64(c)
+				};
 			}
 			catch (Exception ex)
 			{