Merge pull request #1854 from pettersoft/master

Add SQL Anywhere 17 support

Author: fredericDelaporte

ShowBuildMenu.bat

@@ -57,12 +57,14 @@ echo F. Add a test configuration for Oracle with managed driver.
 echo G. Add a test configuration for SQL Server Compact.
 echo H. Add a test configuration for MySql.
 echo I. Add a test configuration for SAP HANA.
+echo J. Add a test configuration for SAP SQL Anywhere.
 echo.
 echo X.  Exit to main menu.
 echo.
 
-%BUILDTOOL% prompt ABCDEFGHIX
-if errorlevel 9 goto main-menu
+%BUILDTOOL% prompt ABCDEFGHIJX
+if errorlevel 10 goto main-menu
+if errorlevel 9 goto test-setup-anywhere
 if errorlevel 8 goto test-setup-hana
 if errorlevel 7 goto test-setup-mysql
 if errorlevel 6 goto test-setup-sqlserverce
@@ -136,6 +138,13 @@ set LIB_FILES=
 set LIB_FILES2=
 goto test-setup-generic
 
+:test-setup-anywhere
+set CONFIG_NAME=SapSQLAnywhere
+set TEST_PLATFORM=AnyCPU
+set LIB_FILES=
+set LIB_FILES2=
+goto test-setup-generic
+
 :test-setup-generic
 set CFGNAME=
 set /p CFGNAME=Enter a name for your test configuration or press enter to use default name: 
@@ -221,12 +230,14 @@ echo I. NHibernate Trunk - Oracle Managed (64-bit)
 echo J. NHibernate Trunk - SQL Server Compact (32-bit)
 echo K. NHibernate Trunk - SQL Server Compact (64-bit)
 echo L. NHibernate Trunk - SQL Server ODBC (32-bit)
+echo M. NHibernate Trunk - SAP SQL Anywhere
 echo.
 echo X.  Exit to main menu.
 echo.
 
-%BUILDTOOL% prompt ABCDEFGHIJKLX
-if errorlevel 12 goto main-menu
+%BUILDTOOL% prompt ABCDEFGHIJKLMX
+if errorlevel 13 goto main-menu
+if errorlevel 12 goto teamcity-anywhere
 if errorlevel 11 goto teamcity-sqlServerOdbc
 if errorlevel 10 goto teamcity-sqlServerCe64
 if errorlevel 9 goto teamcity-sqlServerCe32
@@ -312,5 +323,11 @@ move "%CURRENT_CONFIGURATION%" "%CURRENT_CONFIGURATION%-backup" 2> nul
 move "%CURRENT_CONFIGURATION%-backup" "%CURRENT_CONFIGURATION%" 2> nul
 goto main-menu
 
+:teamcity-anywhere
+move "%CURRENT_CONFIGURATION%" "%CURRENT_CONFIGURATION%-backup" 2> nul
+%NANT% /f:teamcity.build -D:skip.manual=true -D:CCNetLabel=-1 -D:config.teamcity=sqlanywhere
+move "%CURRENT_CONFIGURATION%-backup" "%CURRENT_CONFIGURATION%" 2> nul
+goto main-menu
+
 :end
 popd

lib/teamcity/SapSQLAnywhere/SQLAnywhere_installation.txt

@@ -0,0 +1,14 @@
+Installation steps for SAP SQL Anywhere 17 for NH TeamCity:
+1.  Download SAP SQL Anywhere 17 from https://www.sap.com/products/sql-anywhere.html.
+    Please make sure you comply with it's license.
+
+2.  Run the installer
+3.  Ensure the MSDTC Windows service is enabled. All transaction scope tests, even
+    those normally not distributed, use it with SAP SQL Anywhere 17
+
+The NHibernate.TestDatabaseSetup should normally do on its own the following operations:
+1.  Create the test database with default options
+2.  Run the query
+    set option ansi_update_constraints = 'Off'
+    (Otherwise some tests will fail.)
+

src/NHibernate.Config.Templates/SapSQLAnywhere.cfg.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+This template was written to work with NHibernate.Test.
+Copy the template to your NHibernate.Test project folder and rename it hibernate.cfg.xml. Change it
+for your own use before compiling tests in Visual Studio.
+-->
+<hibernate-configuration xmlns="urn:nhibernate-configuration-2.2">
+	<session-factory name="NHibernate.Test">
+		<property name="connection.driver_class">NHibernate.Driver.SapSQLAnywhere17Driver</property>
+		<!-- Sap.Data.SQLAnywhere does not support re-enlisting in the same transaction, wrecking many usages
+		     with NHibernate when both NHibernate and the connection performs auto-enlistment. Setting
+		     "Enlist=false;" in the connection string solves this.
+		     It also requires to have the MSDTC service running, even for transaction scopes using a
+		     single connection. -->
+		<property name="connection.connection_string">
+			UID=DBA;PWD=sql;Server=localhost;DBN=nhibernate;DBF=c:\nhibernate.db;ASTOP=No;Enlist=false;
+		</property>
+		<property name="dialect">NHibernate.Dialect.SybaseSQLAnywhere12Dialect</property>
+		<property name="query.substitutions">true=1;false=0</property>
+	</session-factory>
+</hibernate-configuration>

src/NHibernate.DomainModel/ABCProxy.hbm.xml

@@ -10,8 +10,8 @@
 		</id>
 		<discriminator column="clazz_discriminata" type="Int32" force="true" not-null="false" />
 		<property name="Name" />
-		<many-to-one name="Forward" class="E" cascade="save-update" />
-		
+		<many-to-one name="Forward" column="`Forward`" class="E" cascade="save-update" />
+
 		<subclass name="B" lazy="true" discriminator-value="null">
 			<property name="Count" column="count_" type="Int32" />
 			<map name="Map">
@@ -56,4 +56,4 @@
 		<one-to-one name="Reverse" class="A" property-ref="Forward" cascade="save-update" />
 	</class>
 
-</hibernate-mapping>
+</hibernate-mapping>

src/NHibernate.DomainModel/Northwind/Mappings/Shipper.hbm.xml

@@ -14,7 +14,7 @@
 		<property name="PhoneNumber" column="Phone" type="string" length="24"
 							access="field.camelcase-underscore"/>
 
-		<property name="Reference" column="Reference" type="guid" access="field.camelcase-underscore"/>
+		<property name="Reference" column="`Reference`" type="guid" access="field.camelcase-underscore"/>
 
 		<bag name="Orders" lazy="true" access="field.camelcase-underscore"
 				 cascade="none">
@@ -24,4 +24,4 @@
 
 	</class>
 
-</hibernate-mapping>
+</hibernate-mapping>

src/NHibernate.Test/Ado/GenericBatchingBatcherFixture.cs

@@ -29,7 +29,11 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
 			return !(dialect is FirebirdDialect) &&
 			       !(dialect is Oracle8iDialect) &&
 			       !(dialect is MsSqlCeDialect) &&
-			       !(dialect is HanaDialectBase);
+			       !(dialect is HanaDialectBase) &&
+			       // A workaround exists for SQL Anywhere, see https://stackoverflow.com/a/32860293/1178314
+			       // It would imply some tweaking in the generic batcher. The same workaround could
+			       // be used for enabling future support.
+			       !(dialect is SybaseSQLAnywhere10Dialect);
 		}
 
 		[Test]

src/NHibernate.Test/Async/Ado/GenericBatchingBatcherFixture.cs

@@ -42,7 +42,11 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
 			return !(dialect is FirebirdDialect) &&
 			       !(dialect is Oracle8iDialect) &&
 			       !(dialect is MsSqlCeDialect) &&
-			       !(dialect is HanaDialectBase);
+			       !(dialect is HanaDialectBase) &&
+			       // A workaround exists for SQL Anywhere, see https://stackoverflow.com/a/32860293/1178314
+			       // It would imply some tweaking in the generic batcher. The same workaround could
+			       // be used for enabling future support.
+			       !(dialect is SybaseSQLAnywhere10Dialect);
 		}
 
 		[Test]

src/NHibernate.Test/Async/Component/Basic/ComponentWithUniqueConstraintTests.cs

@@ -32,8 +32,8 @@ protected override HbmMapping GetMappings()
 
 			mapper.Component<Person>(comp =>
 			{
-				comp.Property(p => p.Name);
-				comp.Property(p => p.Dob);
+				comp.Property(p => p.Name, m => m.NotNullable(true));
+				comp.Property(p => p.Dob, m => m.NotNullable(true));
 				comp.Unique(true); // hbm2ddl: Generate a unique constraint in the database
 			});
 
@@ -94,9 +94,9 @@ public void CannotBePersistedWithNonUniqueValuesAsync()
 						await (session.SaveAsync(e2));
 						await (session.FlushAsync());
 					});
-				Assert.That(exception.InnerException, Is.AssignableTo<DbException>());
+				Assert.That(exception.InnerException, Is.InstanceOf<DbException>());
 				Assert.That(exception.InnerException.Message,
-					Does.Contain("unique").IgnoreCase.And.Contains("constraint").IgnoreCase
+					Does.Contain("unique").IgnoreCase
 					.Or.Contains("duplicate entry").IgnoreCase);
 			}
 		}

src/NHibernate.Test/Async/Criteria/CriteriaQueryTest.cs

@@ -2719,6 +2719,9 @@ public async Task OrderProjectionTestAsync()
 		[Test]
 		public async Task OrderProjectionAliasedTestAsync()
 		{
+			if (TestDialect.HasBrokenTypeInferenceOnSelectedParameters)
+				Assert.Ignore("Current dialect does not support this test");
+
 			using (ISession session = OpenSession())
 			using (ITransaction t = session.BeginTransaction())
 			{

src/NHibernate.Test/Async/Criteria/EntityProjectionsTest.cs

@@ -8,6 +8,7 @@
 //------------------------------------------------------------------------------
 
 
+using NHibernate.Cfg;
 using NHibernate.Cfg.MappingSchema;
 using NHibernate.Criterion;
 using NHibernate.Dialect;
@@ -29,6 +30,11 @@ public class EntityProjectionsTestAsync : TestCaseMappingByCode
 		private EntityWithCompositeId _entityWithCompositeId;
 		private EntityCustomEntityName _entityWithCustomEntityName;
 
+		protected override void Configure(Configuration configuration)
+		{
+			configuration.SetProperty(Environment.FormatSql, "false");
+		}
+
 		protected override HbmMapping GetMappings()
 		{
 			var mapper = new ModelMapper();
@@ -252,12 +258,14 @@ public async Task EntityProjectionAsSelectExpressionForArgumentAliasAsync()
 		[Test]
 		public async Task EntityProjectionLockModeAsync()
 		{
+			// For this test to succeed with SQL Anywhere, ansi_update_constraints must be off.
+			// In I-SQL: set option ansi_update_constraints = 'Off'
 			if (Dialect is Oracle8iDialect)
 				Assert.Ignore("Oracle is not supported due to #1352 bug (NH-3902)");
 
 			var upgradeHint = Dialect.ForUpdateString;
 			if(string.IsNullOrEmpty(upgradeHint))
-				upgradeHint = this.Dialect.AppendLockHint(LockMode.Upgrade, string.Empty);
+				upgradeHint = Dialect.AppendLockHint(LockMode.Upgrade, string.Empty);
 			if (string.IsNullOrEmpty(upgradeHint))
 			{
 				Assert.Ignore($"Upgrade hint is not supported by dialect {Dialect.GetType().Name}");