Skip to content

Commit 8a733e3

Browse files
hazzikhazzik
committed
TeamCity:
- Qux.hbm.xml - rename "Stored" column as it is a reserved keyword in MySQL since 5.6 - Update ODP
1 parent 9703afe commit 8a733e3

15 files changed

+33
-57
lines changed

‎lib/teamcity/oracle-managed/common/Oracle.ManagedDataAccess.dll

84.5 KB
Binary file not shown.

‎lib/teamcity/oracle-managed/x64/OraProvCfg.exe

512 Bytes
Binary file not shown.

‎lib/teamcity/oracle-managed/x64/Oracle.ManagedDataAccessDTC.dll

0 Bytes
Binary file not shown.

‎lib/teamcity/oracle-managed/x64/Oracle.ManagedDataAccessIOP.dll

0 Bytes
Binary file not shown.

‎lib/teamcity/oracle-managed/x64/configure.bat

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -29,30 +29,7 @@ echo.
2929
echo OraProvCfg /action:gac /providerpath:"%~dp0..\PublisherPolicy\4\Policy.4.121.Oracle.ManagedDataAccess.dll"
3030
OraProvCfg /action:gac /providerpath:"%~dp0..\PublisherPolicy\4\Policy.4.121.Oracle.ManagedDataAccess.dll"
3131

32-
) else (
33-
34-
REM For local installs, unconfig odpm
35-
REM Unconfigure machine.config for ODP.NET, Managed Driver's configuration file section handler and client factory
36-
echo.
37-
echo OraProvCfg /action:unconfig /product:odpm /frameworkversion:v4.0.30319 /providerpath:"%~dp0..\common\Oracle.ManagedDataAccess.dll"
38-
OraProvCfg /action:unconfig /product:odpm /frameworkversion:v4.0.30319 /providerpath:"%~dp0..\common\Oracle.ManagedDataAccess.dll"
39-
40-
REM Remove the ODP.NET, Managed Driver assemblies from the GAC
41-
echo.
42-
echo OraProvCfg /action:ungac /providerpath:"Oracle.ManagedDataAccess, Version=4.121.2.0"
43-
OraProvCfg /action:ungac /providerpath:"Oracle.ManagedDataAccess, Version=4.121.2.0"
44-
45-
REM Remove the ODP.NET, Managed Policy assembly from the GAC
46-
echo.
47-
echo OraProvCfg /action:ungac /providerpath:"Policy.4.121.Oracle.ManagedDataAccess, Version=4.121.2.0"
48-
OraProvCfg /action:ungac /providerpath:"Policy.4.121.Oracle.ManagedDataAccess, Version=4.121.2.0"
49-
50-
REM Remove the ODP.NET, Managed DTC assembly from the GAC
51-
echo.
52-
echo OraProvCfg /action:ungac /providerpath:"Oracle.ManagedDataAccessDTC, Version=4.121.2.0"
53-
OraProvCfg /action:ungac /providerpath:"Oracle.ManagedDataAccessDTC, Version=4.121.2.0"
54-
)
55-
32+
)
5633

5734
REM Add a registry entry for enabling event logs
5835
echo.

‎lib/teamcity/oracle-managed/x86/OraProvCfg.exe

512 Bytes
Binary file not shown.

‎lib/teamcity/oracle-managed/x86/Oracle.ManagedDataAccessDTC.dll

512 Bytes
Binary file not shown.

‎lib/teamcity/oracle-managed/x86/Oracle.ManagedDataAccessIOP.dll

0 Bytes
Binary file not shown.

‎lib/teamcity/oracle-managed/x86/configure.bat

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -33,29 +33,7 @@ echo.
3333
echo OraProvCfg /action:gac /providerpath:"%~dp0..\PublisherPolicy\4\Policy.4.121.Oracle.ManagedDataAccess.dll"
3434
OraProvCfg /action:gac /providerpath:"%~dp0..\PublisherPolicy\4\Policy.4.121.Oracle.ManagedDataAccess.dll"
3535

36-
) else (
37-
38-
REM For local installs, unconfig odpm
39-
REM Unconfigure machine.config for ODP.NET, Managed Driver's configuration file section handler and client factory
40-
echo.
41-
echo OraProvCfg /action:unconfig /product:odpm /frameworkversion:v4.0.30319 /providerpath:"%~dp0..\common\Oracle.ManagedDataAccess.dll"
42-
OraProvCfg /action:unconfig /product:odpm /frameworkversion:v4.0.30319 /providerpath:"%~dp0..\common\Oracle.ManagedDataAccess.dll"
43-
44-
REM Remove the ODP.NET, Managed Driver assemblies from the GAC
45-
echo.
46-
echo OraProvCfg /action:ungac /providerpath:"Oracle.ManagedDataAccess, Version=4.121.2.0"
47-
OraProvCfg /action:ungac /providerpath:"Oracle.ManagedDataAccess, Version=4.121.2.0"
48-
49-
REM Remove the ODP.NET, Managed Policy assembly from the GAC
50-
echo.
51-
echo OraProvCfg /action:ungac /providerpath:"Policy.4.121.Oracle.ManagedDataAccess, Version=4.121.2.0"
52-
OraProvCfg /action:ungac /providerpath:"Policy.4.121.Oracle.ManagedDataAccess, Version=4.121.2.0"
53-
54-
REM Remove the ODP.NET, Managed DTC assembly from the GAC
55-
echo.
56-
echo OraProvCfg /action:ungac /providerpath:"Oracle.ManagedDataAccessDTC, Version=4.121.2.0"
57-
OraProvCfg /action:ungac /providerpath:"Oracle.ManagedDataAccessDTC, Version=4.121.2.0"
58-
)
36+
)
5937

6038
REM Add a registry entry for enabling event logs
6139
echo.

‎lib/teamcity/oracle/x64/OraProvCfg.exe

80 KB
Binary file not shown.

‎lib/teamcity/oracle/x64/Oracle.DataAccess.dll

1.8 MB
Binary file not shown.

‎lib/teamcity/oracle/x86/OraProvCfg.exe

80.5 KB
Binary file not shown.

‎lib/teamcity/oracle/x86/Oracle.DataAccess.dll

1.17 MB
Binary file not shown.

‎src/NHibernate.DomainModel/Qux.hbm.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<property name="Deleted" />
1919
<property name="Loaded" />
20-
<property name="Stored" />
20+
<property name="Stored" column="Stored_"/>
2121
<property name="Created" />
2222
<property name="ChildKey" type="Int64" />
2323
<property name="Stuff" />

‎teamcity.build

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@
101101
</target>
102102

103103
<target name="setup-teamcity-sqlite32">
104-
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.SQLite20Driver" />
105-
<property name="nhibernate.dialect" value="NHibernate.Dialect.SQLiteDialect" />
104+
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.SQLite20Driver" />
105+
<property name="nhibernate.dialect" value="NHibernate.Dialect.SQLiteDialect" />
106106
<property name="nhibernate.connection.connection_string" value="Data Source=NHibernate.db" />
107107
<copy todir="${bin.dir}">
108108
<fileset basedir="${root.dir}/lib/teamcity/sqlite/x86">
@@ -112,8 +112,8 @@
112112
</target>
113113

114114
<target name="setup-teamcity-sqlite64">
115-
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.SQLite20Driver" />
116-
<property name="nhibernate.dialect" value="NHibernate.Dialect.SQLiteDialect" />
115+
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.SQLite20Driver" />
116+
<property name="nhibernate.dialect" value="NHibernate.Dialect.SQLiteDialect" />
117117
<property name="nhibernate.connection.connection_string" value="Data Source=NHibernate.db" />
118118
<copy todir="${bin.dir}">
119119
<fileset basedir="${root.dir}/lib/teamcity/sqlite/x64">
@@ -123,8 +123,8 @@
123123
</target>
124124

125125
<target name="setup-teamcity-postgresql">
126-
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.NpgsqlDriver" />
127-
<property name="nhibernate.dialect" value="NHibernate.Dialect.PostgreSQL82Dialect" />
126+
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.NpgsqlDriver" />
127+
<property name="nhibernate.dialect" value="NHibernate.Dialect.PostgreSQL82Dialect" />
128128
<property name="nhibernate.connection.connection_string" value="Host=localhost;Port=5432;Database=nhibernate;Username=nhibernate;Password=nhibernate" />
129129
<copy todir="${bin.dir}">
130130
<fileset basedir="${root.dir}/lib/teamcity/postgresql">
@@ -133,10 +133,18 @@
133133
</copy>
134134
</target>
135135

136-
<target name="setup-teamcity-oracle32">
137-
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.OracleClientDriver" />
138-
<property name="nhibernate.dialect" value="NHibernate.Dialect.Oracle10gDialect" />
136+
<target name="setup-teamcity-oracle">
137+
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.OracleClientDriver" />
138+
<property name="nhibernate.dialect" value="NHibernate.Dialect.Oracle10gDialect" />
139139
<property name="nhibernate.connection.connection_string" value="User ID=nhibernate;Password=nhibernate;Data Source=XE" />
140+
<property name="NHibernate.Test.IgnoreFail" value="true" />
141+
<property name="teamcity.last.result" value="${root.dir}/lib/teamcity/oracle/NHibernate.Test.last-results.xml" />
142+
</target>
143+
144+
<target name="setup-teamcity-oracle32">
145+
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.OracleDataClientDriver" />
146+
<property name="nhibernate.dialect" value="NHibernate.Dialect.Oracle10gDialect" />
147+
<property name="nhibernate.connection.connection_string" value="User ID=nhibernate;Password=nhibernate;Data Source=(DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = localhost)(PORT = 1521)) (CONNECT_DATA = (SERVER = DEDICATED) (SERVICE_NAME = XE)))" />
140148
<copy todir="${bin.dir}">
141149
<fileset basedir="${root.dir}/lib/teamcity/oracle/x86">
142150
<include name="*.dll"/>
@@ -146,6 +154,19 @@
146154
<property name="teamcity.last.result" value="${root.dir}/lib/teamcity/oracle/NHibernate.Test.last-results.xml" />
147155
</target>
148156

157+
<target name="setup-teamcity-oracle64">
158+
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.OracleDataClientDriver" />
159+
<property name="nhibernate.dialect" value="NHibernate.Dialect.Oracle10gDialect" />
160+
<property name="nhibernate.connection.connection_string" value="User ID=nhibernate;Password=nhibernate;Data Source=(DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = localhost)(PORT = 1521)) (CONNECT_DATA = (SERVER = DEDICATED) (SERVICE_NAME = XE)))" />
161+
<copy todir="${bin.dir}">
162+
<fileset basedir="${root.dir}/lib/teamcity/oracle/x64">
163+
<include name="*.dll"/>
164+
</fileset>
165+
</copy>
166+
<property name="NHibernate.Test.IgnoreFail" value="true" />
167+
<property name="teamcity.last.result" value="${root.dir}/lib/teamcity/oracle/NHibernate.Test.last-results.xml" />
168+
</target>
169+
149170
<target name="setup-teamcity-oracle-managed32">
150171
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.OracleManagedDataClientDriver" />
151172
<property name="nhibernate.dialect" value="NHibernate.Dialect.Oracle10gDialect" />

0 commit comments

Comments
 (0)