Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix mappings for Oracle. Change Oracle driver for TeamCity to OracleC…

…lientDriver which is provided with .NET Framework.
  • Loading branch information...
commit c13f23ef57baf908bebfc83df3b1d0fb189b552a 1 parent 13342b3
@hazzik hazzik authored
View
2  src/NHibernate.Test/NHSpecificTest/NH2244/Mappings.hbm.xml
@@ -6,7 +6,7 @@
</id>
<component name="Phone" class="PhoneNumber">
<property name="CountryCode"/>
- <property name="Number"/>
+ <property name="Number" column="`Number`"/>
</component>
</class>
</hibernate-mapping>
View
17 src/NHibernate.Test/NHSpecificTest/NH2673/CachingWithTrasformerTests.cs
@@ -18,11 +18,12 @@ protected override HbmMapping GetMappings()
var mapper = new ConventionModelMapper();
mapper.BeforeMapClass += (inspector, type, map) => map.Id(x => x.Generator(Generators.HighLow));
mapper.BeforeMapClass += (inspector, type, map) => map.Cache(x => x.Usage(CacheUsage.ReadWrite));
+ mapper.BeforeMapClass += (inspector, type, map) => map.Table(type.Name + "s");
mapper.BeforeMapSet += (inspector, property, map) =>
- {
- map.Cascade(Mapping.ByCode.Cascade.All);
- map.Cache(x => x.Usage(CacheUsage.ReadWrite));
- };
+ {
+ map.Cascade(Mapping.ByCode.Cascade.All);
+ map.Cache(x => x.Usage(CacheUsage.ReadWrite));
+ };
var mapping = mapper.CompileMappingFor(new[] { typeof(Blog), typeof(Post), typeof(Comment) });
return mapping;
}
@@ -30,10 +31,10 @@ protected override HbmMapping GetMappings()
protected override void Configure(Cfg.Configuration configuration)
{
configuration.Cache(x =>
- {
- x.Provider<HashtableCacheProvider>();
- x.UseQueryCache = true;
- });
+ {
+ x.Provider<HashtableCacheProvider>();
+ x.UseQueryCache = true;
+ });
}
private class Scenario: IDisposable
View
2  src/NHibernate.Test/NHSpecificTest/NH2736/Mappings.hbm.xml
@@ -7,7 +7,7 @@
<id name="Id">
<generator class="native"/>
</id>
- <property name="Number" />
+ <property name="Number" column="`Number`" />
<bag name="Items" inverse="true" cascade="all-delete-orphan">
<key column="SalesOrder" />
<one-to-many class="Item"/>
View
14 src/NHibernate.Test/Stateless/Fetching/Mappings.hbm.xml
@@ -2,28 +2,28 @@
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
assembly="NHibernate.Test"
namespace="NHibernate.Test.Stateless.Fetching">
- <class name="User" table="User_">
+ <class name="User" table="Users">
<id name="Id" type="long">
<generator class="increment" />
</id>
<property name="Name" />
</class>
- <class name="Resource">
+ <class name="Resource" table="Resources">
<id name="Id" type="long">
<generator class="increment" />
</id>
- <property name="Name" />
- <many-to-one name="Owner"/>
+ <property name="Name"/>
+ <many-to-one name="Owner" column="OwnerId"/>
</class>
- <class name="Task">
+ <class name="Task" table="Tasks">
<id name="Id" type="long">
<generator class="increment" />
</id>
<property name="Description" />
- <many-to-one name="User" column="user_"/>
- <many-to-one name="Resource"/>
+ <many-to-one name="User" column="UserId"/>
+ <many-to-one name="Resource" column="ResourceId"/>
<property name="DueDate" />
<property name="StartDate" />
<property name="CompletionDate" />
View
2  teamcity.build
@@ -104,7 +104,7 @@
</target>
<target name="setup-teamcity-oracle32">
- <property name="nhibernate.connection.driver_class" value="NHibernate.Driver.OracleDataClientDriver" />
+ <property name="nhibernate.connection.driver_class" value="NHibernate.Driver.OracleClientDriver" />
<property name="nhibernate.dialect" value="NHibernate.Dialect.Oracle10gDialect" />
<property name="nhibernate.connection.connection_string" value="User ID=nhibernate;Password=nhibernate;Data Source=XE" />
<copy todir="${bin.dir}">

2 comments on commit c13f23e

@hazzik
Owner

It is temporary while ODP.NET is not updated on http://teamcity.codebetter.com

Please sign in to comment.
Something went wrong with that request. Please try again.