Add testing Oracle to Git Hub Actions (#2848)

bahusoid · web-flow · commit 0820f874d031 · 2021-07-17T01:35:58.000Z
diff --git a/.github/workflows/NetCoreTests.yml b/.github/workflows/NetCoreTests.yml
@@ -16,6 +16,8 @@ jobs:
             CONNECTION_STRING: "DataSource=localhost;Database=nhibernate;User=SYSDBA;Password=nhibernate;charset=utf8;"
           - DB: MySQL
             CONNECTION_STRING: "Server=localhost;Uid=root;Password=nhibernate;Database=nhibernate;Old Guids=True;"
+          - DB: Oracle
+            CONNECTION_STRING: "User ID=nhibernate;Password=nhibernate;Metadata Pooling=false;Self Tuning=false;Data Source=(DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = localhost)(PORT = 1521)) (CONNECT_DATA = (SERVER = DEDICATED) (SERVICE_NAME = XEPDB1)))"
           - DB: SQLite
     runs-on: ubuntu-latest
     continue-on-error: ${{matrix.ALLOW_FAILURE == true}}
@@ -45,6 +47,11 @@ jobs:
       run: |
         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
 
+    - name: Set up Oracle
+      if: matrix.DB == 'Oracle'
+      run: |
+        docker run -d -p 1521:1521 -e APP_USER=nhibernate -e APP_USER_PASSWORD=nhibernate -e ORACLE_PASSWORD=nhibernate gvenzl/oracle-xe:18-slim
+
     - uses: actions/checkout@v2
     - name: Setup .NET
       uses: actions/setup-dotnet@v1.8.0
diff --git a/psake.ps1 b/psake.ps1
@@ -62,6 +62,11 @@ Task Set-Configuration {
         'SqlServer2012' = @{
             'connection.connection_string' = 'Server=(local)\SQL2017;User ID=sa;Password=Password12!;initial catalog=nhibernate;';
             'dialect' = 'NHibernate.Dialect.MsSql2012Dialect'
+        };
+        'Oracle' = @{
+            'connection.connection_string' = 'User ID=nhibernate;Password=nhibernate;Metadata Pooling=false;Self Tuning=false;Data Source=(DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = localhost)(PORT = 1521)) (CONNECT_DATA = (SERVER = DEDICATED) (SERVICE_NAME = XEPDB1)))';
+            'connection.driver_class' = 'NHibernate.Driver.OracleManagedDataClientDriver';
+            'dialect' = 'NHibernate.Dialect.Oracle10gDialect'
         }
     }
     #Settings for current build
diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1171/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1171/Fixture.cs
@@ -20,8 +20,11 @@ public class FixtureAsync : BugTestCase
 	{
 		protected override bool AppliesTo(Dialect.Dialect dialect)
 		{
-			// Firebird has issues with comments containing apostrophes
-			return !(dialect is FirebirdDialect);
+			return
+				// Firebird has issues with comments containing apostrophes
+				!(dialect is FirebirdDialect)
+				// GH-2853: Oracle client bug: throws Oracle.ManagedDataAccess.Client.OracleException : ORA-01008: not all variables bound
+				&& !(dialect is Oracle8iDialect);
 		}
 
 		protected override void Configure(NHibernate.Cfg.Configuration configuration)
diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1693/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1693/Fixture.cs
@@ -49,7 +49,7 @@ public async Task without_filterAsync()
 			using (var tx = session.BeginTransaction())
 			{
 				var q1 =
-					"from Invoice i where i.Mode='a' and i.Category=:cat and not exists (from Invoice i2 where i2.Mode='a' and i2.Category=:cat and i2.Num=i.Num+1)";
+					"from Invoice i where i.Mode='a' and i.Category=:cat and not exists (from Invoice i2 where i2.Mode='a' and i2.Category=:cat and i2.Num=i.Num+1) order by i.Num";
 				var list = await (session.CreateQuery(q1)
 					.SetParameter("cat", 10)
 					.ListAsync<Invoice>());
@@ -70,7 +70,7 @@ public async Task with_filterAsync()
 				session.EnableFilter("modeFilter").SetParameter("currentMode", "a");
 
 				var q1 =
-					"from Invoice i where i.Category=:cat and not exists (from Invoice i2 where i2.Category=:cat and i2.Num=i.Num+1)";
+					"from Invoice i where i.Category=:cat and not exists (from Invoice i2 where i2.Category=:cat and i2.Num=i.Num+1) order by i.Num";
 				var list = await (session.CreateQuery(q1)
 					.SetParameter("cat", 10)
 					.ListAsync<Invoice>());
diff --git a/src/NHibernate.Test/Async/Tools/hbm2ddl/SchemaMetadataUpdaterTest/SchemaMetadataUpdaterFixture.cs b/src/NHibernate.Test/Async/Tools/hbm2ddl/SchemaMetadataUpdaterTest/SchemaMetadataUpdaterFixture.cs
@@ -254,7 +254,7 @@ public async Task WhenConfiguredOnlyExplicitAutoQuoteAsync()
 			// Test uses the default dialect driver, which will not accept Odbc or OleDb connection strings.
 			if (typeof(OdbcDriver).IsAssignableFrom(driverClass) || typeof(OleDbDriver).IsAssignableFrom(driverClass))
 				Assert.Ignore("Test is not compatible with OleDb or ODBC driver connection strings");
-			var configuredDialect = Dialect.Dialect.GetDialect();
+			var configuredDialect = Dialect.Dialect.GetDialect(configuration.Properties);
 			if(!configuredDialect.DefaultProperties.ContainsKey(Environment.ConnectionDriver))
 			{
 				Assert.Ignore(GetType() + " does not apply to " + configuredDialect);
diff --git a/src/NHibernate.Test/NHSpecificTest/NH1171/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1171/Fixture.cs
@@ -9,8 +9,11 @@ public class Fixture : BugTestCase
 	{
 		protected override bool AppliesTo(Dialect.Dialect dialect)
 		{
-			// Firebird has issues with comments containing apostrophes
-			return !(dialect is FirebirdDialect);
+			return
+				// Firebird has issues with comments containing apostrophes
+				!(dialect is FirebirdDialect)
+				// GH-2853: Oracle client bug: throws Oracle.ManagedDataAccess.Client.OracleException : ORA-01008: not all variables bound
+				&& !(dialect is Oracle8iDialect);
 		}
 
 		protected override void Configure(NHibernate.Cfg.Configuration configuration)
diff --git a/src/NHibernate.Test/NHSpecificTest/NH1693/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1693/Fixture.cs
@@ -38,7 +38,7 @@ public void without_filter()
 			using (var tx = session.BeginTransaction())
 			{
 				var q1 =
-					"from Invoice i where i.Mode='a' and i.Category=:cat and not exists (from Invoice i2 where i2.Mode='a' and i2.Category=:cat and i2.Num=i.Num+1)";
+					"from Invoice i where i.Mode='a' and i.Category=:cat and not exists (from Invoice i2 where i2.Mode='a' and i2.Category=:cat and i2.Num=i.Num+1) order by i.Num";
 				var list = session.CreateQuery(q1)
 					.SetParameter("cat", 10)
 					.List<Invoice>();
@@ -59,7 +59,7 @@ public void with_filter()
 				session.EnableFilter("modeFilter").SetParameter("currentMode", "a");
 
 				var q1 =
-					"from Invoice i where i.Category=:cat and not exists (from Invoice i2 where i2.Category=:cat and i2.Num=i.Num+1)";
+					"from Invoice i where i.Category=:cat and not exists (from Invoice i2 where i2.Category=:cat and i2.Num=i.Num+1) order by i.Num";
 				var list = session.CreateQuery(q1)
 					.SetParameter("cat", 10)
 					.List<Invoice>();
diff --git a/src/NHibernate.Test/NHibernate.Test.csproj b/src/NHibernate.Test/NHibernate.Test.csproj
@@ -74,12 +74,13 @@
     <Reference Include="System.Threading.Tasks" />
     <Reference Include="System.Data.OracleClient" />
     <PackageReference Include="Microsoft.SqlServer.Compact" Version="4.0.8876.1" />
-    <PackageReference Include="Oracle.ManagedDataAccess" Version="12.1.2400" />
+    <PackageReference Include="Oracle.ManagedDataAccess" Version="19.11.0" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.0'">
     <PackageReference Include="System.CodeDom" Version="4.7.0" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
     <PackageReference Include="System.Data.OracleClient" Version="1.0.8" />
+    <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.19.110" />
     <PackageReference Include="System.Data.Odbc" Version="4.7.0" />
     <PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
     <PackageReference Include="NUnitLite" Version="3.13.2" />
diff --git a/src/NHibernate.Test/Tools/hbm2ddl/SchemaMetadataUpdaterTest/SchemaMetadataUpdaterFixture.cs b/src/NHibernate.Test/Tools/hbm2ddl/SchemaMetadataUpdaterTest/SchemaMetadataUpdaterFixture.cs
@@ -259,7 +259,7 @@ public void WhenConfiguredOnlyExplicitAutoQuote()
 			// Test uses the default dialect driver, which will not accept Odbc or OleDb connection strings.
 			if (typeof(OdbcDriver).IsAssignableFrom(driverClass) || typeof(OleDbDriver).IsAssignableFrom(driverClass))
 				Assert.Ignore("Test is not compatible with OleDb or ODBC driver connection strings");
-			var configuredDialect = Dialect.Dialect.GetDialect();
+			var configuredDialect = Dialect.Dialect.GetDialect(configuration.Properties);
 			if(!configuredDialect.DefaultProperties.ContainsKey(Environment.ConnectionDriver))
 			{
 				Assert.Ignore(GetType() + " does not apply to " + configuredDialect);

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,11 @@ Task Set-Configuration {`
`62`	`62`	`'SqlServer2012' = @{`
`63`	`63`	`'connection.connection_string' = 'Server=(local)\SQL2017;User ID=sa;Password=Password12!;initial catalog=nhibernate;';`
`64`	`64`	`'dialect' = 'NHibernate.Dialect.MsSql2012Dialect'`
	`65`	`+ };`
	`66`	`+ 'Oracle' = @{`
	`67`	`+ 'connection.connection_string' = 'User ID=nhibernate;Password=nhibernate;Metadata Pooling=false;Self Tuning=false;Data Source=(DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = localhost)(PORT = 1521)) (CONNECT_DATA = (SERVER = DEDICATED) (SERVICE_NAME = XEPDB1)))';`
	`68`	`+ 'connection.driver_class' = 'NHibernate.Driver.OracleManagedDataClientDriver';`
	`69`	`+ 'dialect' = 'NHibernate.Dialect.Oracle10gDialect'`
`65`	`70`	`}`
`66`	`71`	`}`
`67`	`72`	`#Settings for current build`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,11 @@ public class FixtureAsync : BugTestCase`
`20`	`20`	`{`
`21`	`21`	`protected override bool AppliesTo(Dialect.Dialect dialect)`
`22`	`22`	`{`
`23`		`- // Firebird has issues with comments containing apostrophes`
`24`		`- return !(dialect is FirebirdDialect);`
	`23`	`+ return`
	`24`	`+ // Firebird has issues with comments containing apostrophes`
	`25`	`+ !(dialect is FirebirdDialect)`
	`26`	`+ // GH-2853: Oracle client bug: throws Oracle.ManagedDataAccess.Client.OracleException : ORA-01008: not all variables bound`
	`27`	`+ && !(dialect is Oracle8iDialect);`
`25`	`28`	`}`
`26`	`29`
`27`	`30`	`protected override void Configure(NHibernate.Cfg.Configuration configuration)`
Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ public async Task WhenConfiguredOnlyExplicitAutoQuoteAsync()`
`254`	`254`	`// Test uses the default dialect driver, which will not accept Odbc or OleDb connection strings.`
`255`	`255`	`if (typeof(OdbcDriver).IsAssignableFrom(driverClass) \|\| typeof(OleDbDriver).IsAssignableFrom(driverClass))`
`256`	`256`	`Assert.Ignore("Test is not compatible with OleDb or ODBC driver connection strings");`
`257`		`- var configuredDialect = Dialect.Dialect.GetDialect();`
	`257`	`+ var configuredDialect = Dialect.Dialect.GetDialect(configuration.Properties);`
`258`	`258`	`if(!configuredDialect.DefaultProperties.ContainsKey(Environment.ConnectionDriver))`
`259`	`259`	`{`
`260`	`260`	`Assert.Ignore(GetType() + " does not apply to " + configuredDialect);`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,11 @@ public class Fixture : BugTestCase`
`9`	`9`	`{`
`10`	`10`	`protected override bool AppliesTo(Dialect.Dialect dialect)`
`11`	`11`	`{`
`12`		`- // Firebird has issues with comments containing apostrophes`
`13`		`- return !(dialect is FirebirdDialect);`
	`12`	`+ return`
	`13`	`+ // Firebird has issues with comments containing apostrophes`
	`14`	`+ !(dialect is FirebirdDialect)`
	`15`	`+ // GH-2853: Oracle client bug: throws Oracle.ManagedDataAccess.Client.OracleException : ORA-01008: not all variables bound`
	`16`	`+ && !(dialect is Oracle8iDialect);`
`14`	`17`	`}`
`15`	`18`
`16`	`19`	`protected override void Configure(NHibernate.Cfg.Configuration configuration)`
Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,7 @@ public void WhenConfiguredOnlyExplicitAutoQuote()`
`259`	`259`	`// Test uses the default dialect driver, which will not accept Odbc or OleDb connection strings.`
`260`	`260`	`if (typeof(OdbcDriver).IsAssignableFrom(driverClass) \|\| typeof(OleDbDriver).IsAssignableFrom(driverClass))`
`261`	`261`	`Assert.Ignore("Test is not compatible with OleDb or ODBC driver connection strings");`
`262`		`- var configuredDialect = Dialect.Dialect.GetDialect();`
	`262`	`+ var configuredDialect = Dialect.Dialect.GetDialect(configuration.Properties);`
`263`	`263`	`if(!configuredDialect.DefaultProperties.ContainsKey(Environment.ConnectionDriver))`
`264`	`264`	`{`
`265`	`265`	`Assert.Ignore(GetType() + " does not apply to " + configuredDialect);`