From: <aye...@us...> - 2010-01-06 21:05:58
|
Revision: 4908 http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4908&view=rev Author: ayenderahien Date: 2010-01-06 21:05:51 +0000 (Wed, 06 Jan 2010) Log Message: ----------- Completing NH2055 previous commit Modified Paths: -------------- branches/2.1.x/nhibernate/src/NHibernate/Dialect/MsSql2000Dialect.cs branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj Added Paths: ----------- branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2055/ branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2055/AuxType.cs branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2055/Fixture.cs branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2055/Mappings.hbm.xml Modified: branches/2.1.x/nhibernate/src/NHibernate/Dialect/MsSql2000Dialect.cs =================================================================== --- branches/2.1.x/nhibernate/src/NHibernate/Dialect/MsSql2000Dialect.cs 2010-01-06 20:52:28 UTC (rev 4907) +++ branches/2.1.x/nhibernate/src/NHibernate/Dialect/MsSql2000Dialect.cs 2010-01-06 21:05:51 UTC (rev 4908) @@ -493,5 +493,13 @@ { get { return true; } } + + public override bool SupportsSqlBatches + { + get + { + return true; + } + } } } Property changes on: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2055 ___________________________________________________________________ Added: bugtraq:url + http://jira.nhibernate.org/browse/%BUGID% Added: bugtraq:logregex + NH-\d+ Added: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2055/AuxType.cs =================================================================== --- branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2055/AuxType.cs (rev 0) +++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2055/AuxType.cs 2010-01-06 21:05:51 UTC (rev 4908) @@ -0,0 +1,22 @@ +using System.Collections.Generic; +using NHibernate; +using NHibernate.Engine; +using NHibernate.Mapping; + +namespace NHibernate.Test.NHSpecificTest.NH2055 +{ + public class AuxType : AbstractAuxiliaryDatabaseObject + { + + override public string SqlCreateString(Dialect.Dialect dialect, IMapping p, string defaultCatalog, string defaultSchema) + { + return "select '" + Parameters["scriptParameter"] + "'"; + } + + override public string SqlDropString(Dialect.Dialect dialect, string defaultCatalog, string defaultSchema) + { + return "select 'drop script'"; + } + + } +} \ No newline at end of file Added: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2055/Fixture.cs =================================================================== --- branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2055/Fixture.cs (rev 0) +++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2055/Fixture.cs 2010-01-06 21:05:51 UTC (rev 4908) @@ -0,0 +1,46 @@ +using System; +using System.Collections.Generic; +using System.Data; +using NUnit.Framework; +using NHibernate.Tool.hbm2ddl; +using System.Text; +using NHibernate.Cfg; + +namespace NHibernate.Test.NHSpecificTest.NH2055 +{ + [TestFixture] + public class Fixture : BugTestCase + { + protected override bool AppliesTo(NHibernate.Dialect.Dialect dialect) + { + return (dialect is Dialect.MsSql2000Dialect); + } + + protected override void Configure(Configuration configuration) + { + base.Configure(configuration); + cfg = configuration; + } + + [Test] + public void CanCreateAndDropSchema() + { + using(var s = sessions.OpenSession()) + { + using(var cmd = s.Connection.CreateCommand()) + { + cmd.CommandType = CommandType.StoredProcedure; + + cmd.CommandText = "test_proc1"; + + Assert.AreEqual(1, cmd.ExecuteScalar()); + + cmd.CommandText = "test_proc2"; + + Assert.AreEqual(2, cmd.ExecuteScalar()); + } + } + } + + } +} Added: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2055/Mappings.hbm.xml =================================================================== --- branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2055/Mappings.hbm.xml (rev 0) +++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2055/Mappings.hbm.xml 2010-01-06 21:05:51 UTC (rev 4908) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8" ?> +<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" + assembly="NHibernate.Test" + namespace="NHibernate.Test.NHSpecificTest.NH2055"> + + <database-object> + <create> + CREATE PROC test_proc1 + AS + SELECT 1 + GO + CREATE PROC test_proc2 + AS + SELECT 2 + GO + </create> + <drop> + if (object_id('test_proc1') is not null ) + DROP PROC test_proc1 + GO + if (object_id('test_proc2') is not null ) + DROP PROC test_proc2 + GO + </drop> + </database-object> + +</hibernate-mapping> Modified: branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj =================================================================== --- branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2010-01-06 20:52:28 UTC (rev 4907) +++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2010-01-06 21:05:51 UTC (rev 4908) @@ -591,6 +591,8 @@ <Compile Include="NHSpecificTest\NH1938\Model.cs" /> <Compile Include="NHSpecificTest\NH1939\AuxType.cs" /> <Compile Include="NHSpecificTest\NH1939\Fixture.cs" /> + <Compile Include="NHSpecificTest\NH2055\AuxType.cs" /> + <Compile Include="NHSpecificTest\NH2055\Fixture.cs" /> <Compile Include="NHSpecificTest\NH2057\Fixture.cs" /> <Compile Include="NHSpecificTest\NH2057\Model.cs" /> <Compile Include="NHSpecificTest\NH1941\Fixture.cs" /> @@ -2023,6 +2025,7 @@ <EmbeddedResource Include="DriverTest\MultiTypeEntity.hbm.xml" /> <EmbeddedResource Include="DriverTest\SqlServerCeEntity.hbm.xml" /> <Content Include="DynamicEntity\package.html" /> + <EmbeddedResource Include="NHSpecificTest\NH2055\Mappings.hbm.xml" /> <EmbeddedResource Include="NHSpecificTest\NH2057\Mappings.hbm.xml" /> <EmbeddedResource Include="NHSpecificTest\NH2011\Mappings.hbm.xml" /> <EmbeddedResource Include="NHSpecificTest\ManyToOneFilters20Behaviour\Mappings.hbm.xml" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |