Menu
▾
▴
[Nhibernate-commit] SF.net SVN: nhibernate:[4028] trunk/nhibernate/src/NHibernate
|
From: <dar...@us...> - 2009-02-04 02:49:05
|
Revision: 4028
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4028&view=rev
Author: darioquintana
Date: 2009-02-04 02:48:45 +0000 (Wed, 04 Feb 2009)
Log Message:
-----------
Minor: Fixing indentation and renaming a test.
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/NHibernateUtil.cs
trunk/nhibernate/src/NHibernate/SqlTypes/SqlTypeFactory.cs
trunk/nhibernate/src/NHibernate/Type/DateTime2Type.cs
trunk/nhibernate/src/NHibernate/Type/DateTimeOffSetType.cs
trunk/nhibernate/src/NHibernate/Type/DateTimeType.cs
trunk/nhibernate/src/NHibernate/Type/TypeFactory.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/DateTime2AndDateTimeOffSet/AllDates.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/DateTime2AndDateTimeOffSet/DateTime2AndDateTimeOffSetFixture.cs
Modified: trunk/nhibernate/src/NHibernate/NHibernateUtil.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/NHibernateUtil.cs 2009-02-03 22:49:04 UTC (rev 4027)
+++ trunk/nhibernate/src/NHibernate/NHibernateUtil.cs 2009-02-04 02:48:45 UTC (rev 4028)
@@ -115,15 +115,15 @@
/// </summary>
public static readonly NullableType DateTime = new DateTimeType();
- /// <summary>
- /// NHibernate date type
- /// </summary>
- public static readonly NullableType DateTime2 = new DateTime2Type();
+ /// <summary>
+ /// NHibernate date type
+ /// </summary>
+ public static readonly NullableType DateTime2 = new DateTime2Type();
- /// <summary>
- /// NHibernate date type
- /// </summary>
- public static readonly NullableType DateTimeOffset = new DateTimeOffsetType();
+ /// <summary>
+ /// NHibernate date type
+ /// </summary>
+ public static readonly NullableType DateTimeOffset = new DateTimeOffsetType();
/// <summary>
/// NHibernate date type
Modified: trunk/nhibernate/src/NHibernate/SqlTypes/SqlTypeFactory.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/SqlTypes/SqlTypeFactory.cs 2009-02-03 22:49:04 UTC (rev 4027)
+++ trunk/nhibernate/src/NHibernate/SqlTypes/SqlTypeFactory.cs 2009-02-04 02:48:45 UTC (rev 4028)
@@ -25,8 +25,8 @@
public static readonly SqlType Currency = new SqlType(DbType.Currency);
public static readonly SqlType Date = new SqlType(DbType.Date);
public static readonly SqlType DateTime = new SqlType(DbType.DateTime);
- public static readonly SqlType DateTime2 = new SqlType(DbType.DateTime2);
- public static readonly SqlType DateTimeOffSet = new SqlType(DbType.DateTimeOffset);
+ public static readonly SqlType DateTime2 = new SqlType(DbType.DateTime2);
+ public static readonly SqlType DateTimeOffSet = new SqlType(DbType.DateTimeOffset);
public static readonly SqlType Decimal = new SqlType(DbType.Decimal);
public static readonly SqlType Double = new SqlType(DbType.Double);
public static readonly SqlType Int16 = new SqlType(DbType.Int16);
Modified: trunk/nhibernate/src/NHibernate/Type/DateTime2Type.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Type/DateTime2Type.cs 2009-02-03 22:49:04 UTC (rev 4027)
+++ trunk/nhibernate/src/NHibernate/Type/DateTime2Type.cs 2009-02-04 02:48:45 UTC (rev 4028)
@@ -4,20 +4,20 @@
namespace NHibernate.Type
{
- /// <summary>
- /// Maps a <see cref="System.DateTime" /> Property to a <see cref="DbType.DateTime"/>
- /// </summary>
- [Serializable]
- public class DateTime2Type : DateTimeType
- {
- /// <summary></summary>
- internal DateTime2Type() : base(SqlTypeFactory.DateTime2)
- {
- }
+ /// <summary>
+ /// Maps a <see cref="System.DateTime" /> Property to a <see cref="DbType.DateTime"/>
+ /// </summary>
+ [Serializable]
+ public class DateTime2Type : DateTimeType
+ {
+ /// <summary></summary>
+ internal DateTime2Type() : base(SqlTypeFactory.DateTime2)
+ {
+ }
- public override string Name
- {
- get { return "DateTime2"; }
- }
- }
+ public override string Name
+ {
+ get { return "DateTime2"; }
+ }
+ }
}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Type/DateTimeOffSetType.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Type/DateTimeOffSetType.cs 2009-02-03 22:49:04 UTC (rev 4027)
+++ trunk/nhibernate/src/NHibernate/Type/DateTimeOffSetType.cs 2009-02-04 02:48:45 UTC (rev 4028)
@@ -6,119 +6,119 @@
namespace NHibernate.Type
{
- /// <summary>
- /// Maps a <see cref="System.DateTimeOffset" /> Property to a <see cref="DbType.DateTimeOffset"/>
- /// </summary>
- [Serializable]
- public class DateTimeOffsetType : DateTimeType
- {
- /// <summary></summary>
- public DateTimeOffsetType()
- : base(SqlTypeFactory.DateTimeOffSet)
- {
- }
+ /// <summary>
+ /// Maps a <see cref="System.DateTimeOffset" /> Property to a <see cref="DbType.DateTimeOffset"/>
+ /// </summary>
+ [Serializable]
+ public class DateTimeOffsetType : DateTimeType
+ {
+ /// <summary></summary>
+ public DateTimeOffsetType()
+ : base(SqlTypeFactory.DateTimeOffSet)
+ {
+ }
- public override string Name
- {
- get { return "DateTimeOffset"; }
- }
+ public override string Name
+ {
+ get { return "DateTimeOffset"; }
+ }
- public override System.Type ReturnedClass
- {
- get
- {
- return typeof(DateTimeOffset);
- }
- }
+ public override System.Type ReturnedClass
+ {
+ get { return typeof (DateTimeOffset); }
+ }
- public override System.Type PrimitiveClass
- {
- get { return typeof(DateTimeOffset); }
- }
+ public override System.Type PrimitiveClass
+ {
+ get { return typeof (DateTimeOffset); }
+ }
- public override void Set(IDbCommand st, object value, int index)
- {
- DateTimeOffset dateValue = (DateTimeOffset)value;
- ((IDataParameter) st.Parameters[index]).Value =
- new DateTimeOffset(dateValue.Year, dateValue.Month, dateValue.Day, dateValue.Hour, dateValue.Minute, dateValue.Second,dateValue.Offset);
- }
-
- public override object Get(IDataReader rs, int index)
- {
- try
- {
- DateTimeOffset dbValue = (DateTimeOffset)rs[index];;
- return new DateTimeOffset(dbValue.Year, dbValue.Month, dbValue.Day, dbValue.Hour, dbValue.Minute, dbValue.Second,dbValue.Offset);
- }
- catch (Exception ex)
- {
- throw new FormatException(string.Format("Input string '{0}' was not in the correct format.", rs[index]), ex);
- }
- }
+ public override IComparer Comparator
+ {
+ get { return Comparer<DateTimeOffset>.Default; }
+ }
- public override IComparer Comparator
- {
- get { return Comparer<DateTimeOffset>.Default; }
- }
+ public override void Set(IDbCommand st, object value, int index)
+ {
+ var dateValue = (DateTimeOffset) value;
+ ((IDataParameter) st.Parameters[index]).Value =
+ new DateTimeOffset(dateValue.Year, dateValue.Month, dateValue.Day, dateValue.Hour, dateValue.Minute,
+ dateValue.Second, dateValue.Offset);
+ }
- public override bool IsEqual(object x, object y)
- {
- if (x == y)
- {
- return true;
- }
+ public override object Get(IDataReader rs, int index)
+ {
+ try
+ {
+ var dbValue = (DateTimeOffset) rs[index];
+ ;
+ return new DateTimeOffset(dbValue.Year, dbValue.Month, dbValue.Day, dbValue.Hour, dbValue.Minute, dbValue.Second,
+ dbValue.Offset);
+ }
+ catch (Exception ex)
+ {
+ throw new FormatException(string.Format("Input string '{0}' was not in the correct format.", rs[index]), ex);
+ }
+ }
- if (x == null || y == null)
- {
- return false;
- }
+ public override bool IsEqual(object x, object y)
+ {
+ if (x == y)
+ {
+ return true;
+ }
- DateTimeOffset date1 = (DateTimeOffset)x;
- DateTimeOffset date2 = (DateTimeOffset)y;
+ if (x == null || y == null)
+ {
+ return false;
+ }
- if (date1.Equals(date2))
- return true;
+ var date1 = (DateTimeOffset) x;
+ var date2 = (DateTimeOffset) y;
- return (date1.Year == date2.Year &&
- date1.Month == date2.Month &&
- date1.Day == date2.Day &&
- date1.Hour == date2.Hour &&
- date1.Minute == date2.Minute &&
- date1.Second == date2.Second &&
- date1.Offset == date2.Offset);
- }
+ if (date1.Equals(date2))
+ return true;
- public override int GetHashCode(object x, EntityMode entityMode)
- {
- // Custom hash code implementation because DateTimeType is only accurate
- // up to seconds.
- DateTimeOffset date = (DateTimeOffset)x;
- int hashCode = 1;
- unchecked
- {
- hashCode = 31 * hashCode + date.Second;
- hashCode = 31 * hashCode + date.Minute;
- hashCode = 31 * hashCode + date.Hour;
- hashCode = 31 * hashCode + date.Day;
- hashCode = 31 * hashCode + date.Month;
- hashCode = 31 * hashCode + date.Year;
- }
- return hashCode;
- }
+ return (date1.Year == date2.Year &&
+ date1.Month == date2.Month &&
+ date1.Day == date2.Day &&
+ date1.Hour == date2.Hour &&
+ date1.Minute == date2.Minute &&
+ date1.Second == date2.Second &&
+ date1.Offset == date2.Offset);
+ }
- public override string ToString(object val)
- {
- return ((DateTimeOffset)val).ToString();
- }
-
- public override object FromStringValue(string xml)
- {
- return DateTimeOffset.Parse(xml);
- }
+ public override int GetHashCode(object x, EntityMode entityMode)
+ {
+ // Custom hash code implementation because DateTimeType is only accurate
+ // up to seconds.
+ var date = (DateTimeOffset) x;
+ int hashCode = 1;
+ unchecked
+ {
+ hashCode = 31*hashCode + date.Second;
+ hashCode = 31*hashCode + date.Minute;
+ hashCode = 31*hashCode + date.Hour;
+ hashCode = 31*hashCode + date.Day;
+ hashCode = 31*hashCode + date.Month;
+ hashCode = 31*hashCode + date.Year;
+ }
+ return hashCode;
+ }
- public override string ObjectToSQLString(object value, Dialect.Dialect dialect)
- {
- return "'" + ((DateTimeOffset)value) + "'";
- }
- }
+ public override string ToString(object val)
+ {
+ return ((DateTimeOffset) val).ToString();
+ }
+
+ public override object FromStringValue(string xml)
+ {
+ return DateTimeOffset.Parse(xml);
+ }
+
+ public override string ObjectToSQLString(object value, Dialect.Dialect dialect)
+ {
+ return "'" + ((DateTimeOffset) value) + "'";
+ }
+ }
}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Type/DateTimeType.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Type/DateTimeType.cs 2009-02-03 22:49:04 UTC (rev 4027)
+++ trunk/nhibernate/src/NHibernate/Type/DateTimeType.cs 2009-02-04 02:48:45 UTC (rev 4028)
@@ -26,9 +26,9 @@
{
}
- public DateTimeType(SqlType sqlTypeDateTime) : base(sqlTypeDateTime)
- {
- }
+ public DateTimeType(SqlType sqlTypeDateTime) : base(sqlTypeDateTime)
+ {
+ }
/// <summary></summary>
public override string Name
Modified: trunk/nhibernate/src/NHibernate/Type/TypeFactory.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Type/TypeFactory.cs 2009-02-03 22:49:04 UTC (rev 4027)
+++ trunk/nhibernate/src/NHibernate/Type/TypeFactory.cs 2009-02-04 02:48:45 UTC (rev 4028)
@@ -108,11 +108,11 @@
RegisterType(typeof(Byte), NHibernateUtil.Byte, "byte");
RegisterType(typeof(Char), NHibernateUtil.Character, "character");
RegisterType(typeof(CultureInfo), NHibernateUtil.CultureInfo, "locale");
- /*registering "datetime" after of "datetime2",
- NH will choose "datetime" when no type is specified in the mapping*/
- RegisterType(typeof(DateTime), NHibernateUtil.DateTime2, "datetime2");
+ /*registering "datetime" after of "datetime2",
+ NH will choose "datetime" when no type is specified in the mapping*/
+ RegisterType(typeof(DateTime), NHibernateUtil.DateTime2, "datetime2");
RegisterType(typeof(DateTime), NHibernateUtil.DateTime, "datetime");
- RegisterType(typeof(DateTimeOffset), NHibernateUtil.DateTimeOffset, "datetimeoffset");
+ RegisterType(typeof(DateTimeOffset), NHibernateUtil.DateTimeOffset, "datetimeoffset");
RegisterType(typeof(Decimal), NHibernateUtil.Decimal, "big_decimal");
RegisterType(typeof(Double), NHibernateUtil.Double, "double");
RegisterType(typeof(Guid), NHibernateUtil.Guid, "guid");
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/DateTime2AndDateTimeOffSet/AllDates.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/DateTime2AndDateTimeOffSet/AllDates.cs 2009-02-03 22:49:04 UTC (rev 4027)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/DateTime2AndDateTimeOffSet/AllDates.cs 2009-02-04 02:48:45 UTC (rev 4028)
@@ -2,14 +2,14 @@
namespace NHibernate.Test.NHSpecificTest.DateTime2AndDateTimeOffSet
{
- public class AllDates
- {
- public int Id { get; set; }
+ public class AllDates
+ {
+ public int Id { get; set; }
- public DateTime Sql_datetime { get; set; }
+ public DateTime Sql_datetime { get; set; }
- public DateTime Sql_datetime2 { get; set; }
+ public DateTime Sql_datetime2 { get; set; }
- public DateTimeOffset Sql_datetimeoffset { get; set; }
- }
+ public DateTimeOffset Sql_datetimeoffset { get; set; }
+ }
}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/DateTime2AndDateTimeOffSet/DateTime2AndDateTimeOffSetFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/DateTime2AndDateTimeOffSet/DateTime2AndDateTimeOffSetFixture.cs 2009-02-03 22:49:04 UTC (rev 4027)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/DateTime2AndDateTimeOffSet/DateTime2AndDateTimeOffSetFixture.cs 2009-02-04 02:48:45 UTC (rev 4028)
@@ -6,81 +6,80 @@
namespace NHibernate.Test.NHSpecificTest.DateTime2AndDateTimeOffSet
{
- [TestFixture]
- public class DateTime2AndDateTimeOffSetFixture : TestCase
- {
- protected override IList Mappings
- {
- get { return new[] { "NHSpecificTest.DateTime2AndDateTimeOffSet.Mappings.hbm.xml" }; }
- }
+ [TestFixture]
+ public class DateTime2AndDateTimeOffSetFixture : TestCase
+ {
+ protected override IList Mappings
+ {
+ get { return new[] {"NHSpecificTest.DateTime2AndDateTimeOffSet.Mappings.hbm.xml"}; }
+ }
- protected override string MappingsAssembly
- {
- get { return "NHibernate.Test"; }
- }
+ protected override string MappingsAssembly
+ {
+ get { return "NHibernate.Test"; }
+ }
- protected override bool AppliesTo(Dialect.Dialect dialect)
- {
- return dialect is MsSql2008Dialect;
- }
-
+ protected override bool AppliesTo(Dialect.Dialect dialect)
+ {
+ return dialect is MsSql2008Dialect;
+ }
- [Test]
- public void Dates01()
- {
- var Now = DateTime.Now;
- var NowOS = DateTimeOffset.Now;
- var dates = new AllDates
- {
- Sql_datetime = Now,
- Sql_datetime2 = DateTime.MinValue,
- Sql_datetimeoffset = NowOS,
- };
+ public class DateTimeAssert
+ {
+ public static void AreEqual(DateTime dt1, DateTime dt2)
+ {
+ bool areEqual = new DateTimeType().IsEqual(dt1, dt2);
- using(ISession s = OpenSession())
- using(ITransaction tx = s.BeginTransaction())
- {
- s.Save(dates);
- tx.Commit();
- }
+ if (!areEqual)
+ Assert.Fail("Expected {0} but was {1}");
+ }
- using(ISession s = OpenSession())
- using(ITransaction tx = s.BeginTransaction())
- {
- var datesRecovered = s.CreateQuery("from AllDates").UniqueResult<AllDates>();
-
- DateTimeAssert.AreEqual(datesRecovered.Sql_datetime,Now);
- DateTimeAssert.AreEqual(datesRecovered.Sql_datetime2, DateTime.MinValue);
- DateTimeAssert.AreEqual(datesRecovered.Sql_datetimeoffset, NowOS);
- }
+ public static void AreEqual(DateTimeOffset dt1, DateTimeOffset dt2)
+ {
+ bool areEqual = new DateTimeOffsetType().IsEqual(dt1, dt2);
- using(ISession s = OpenSession())
- using (ITransaction tx = s.BeginTransaction())
- {
- var datesRecovered = s.CreateQuery("from AllDates").UniqueResult<AllDates>();
- s.Delete(datesRecovered);
- tx.Commit();
- }
- }
+ if (!areEqual)
+ Assert.Fail("Expected {0} but was {1}");
+ }
+ }
- public class DateTimeAssert
- {
- public static void AreEqual(DateTime dt1,DateTime dt2)
- {
- bool areEqual = new DateTimeType().IsEqual(dt1,dt2);
+ [Test]
+ public void SavingAndRetrieving()
+ {
+ DateTime Now = DateTime.Now;
+ DateTimeOffset NowOS = DateTimeOffset.Now;
+ var dates = new AllDates
+ {
+ Sql_datetime = Now,
+ Sql_datetime2 = DateTime.MinValue,
+ Sql_datetimeoffset = NowOS,
+ };
- if(!areEqual)
- Assert.Fail("Expected {0} but was {1}");
- }
+ using (ISession s = OpenSession())
+ using (ITransaction tx = s.BeginTransaction())
+ {
+ s.Save(dates);
+ tx.Commit();
+ }
- public static void AreEqual(DateTimeOffset dt1, DateTimeOffset dt2)
- {
- bool areEqual = new DateTimeOffsetType().IsEqual(dt1, dt2);
+ using (ISession s = OpenSession())
+ using (ITransaction tx = s.BeginTransaction())
+ {
+ var datesRecovered = s.CreateQuery("from AllDates").UniqueResult<AllDates>();
- if (!areEqual)
- Assert.Fail("Expected {0} but was {1}");
- }
- }
- }
+ DateTimeAssert.AreEqual(datesRecovered.Sql_datetime, Now);
+ DateTimeAssert.AreEqual(datesRecovered.Sql_datetime2, DateTime.MinValue);
+ DateTimeAssert.AreEqual(datesRecovered.Sql_datetimeoffset, NowOS);
+ }
+
+ using (ISession s = OpenSession())
+ using (ITransaction tx = s.BeginTransaction())
+ {
+ var datesRecovered = s.CreateQuery("from AllDates").UniqueResult<AllDates>();
+ s.Delete(datesRecovered);
+ tx.Commit();
+ }
+ }
+ }
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
