Merge branch '3.4.x'

Author: oskarb

src/NHibernate.Test/Hql/Ast/HqlFixture.cs

@@ -305,7 +305,7 @@ public void InsertIntoFromSelect_WithSelectClauseParameters()
 
 					// assert
 					Assert.AreEqual(3, s.CreateCriteria<Animal>().SetProjection(Projections.RowCount())
-										.Add(Restrictions.Eq("bodyWeight", 5.7f)).UniqueResult<int>());
+					                    .Add(Restrictions.Gt("bodyWeight", 5.5f)).UniqueResult<int>());
 
 					s.CreateQuery("delete from Animal").ExecuteUpdate();
 					s.Transaction.Commit();

src/NHibernate.Test/VersionTest/Db/DbVersionFixture.cs

@@ -89,7 +89,10 @@ public void CollectionNoVersion()
 			t.Commit();
 			s.Close();
 
-			Assert.That(NHibernateUtil.Timestamp.IsEqual(guyTimestamp, guy.Timestamp), "owner version was incremented");
+			const string ownerVersionWasIncremented = "owner version was incremented ({0:o} => {1:o})";
+			Assert.That(NHibernateUtil.Timestamp.IsEqual(guyTimestamp, guy.Timestamp),
+			            string.Format(ownerVersionWasIncremented, guyTimestamp, guy.Timestamp));
+			Console.WriteLine(string.Format(ownerVersionWasIncremented, guyTimestamp, guy.Timestamp));
 
 			s = OpenSession();
 			t = s.BeginTransaction();
@@ -98,7 +101,8 @@ public void CollectionNoVersion()
 			t.Commit();
 			s.Close();
 
-			Assert.That(NHibernateUtil.Timestamp.IsEqual(guyTimestamp, guy.Timestamp), "owner version was incremented");
+			Assert.That(NHibernateUtil.Timestamp.IsEqual(guyTimestamp, guy.Timestamp),
+			            string.Format(ownerVersionWasIncremented, guyTimestamp, guy.Timestamp));
 
 			s = OpenSession();
 			t = s.BeginTransaction();

src/NHibernate/Dialect/MsSqlCeDialect.cs

@@ -193,5 +193,14 @@ private static int GetAfterSelectInsertPoint(SqlString sql)
 			}
 			throw new NotSupportedException("The query should start with 'SELECT' or 'SELECT DISTINCT'");
 		}
+
+		public override long TimestampResolutionInTicks
+		{
+			get
+			{
+				// MS SQL resolution is actually 3.33 ms, rounded here to 10 ms
+				return TimeSpan.TicksPerMillisecond*10L;
+			}
+		}
 	}
 }

src/NHibernate/Dialect/MySQLDialect.cs

@@ -377,5 +377,14 @@ public override string GetCastTypeName(SqlType sqlType)
 			}
 			return result;
 		}
+
+		public override long TimestampResolutionInTicks
+		{
+			get
+			{
+				// MySQL before version 5.6.4 does not support fractional seconds.
+				return TimeSpan.TicksPerSecond;
+			}
+		}
 	}
 }

src/NHibernate/Dialect/Oracle8iDialect.cs

@@ -449,6 +449,16 @@ public override IDataBaseSchema GetDataBaseSchema(DbConnection connection)
 			return new OracleDataBaseSchema(connection);
 		}
 
+		public override long TimestampResolutionInTicks
+		{
+			get
+			{
+				// Timestamps are DateTime, which in this dialect maps to Oracle DATE,
+				// which doesn't support fractional seconds.
+				return TimeSpan.TicksPerSecond;
+			}
+		}
+
 		#region Overridden informational metadata
 
 		public override bool SupportsEmptyInList