nhibernate-commit Mailing List for NHibernate (Page 83)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 4045
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4045&view=rev
Author:   fabiomaulo
Date:     2009-02-04 22:15:23 +0000 (Wed, 04 Feb 2009)

Log Message:
-----------
Fix NH-1479 (new feature guid.native generator)

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Dialect/Dialect.cs
    trunk/nhibernate/src/NHibernate/Dialect/MsSql2000Dialect.cs
    trunk/nhibernate/src/NHibernate/Id/IdentifierGeneratorFactory.cs
    trunk/nhibernate/src/NHibernate/NHibernate.csproj
    trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj

Added Paths:
-----------
    trunk/nhibernate/src/NHibernate/Id/NativeGuidGenerator.cs
    trunk/nhibernate/src/NHibernate.Test/IdGen/NativeGuid/
    trunk/nhibernate/src/NHibernate.Test/IdGen/NativeGuid/NativeGuidFixture.cs
    trunk/nhibernate/src/NHibernate.Test/IdGen/NativeGuid/NativeGuidGeneratorFixture.cs
    trunk/nhibernate/src/NHibernate.Test/IdGen/NativeGuid/NativeGuidPoid.cs
    trunk/nhibernate/src/NHibernate.Test/IdGen/NativeGuid/NativeGuidPoid.hbm.xml

Modified: trunk/nhibernate/src/NHibernate/Dialect/Dialect.cs
===================================================================

--- trunk/nhibernate/src/NHibernate/Dialect/Dialect.cs	2009-02-04 21:49:37 UTC (rev 4044)
+++ trunk/nhibernate/src/NHibernate/Dialect/Dialect.cs	2009-02-04 22:15:23 UTC (rev 4045)
@@ -271,7 +271,7 @@
 		/// <returns> The appropriate command. </returns>
 		public virtual string SelectGUIDString
 		{
-			get{throw new NotSupportedException("dialect does not support GUIDs");}
+			get{throw new NotSupportedException("dialect does not support server side GUIDs generation.");}
 		}
 
 		/// <summary> Command used to create a table. </summary>

Modified: trunk/nhibernate/src/NHibernate/Dialect/MsSql2000Dialect.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Dialect/MsSql2000Dialect.cs	2009-02-04 21:49:37 UTC (rev 4044)
+++ trunk/nhibernate/src/NHibernate/Dialect/MsSql2000Dialect.cs	2009-02-04 22:15:23 UTC (rev 4045)
@@ -159,6 +159,11 @@
 			get { return false; }
 		}
 
+		public override string SelectGUIDString
+		{
+			get { return "select newid()"; }
+		}
+
 		/// <summary>
 		/// Generates the string to drop the table using SQL Server syntax.
 		/// </summary>

Modified: trunk/nhibernate/src/NHibernate/Id/IdentifierGeneratorFactory.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Id/IdentifierGeneratorFactory.cs	2009-02-04 21:49:37 UTC (rev 4044)
+++ trunk/nhibernate/src/NHibernate/Id/IdentifierGeneratorFactory.cs	2009-02-04 22:15:23 UTC (rev 4045)
@@ -40,6 +40,10 @@
 	///			<description><see cref="GuidCombGenerator"/></description>
 	///		</item>
 	///		<item>
+	///			<term>guid.native</term>
+	///			<description><see cref="NativeGuidGenerator"/></description>
+	///		</item>
+	///		<item>
 	///			<term>hilo</term>
 	///			<description><see cref="TableHiLoGenerator"/></description>
 	///		</item>
@@ -165,6 +169,7 @@
 			idgenerators.Add("foreign", typeof(ForeignGenerator));
 			idgenerators.Add("guid", typeof(GuidGenerator));
 			idgenerators.Add("guid.comb", typeof(GuidCombGenerator));
+			idgenerators.Add("guid.native", typeof(NativeGuidGenerator));
 			idgenerators.Add("select", typeof(SelectGenerator));
 		}
 

Added: trunk/nhibernate/src/NHibernate/Id/NativeGuidGenerator.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Id/NativeGuidGenerator.cs	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate/Id/NativeGuidGenerator.cs	2009-02-04 22:15:23 UTC (rev 4045)
@@ -0,0 +1,58 @@
+using System;
+using System.Data;
+using log4net;
+using NHibernate.Engine;
+using NHibernate.Exceptions;
+using NHibernate.SqlCommand;
+using NHibernate.SqlTypes;
+using NHibernate.Type;
+
+namespace NHibernate.Id
+{
+	/// <summary>
+	/// Generates Guid values using the server side Guid function.
+	/// </summary>
+	public class NativeGuidGenerator : IIdentifierGenerator
+	{
+		private static readonly ILog log = LogManager.GetLogger(typeof(NativeGuidGenerator));
+		private readonly IType identifierType = new GuidType();
+
+		#region Implementation of IIdentifierGenerator
+
+		public object Generate(ISessionImplementor session, object obj)
+		{
+			var sql = new SqlString(session.Factory.Dialect.SelectGUIDString);
+			try
+			{
+				IDbCommand st = session.Batcher.PrepareCommand(CommandType.Text, sql, SqlTypeFactory.NoTypes);
+				IDataReader reader = null;
+				try
+				{
+					reader = session.Batcher.ExecuteReader(st);
+					object result;
+					try
+					{
+						reader.Read();
+						result = IdentifierGeneratorFactory.Get(reader, identifierType, session);
+					}
+					finally
+					{
+						reader.Close();
+					}
+					log.Debug("GUID identifier generated: " + result);
+					return result;
+				}
+				finally
+				{
+					session.Batcher.CloseCommand(st, reader);
+				}
+			}
+			catch (Exception sqle)
+			{
+				throw ADOExceptionHelper.Convert(session.Factory.SQLExceptionConverter, sqle, "could not retrieve GUID", sql);
+			}
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file

Modified: trunk/nhibernate/src/NHibernate/NHibernate.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate/NHibernate.csproj	2009-02-04 21:49:37 UTC (rev 4044)
+++ trunk/nhibernate/src/NHibernate/NHibernate.csproj	2009-02-04 22:15:23 UTC (rev 4045)
@@ -464,6 +464,7 @@
     <Compile Include="Exceptions\ReflectionBasedSqlStateExtracter.cs" />
     <Compile Include="Exceptions\SqlStateExtracter.cs" />
     <Compile Include="Exceptions\TemplatedViolatedConstraintNameExtracter.cs" />
+    <Compile Include="Id\NativeGuidGenerator.cs" />
     <Compile Include="Id\SelectGenerator.cs" />
     <Compile Include="IFutureValue.cs" />
     <Compile Include="Impl\DelayedEnumerator.cs" />

Added: trunk/nhibernate/src/NHibernate.Test/IdGen/NativeGuid/NativeGuidFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/IdGen/NativeGuid/NativeGuidFixture.cs	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/IdGen/NativeGuid/NativeGuidFixture.cs	2009-02-04 22:15:23 UTC (rev 4045)
@@ -0,0 +1,44 @@
+using System.Collections;
+using NUnit.Framework;
+using NUnit.Framework.SyntaxHelpers;
+
+namespace NHibernate.Test.IdGen.NativeGuid
+{
+	[TestFixture]
+	public class NativeGuidFixture : TestCase
+	{
+		protected override string MappingsAssembly
+		{
+			get { return "NHibernate.Test"; }
+		}
+
+		protected override IList Mappings
+		{
+			get { return new[] {"IdGen.NativeGuid.NativeGuidPoid.hbm.xml"}; }
+		}
+
+		[Test]
+		public void Crd()
+		{
+			object savedId;
+			using (ISession s = OpenSession())
+			using (ITransaction tx = s.BeginTransaction())
+			{
+				var nativeGuidPoid = new NativeGuidPoid();
+				savedId = s.Save(nativeGuidPoid);
+				tx.Commit();
+				Assert.That(savedId, Is.Not.Null);
+				Assert.That(savedId, Is.EqualTo(nativeGuidPoid.Id));
+			}
+
+			using (ISession s = OpenSession())
+			using (ITransaction tx = s.BeginTransaction())
+			{
+				var nativeGuidPoid = s.Get<NativeGuidPoid>(savedId);
+				Assert.That(nativeGuidPoid, Is.Not.Null);
+				s.Delete(nativeGuidPoid);
+				tx.Commit();
+			}
+		}
+	}
+}
\ No newline at end of file

Added: trunk/nhibernate/src/NHibernate.Test/IdGen/NativeGuid/NativeGuidGeneratorFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/IdGen/NativeGuid/NativeGuidGeneratorFixture.cs	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/IdGen/NativeGuid/NativeGuidGeneratorFixture.cs	2009-02-04 22:15:23 UTC (rev 4045)
@@ -0,0 +1,47 @@
+using System;
+using NHibernate.Cfg;
+using NHibernate.Engine;
+using NHibernate.Id;
+using NUnit.Framework;
+using NUnit.Framework.SyntaxHelpers;
+
+namespace NHibernate.Test.IdGen.NativeGuid
+{
+	[TestFixture]
+	public class NativeGuidGeneratorFixture
+	{
+		protected Configuration cfg;
+		protected ISessionFactoryImplementor sessions;
+
+		[TestFixtureSetUp]
+		public void TestFixtureSetUp()
+		{
+			cfg = new Configuration();
+			if (TestConfigurationHelper.hibernateConfigFile != null)
+				cfg.Configure(TestConfigurationHelper.hibernateConfigFile);
+
+			sessions = (ISessionFactoryImplementor) cfg.BuildSessionFactory();
+		}
+
+		[Test]
+		public void ReturnedValueIsGuid()
+		{
+			try
+			{
+				var str = Dialect.Dialect.GetDialect().SelectGUIDString;	
+			}
+			catch (NotSupportedException)
+			{
+				Assert.Ignore("This test does not apply to {0}", Dialect.Dialect.GetDialect());
+			}
+			 
+			var gen = new NativeGuidGenerator();
+			using (ISession s = sessions.OpenSession())
+			{
+				object result = gen.Generate((ISessionImplementor)s, null);
+				Assert.That(result, Is.TypeOf(typeof (Guid)));
+				Assert.That(result, Is.Not.EqualTo(Guid.Empty));
+			}
+		}
+	}
+}
\ No newline at end of file

Added: trunk/nhibernate/src/NHibernate.Test/IdGen/NativeGuid/NativeGuidPoid.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/IdGen/NativeGuid/NativeGuidPoid.cs	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/IdGen/NativeGuid/NativeGuidPoid.cs	2009-02-04 22:15:23 UTC (rev 4045)
@@ -0,0 +1,9 @@
+using System;
+
+namespace NHibernate.Test.IdGen.NativeGuid
+{
+	public class NativeGuidPoid
+	{
+		public Guid Id { get; set; }
+	}
+}
\ No newline at end of file

Added: trunk/nhibernate/src/NHibernate.Test/IdGen/NativeGuid/NativeGuidPoid.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/IdGen/NativeGuid/NativeGuidPoid.hbm.xml	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/IdGen/NativeGuid/NativeGuidPoid.hbm.xml	2009-02-04 22:15:23 UTC (rev 4045)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+				   assembly="NHibernate.Test"
+				   namespace="NHibernate.Test.IdGen.NativeGuid"
+				   default-lazy="false">
+
+	<class name="NativeGuidPoid">
+		<id name="Id">
+			<generator class="guid.native" />
+		</id>
+	</class>
+	
+</hibernate-mapping>

Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj	2009-02-04 21:49:37 UTC (rev 4044)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj	2009-02-04 22:15:23 UTC (rev 4045)
@@ -294,6 +294,9 @@
     <Compile Include="BulkManipulation\Vehicles.cs" />
     <Compile Include="HQL\HqlFixture.cs" />
     <Compile Include="IdGen\Enhanced\SequenceStyleConfigUnitFixture.cs" />
+    <Compile Include="IdGen\NativeGuid\NativeGuidFixture.cs" />
+    <Compile Include="IdGen\NativeGuid\NativeGuidGeneratorFixture.cs" />
+    <Compile Include="IdGen\NativeGuid\NativeGuidPoid.cs" />
     <Compile Include="IdTest\Car.cs" />
     <Compile Include="IdTest\HiLoInt16Class.cs" />
     <Compile Include="IdTest\HiLoInt32Class.cs" />
@@ -1622,6 +1625,7 @@
     <EmbeddedResource Include="Cascade\JobBatch.hbm.xml" />
     <EmbeddedResource Include="Deletetransient\Person.hbm.xml" />
     <Content Include="DynamicEntity\package.html" />
+    <EmbeddedResource Include="IdGen\NativeGuid\NativeGuidPoid.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\Dates\Mappings\DateTimeOffset.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH1654\Mappings.hbm.xml" />
     <EmbeddedResource Include="Pagination\DataPoint.hbm.xml" />


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2004	Jan	Feb	Mar	Apr (248)	May (82)	Jun (90)	Jul (177)	Aug (253)	Sep (157)	Oct (151)	Nov (143)	Dec (278)
2005	Jan (152)	Feb (107)	Mar (177)	Apr (133)	May (259)	Jun (81)	Jul (119)	Aug (306)	Sep (416)	Oct (240)	Nov (329)	Dec (206)
2006	Jan (466)	Feb (382)	Mar (153)	Apr (162)	May (133)	Jun (21)	Jul (18)	Aug (37)	Sep (97)	Oct (114)	Nov (110)	Dec (28)
2007	Jan (74)	Feb (65)	Mar (49)	Apr (76)	May (43)	Jun (15)	Jul (68)	Aug (55)	Sep (63)	Oct (59)	Nov (70)	Dec (66)
2008	Jan (71)	Feb (60)	Mar (120)	Apr (31)	May (48)	Jun (81)	Jul (107)	Aug (51)	Sep (80)	Oct (83)	Nov (83)	Dec (79)
2009	Jan (83)	Feb (110)	Mar (97)	Apr (91)	May (291)	Jun (250)	Jul (197)	Aug (58)	Sep (54)	Oct (122)	Nov (68)	Dec (34)
2010	Jan (50)	Feb (17)	Mar (63)	Apr (61)	May (84)	Jun (81)	Jul (138)	Aug (144)	Sep (78)	Oct (26)	Nov (30)	Dec (61)
2011	Jan (33)	Feb (35)	Mar (166)	Apr (221)	May (109)	Jun (76)	Jul (27)	Aug (37)	Sep (1)	Oct (4)	Nov (2)	Dec (1)
2012	Jan	Feb	Mar (2)	Apr (2)	May	Jun	Jul (1)	Aug	Sep (1)	Oct	Nov (1)	Dec
2013	Jan	Feb (1)	Mar	Apr	May	Jun	Jul (1)	Aug (1)	Sep (3)	Oct (2)	Nov	Dec (1)
2014	Jan (1)	Feb (1)	Mar (3)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

nhibernate-commit Mailing List for NHibernate (Page 83)

nhibernate-commit — CVS Commits