Merge pull request #401 from igor-tkachev/dev

Fix #400
igor-tkachev · Jun 3, 2017 · 5e8ab9c · 5e8ab9c
2 parents 761be35 + f46ff6a
commit 5e8ab9c
Show file tree

Hide file tree

Showing 30 changed files with 105 additions and 91 deletions.
diff --git a/DataProviders/Oracle/BLToolkit.Data.DataProvider.OracleManaged.4.csproj b/DataProviders/Oracle/BLToolkit.Data.DataProvider.OracleManaged.4.csproj
@@ -90,8 +90,8 @@
     <AssemblyOriginatorKeyFile>..\..\Source\BLToolkit.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Oracle.ManagedDataAccess, Version=4.121.2.0, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Oracle.ManagedDataAccess.12.1.24160719\lib\net40\Oracle.ManagedDataAccess.dll</HintPath>
+    <Reference Include="Oracle.ManagedDataAccess, Version=4.122.1.0, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Oracle.ManagedDataAccess.12.2.1100\lib\net40\Oracle.ManagedDataAccess.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

diff --git a/DataProviders/Oracle/packages.config b/DataProviders/Oracle/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="odp.net.x86" version="112.3.20" targetFramework="net40" />
-  <package id="Oracle.ManagedDataAccess" version="12.1.24160719" targetFramework="net40" />
+  <package id="Oracle.ManagedDataAccess" version="12.2.1100" targetFramework="net40" />
 </packages>
diff --git a/NuGet/BLToolkit.DB2.nuspec b/NuGet/BLToolkit.DB2.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
 		<id>BLToolkit.DB2</id>
-		<version>4.3.8</version>
+		<version>4.3.9</version>
 		<title>BLToolkit DB2 Data Provider</title>
 		<authors>Igor Tkachev</authors>
 		<owners />
@@ -13,7 +13,7 @@
 		<summary />
 		<tags>DB2 bltoolkit Linq ORM DAL database DB</tags>
 		<dependencies>
-			<dependency id="BLToolkit" version="4.3.8" />
+			<dependency id="BLToolkit" version="4.3.9" />
 		</dependencies>
 	</metadata>
 	<files>

diff --git a/NuGet/BLToolkit.DevartOraclePro.nuspec b/NuGet/BLToolkit.DevartOraclePro.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
 		<id>BLToolkit.Oracle</id>
-		<version>4.3.8</version>
+		<version>4.3.9</version>
 		<title>BLToolkit dotConnect for Oracle Pro Data Provider</title>
 		<authors>Igor Tkachev</authors>
 		<owners />
@@ -13,7 +13,7 @@
 		<summary />
 		<tags>Devart dotConnect Oracle bltoolkit Linq ORM DAL database DB</tags>
 		<dependencies>
-			<dependency id="BLToolkit" version="4.3.8" />
+			<dependency id="BLToolkit" version="4.3.9" />
 		</dependencies>
 	</metadata>
 	<files>

diff --git a/NuGet/BLToolkit.Firebird.nuspec b/NuGet/BLToolkit.Firebird.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
 		<id>BLToolkit.Firebird</id>
-		<version>4.3.8</version>
+		<version>4.3.9</version>
 		<title>BLToolkit Firebird Data Provider</title>
 		<authors>Igor Tkachev</authors>
 		<owners />
@@ -14,7 +14,7 @@
 		<tags>Firebird bltoolkit Linq ORM DAL database DB</tags>
 		<dependencies>
 			<dependency id="FirebirdSql.Data.FirebirdClient" version="5.0.5" />
-			<dependency id="BLToolkit"                       version="4.3.8" />
+			<dependency id="BLToolkit"                       version="4.3.9" />
 		</dependencies>
 	</metadata>
 	<files>

diff --git a/NuGet/BLToolkit.Informix.nuspec b/NuGet/BLToolkit.Informix.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
 		<id>BLToolkit.Informix</id>
-		<version>4.3.8</version>
+		<version>4.3.9</version>
 		<title>BLToolkit Informix Data Provider</title>
 		<authors>Igor Tkachev</authors>
 		<owners />
@@ -13,7 +13,7 @@
 		<summary />
 		<tags>Informix bltoolkit Linq ORM DAL database DB</tags>
 		<dependencies>
-			<dependency id="BLToolkit" version="4.3.8" />
+			<dependency id="BLToolkit" version="4.3.9" />
 		</dependencies>
 	</metadata>
 	<files>

diff --git a/NuGet/BLToolkit.MySql.nuspec b/NuGet/BLToolkit.MySql.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
 		<id>BLToolkit.MySql</id>
-		<version>4.3.8</version>
+		<version>4.3.9</version>
 		<title>BLToolkit MySql Data Provider</title>
 		<authors>Igor Tkachev</authors>
 		<owners />
@@ -14,7 +14,7 @@
 		<tags>MySql bltoolkit Linq ORM DAL database DB</tags>
 		<dependencies>
 			<dependency id="MySql.Data" version="6.9.8" />
-			<dependency id="BLToolkit"  version="4.3.8" />
+			<dependency id="BLToolkit"  version="4.3.9" />
 		</dependencies>
 	</metadata>
 	<files>

diff --git a/NuGet/BLToolkit.Oracle.Managed.nuspec b/NuGet/BLToolkit.Oracle.Managed.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
 		<id>BLToolkit.Oracle.Managed</id>
-		<version>4.3.8</version>
+		<version>4.3.9</version>
 		<title>BLToolkit Managed Oracle Data Provider</title>
 		<authors>Igor Tkachev</authors>
 		<owners />
@@ -13,8 +13,8 @@
 		<summary />
 		<tags>Oracle Odp bltoolkit Linq ORM DAL database DB</tags>
 		<dependencies>
-			<dependency id="BLToolkit"                version="4.3.8" />
-			<dependency id="Oracle.ManagedDataAccess" version="12.1" />
+			<dependency id="BLToolkit"                version="4.3.9" />
+			<dependency id="Oracle.ManagedDataAccess" version="12.2.1100" />
 		</dependencies>
 	</metadata>
 	<files>

diff --git a/NuGet/BLToolkit.Oracle.nuspec b/NuGet/BLToolkit.Oracle.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
 		<id>BLToolkit.Oracle</id>
-		<version>4.3.8</version>
+		<version>4.3.9</version>
 		<title>BLToolkit Oracle Data Provider</title>
 		<authors>Igor Tkachev</authors>
 		<owners />
@@ -13,7 +13,7 @@
 		<summary />
 		<tags>Oracle Odp bltoolkit Linq ORM DAL database DB</tags>
 		<dependencies>
-			<dependency id="BLToolkit" version="4.3.8" />
+			<dependency id="BLToolkit" version="4.3.9" />
 		</dependencies>
 	</metadata>
 	<files>

diff --git a/NuGet/BLToolkit.PostgreSql.nuspec b/NuGet/BLToolkit.PostgreSql.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
 		<id>BLToolkit.PostgreSql</id>
-		<version>4.3.8</version>
+		<version>4.3.9</version>
 		<title>BLToolkit PostgreSql Data Provider</title>
 		<authors>Igor Tkachev</authors>
 		<owners />
@@ -14,7 +14,7 @@
 		<tags>PostgreSql Npgsql bltoolkit Linq ORM DAL database DB</tags>
 		<dependencies>
 			<dependency id="Npgsql"    version="2.2.5" />
-			<dependency id="BLToolkit" version="4.3.8" />
+			<dependency id="BLToolkit" version="4.3.9" />
 		</dependencies>
 	</metadata>
 	<files>

diff --git a/NuGet/BLToolkit.SQLite.nuspec b/NuGet/BLToolkit.SQLite.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
 		<id>BLToolkit.SQLite</id>
-		<version>4.3.8</version>
+		<version>4.3.9</version>
 		<title>BLToolkit SQLite Data Provider</title>
 		<authors>Igor Tkachev</authors>
 		<owners />
@@ -14,7 +14,7 @@
 		<tags>SQLite bltoolkit Linq ORM DAL database DB</tags>
 		<dependencies>
 			<dependency id="System.Data.SQLite.Core" version="1.0.102" />
-			<dependency id="BLToolkit"               version="4.3.8"   />
+			<dependency id="BLToolkit"               version="4.3.9"   />
 		</dependencies>
 	</metadata>
 	<files>

diff --git a/NuGet/BLToolkit.SqlCe.nuspec b/NuGet/BLToolkit.SqlCe.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
 		<id>BLToolkit.SqlCe</id>
-		<version>4.3.8</version>
+		<version>4.3.9</version>
 		<title>BLToolkit SqlCe Data Provider</title>
 		<authors>Igor Tkachev</authors>
 		<owners />
@@ -13,7 +13,7 @@
 		<summary />
 		<tags>SqlCe bltoolkit Linq ORM DAL database DB</tags>
 		<dependencies>
-			<dependency id="BLToolkit" version="4.3.8" />
+			<dependency id="BLToolkit" version="4.3.9" />
 		</dependencies>
 	</metadata>
 	<files>

diff --git a/NuGet/BLToolkit.Sybase.nuspec b/NuGet/BLToolkit.Sybase.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
 		<id>BLToolkit.Sybase</id>
-		<version>4.3.8</version>
+		<version>4.3.9</version>
 		<title>BLToolkit Sybase Data Provider</title>
 		<authors>Igor Tkachev</authors>
 		<owners />
@@ -13,7 +13,7 @@
 		<summary />
 		<tags>Sybase bltoolkit Linq ORM DAL database DB</tags>
 		<dependencies>
-			<dependency id="BLToolkit" version="4.3.8" />
+			<dependency id="BLToolkit" version="4.3.9" />
 		</dependencies>
 	</metadata>
 	<files>

diff --git a/NuGet/BLToolkit.nuspec b/NuGet/BLToolkit.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
 		<id>BLToolkit</id>
-		<version>4.3.8</version>
+		<version>4.3.9</version>
 		<title>Business Logic Toolkit for .NET</title>
 		<authors>Igor Tkachev</authors>
 		<owners />

diff --git a/NuGet/BLToolkit.symbols.nuspec b/NuGet/BLToolkit.symbols.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
 		<id>BLToolkit</id>
-		<version>4.3.8</version>
+		<version>4.3.9</version>
 		<title>Business Logic Toolkit for .NET</title>
 		<authors>Igor Tkachev</authors>
 		<owners />

diff --git a/Source/Data/DataProvider/OdpDataProvider.cs b/Source/Data/DataProvider/OdpDataProvider.cs
@@ -734,6 +734,14 @@ public override void Configure(System.Collections.Specialized.NameValueCollectio
 			base.Configure(attributes);
 		}
 
+		public override DbType GetParameterDbType(DbType dbType)
+		{
+			if (dbType == DbType.DateTime2)
+				return DbType.DateTime;
+
+			return base.GetParameterDbType(dbType);
+		}
+
 		#region Inner types
 
 		public class OdpMappingSchema : MappingSchema

diff --git a/Source/Properties/BLToolkitConstants.cs b/Source/Properties/BLToolkitConstants.cs
@@ -20,7 +20,7 @@ public static partial class BLToolkitConstants
 		/// <summary>
 		/// Build component of version.
 		/// </summary>
-		public const string Build = "8";
+		public const string Build = "9";
 
 		/// <summary>
 		/// Full version string.

diff --git a/UnitTests/CS/DataAccess/SqlTest.cs b/UnitTests/CS/DataAccess/SqlTest.cs
@@ -231,5 +231,27 @@ public void NonUpdatableOnClass()
 				Assert.That(insert.QueryText.Contains(middleName),        "middleName\n" + insert.QueryText);
 			}
 		}
+
+		public class LinqDataTypes
+		{
+			[PrimaryKey]
+			public int Id;
+
+			[Nullable]
+			public DateTime? DateTimeValue;
+
+			public DateTime? DateTimeValue2;
+		}
+
+		[Test]
+		public void InsertNullable()
+		{
+			var da = new SqlQuery();
+			using (var db = new DbManager())
+			{
+				db.BeginTransaction();
+				da.Insert(new LinqDataTypes() {Id = 1000});
+			}
+		}
 	}
 }
diff --git a/UnitTests/CS/UnitTests.CS.csproj b/UnitTests/CS/UnitTests.CS.csproj
@@ -150,7 +150,6 @@
     <Compile Include="DataAccess\OutRefTest.cs" />
     <Compile Include="DataAccess\PersonDataSet2.cs">
       <DependentUpon>PersonDataSet2.xsd</DependentUpon>
-      <SubType>Component</SubType>
     </Compile>
     <Compile Include="DataAccess\PersonDataSet2.Designer.cs">
       <AutoGen>True</AutoGen>
@@ -192,9 +191,7 @@
     <Compile Include="JointureTests\Artist2.cs" />
     <Compile Include="JointureTests\AssociationTests.cs" />
     <Compile Include="JointureTests\Consts.cs" />
-    <Compile Include="JointureTests\MusicDB.cs">
-      <SubType>Component</SubType>
-    </Compile>
+    <Compile Include="JointureTests\MusicDB.cs" />
     <Compile Include="JointureTests\Title.cs" />
     <Compile Include="Mapping\BltMapTests.cs" />
     <Compile Include="Mapping\MemberMapperDefaultMappersTest.cs" />
@@ -347,6 +344,10 @@
       <Project>{2B5287F2-A6AC-4D5A-B0A8-01C06144824D}</Project>
       <Name>BLToolkit.Data.DataProvider.Oracle.4</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\DataProviders\Oracle\BLToolkit.Data.DataProvider.OracleManaged.4.csproj">
+      <Project>{785ce174-0a91-465f-9e41-65e6e05a0ec9}</Project>
+      <Name>BLToolkit.Data.DataProvider.OracleManaged.4</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Source\BLToolkit.4.csproj">
       <Project>{0C325F5D-E50E-4340-8724-D29896CCC583}</Project>
       <Name>BLToolkit.4</Name>

diff --git a/packages/Oracle.ManagedDataAccess.12.1.24160719/Oracle.ManagedDataAccess.12.1.24160719.nupkg b/packages/Oracle.ManagedDataAccess.12.1.24160719/Oracle.ManagedDataAccess.12.1.24160719.nupkg
diff --git a/packages/Oracle.ManagedDataAccess.12.2.1100/Oracle.ManagedDataAccess.12.2.1100.nupkg b/packages/Oracle.ManagedDataAccess.12.2.1100/Oracle.ManagedDataAccess.12.2.1100.nupkg
diff --git a/...0719/content/net40/App.config.install.xdt → ...1100/content/net40/App.config.install.xdt b/...0719/content/net40/App.config.install.xdt → ...1100/content/net40/App.config.install.xdt
@@ -14,7 +14,7 @@
 
   <!-- insert new entry -->
   <configSections xdt:Locator="XPath(/configuration/configSections[last()])">
-      <section name="oracle.manageddataaccess.client" type="OracleInternal.Common.ODPMSectionHandler, Oracle.ManagedDataAccess, Version=4.121.2.0, Culture=neutral, PublicKeyToken=89b483f429c47342" xdt:Transform="Insert" />
+      <section name="oracle.manageddataaccess.client" type="OracleInternal.Common.ODPMSectionHandler, Oracle.ManagedDataAccess, Version=4.122.1.0, Culture=neutral, PublicKeyToken=89b483f429c47342" xdt:Transform="Insert" />
   </configSections>
 
   <configSections xdt:Transform="RemoveAll" xdt:Locator="Condition(count(*)=0)" />
@@ -43,7 +43,7 @@
   <system.data>
     <DbProviderFactories>
       <remove invariant="Oracle.ManagedDataAccess.Client" xdt:Transform="Insert"/>
-      <add name="ODP.NET, Managed Driver" invariant="Oracle.ManagedDataAccess.Client" description="Oracle Data Provider for .NET, Managed Driver" type="Oracle.ManagedDataAccess.Client.OracleClientFactory, Oracle.ManagedDataAccess, Version=4.121.2.0, Culture=neutral, PublicKeyToken=89b483f429c47342" xdt:Transform="Insert" />      
+      <add name="ODP.NET, Managed Driver" invariant="Oracle.ManagedDataAccess.Client" description="Oracle Data Provider for .NET, Managed Driver" type="Oracle.ManagedDataAccess.Client.OracleClientFactory, Oracle.ManagedDataAccess, Version=4.122.1.0, Culture=neutral, PublicKeyToken=89b483f429c47342" xdt:Transform="Insert" />      
     </DbProviderFactories>
   </system.data>
 
@@ -74,7 +74,7 @@
       <dependentAssembly xdt:Transform="Insert">
         <publisherPolicy apply="no"/>
         <assemblyIdentity name="Oracle.ManagedDataAccess" publicKeyToken="89b483f429c47342" culture="neutral" />
-        <bindingRedirect oldVersion="4.121.0.0 - 4.65535.65535.65535" newVersion="4.121.2.0" />
+        <bindingRedirect oldVersion="4.121.0.0 - 4.65535.65535.65535" newVersion="4.122.1.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/...160719/content/net40/App.config.transform → ...2.1100/content/net40/App.config.transform b/...160719/content/net40/App.config.transform → ...2.1100/content/net40/App.config.transform
diff --git a/...19/content/net40/App.config.uninstall.xdt → ...00/content/net40/App.config.uninstall.xdt b/...19/content/net40/App.config.uninstall.xdt → ...00/content/net40/App.config.uninstall.xdt
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
 
   <!-- remove existing entry -->
@@ -61,4 +61,4 @@
 
   <oracle.manageddataaccess.client xdt:Transform="RemoveAll" xdt:Locator="Condition(count(*)=0)" />
 
-</configuration>
+</configuration>
diff --git a/...0719/content/net40/Web.config.install.xdt → ...1100/content/net40/Web.config.install.xdt b/...0719/content/net40/Web.config.install.xdt → ...1100/content/net40/Web.config.install.xdt
@@ -14,7 +14,7 @@
 
   <!-- insert new entry -->
   <configSections xdt:Locator="XPath(/configuration/configSections[last()])">
-      <section name="oracle.manageddataaccess.client" type="OracleInternal.Common.ODPMSectionHandler, Oracle.ManagedDataAccess, Version=4.121.2.0, Culture=neutral, PublicKeyToken=89b483f429c47342" xdt:Transform="Insert" />
+      <section name="oracle.manageddataaccess.client" type="OracleInternal.Common.ODPMSectionHandler, Oracle.ManagedDataAccess, Version=4.122.1.0, Culture=neutral, PublicKeyToken=89b483f429c47342" xdt:Transform="Insert" />
   </configSections>
 
   <configSections xdt:Transform="RemoveAll" xdt:Locator="Condition(count(*)=0)" />
@@ -43,7 +43,7 @@
   <system.data>
     <DbProviderFactories>
       <remove invariant="Oracle.ManagedDataAccess.Client" xdt:Transform="Insert"/>
-      <add name="ODP.NET, Managed Driver" invariant="Oracle.ManagedDataAccess.Client" description="Oracle Data Provider for .NET, Managed Driver" type="Oracle.ManagedDataAccess.Client.OracleClientFactory, Oracle.ManagedDataAccess, Version=4.121.2.0, Culture=neutral, PublicKeyToken=89b483f429c47342" xdt:Transform="Insert" />      
+      <add name="ODP.NET, Managed Driver" invariant="Oracle.ManagedDataAccess.Client" description="Oracle Data Provider for .NET, Managed Driver" type="Oracle.ManagedDataAccess.Client.OracleClientFactory, Oracle.ManagedDataAccess, Version=4.122.1.0, Culture=neutral, PublicKeyToken=89b483f429c47342" xdt:Transform="Insert" />      
     </DbProviderFactories>
   </system.data>
 

diff --git a/...160719/content/net40/Web.config.transform → ...2.1100/content/net40/Web.config.transform b/...160719/content/net40/Web.config.transform → ...2.1100/content/net40/Web.config.transform
diff --git a/...19/content/net40/Web.config.uninstall.xdt → ...00/content/net40/Web.config.uninstall.xdt b/...19/content/net40/Web.config.uninstall.xdt → ...00/content/net40/Web.config.uninstall.xdt
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
 
   <!-- remove existing entry -->
@@ -61,4 +61,4 @@
 
   <oracle.manageddataaccess.client xdt:Transform="RemoveAll" xdt:Locator="Condition(count(*)=0)" />
 
-</configuration>
+</configuration>
diff --git a/....ManagedDataAccess.12.1.24160719/info.txt → ...acle.ManagedDataAccess.12.2.1100/info.txt b/....ManagedDataAccess.12.1.24160719/info.txt → ...acle.ManagedDataAccess.12.2.1100/info.txt
diff --git a/...19/lib/net40/Oracle.ManagedDataAccess.dll → ...00/lib/net40/Oracle.ManagedDataAccess.dll b/...19/lib/net40/Oracle.ManagedDataAccess.dll → ...00/lib/net40/Oracle.ManagedDataAccess.dll