Migrator Fixes the migrator's ability to handle null as a default value for datetime types
Changeset 8c6cf6675089…
Parent 14345fa44ab1…
by
Daniel Pupek
Changes to 29 files · Browse files at 8c6cf6675089 Showing diff from parent 14345fa44ab1 Diff from another changeset...
-
app/console/Migrator.Console.csproj
-
app/console/packages.config
-
app/core/Mappers/SqlMapper.cs
-
app/core/Migrator.cs
-
app/core/Migrator.csproj
-
app/core/Providers/TransformationProvider.cs
-
app/core/packages.config
-
app/nant/Migrator.NAnt.csproj
-
app/nant/packages.config
-
packages/log4net.2.0.2/lib/net10-full/log4net.dll
-
packages/log4net.2.0.2/lib/net10-full/log4net.xml
-
packages/log4net.2.0.2/lib/net11-full/log4net.dll
-
packages/log4net.2.0.2/lib/net11-full/log4net.xml
-
packages/log4net.2.0.2/lib/net20-full/log4net.dll
-
packages/log4net.2.0.2/lib/net20-full/log4net.xml
-
packages/log4net.2.0.2/lib/net35-client/log4net.dll
-
packages/log4net.2.0.2/lib/net35-client/log4net.xml
-
packages/log4net.2.0.2/lib/net35-full/log4net.dll
-
packages/log4net.2.0.2/lib/net35-full/log4net.xml
-
packages/log4net.2.0.2/lib/net40-client/log4net.dll
-
packages/log4net.2.0.2/lib/net40-client/log4net.xml
-
packages/log4net.2.0.2/lib/net40-full/log4net.dll
-
packages/log4net.2.0.2/lib/net40-full/log4net.xml
-
packages/log4net.2.0.2/log4net.2.0.2.nupkg
-
packages/log4net.2.0.2/log4net.2.0.2.nuspec
-
packages/repositories.config
-
run.bat
-
test/Migrator.Tests.csproj
-
test/packages.config
|
@@ -44,6 +44,10 @@ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="log4net, Version=1.2.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\packages\log4net.2.0.2\lib\net40-full\log4net.dll</HintPath>
+ </Reference>
<Reference Include="RazorEngine">
<HintPath>..\..\packages\RazorEngine.3.3.0\lib\net40\RazorEngine.dll</HintPath>
</Reference>
|
||
|
@@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?>
<packages>
+ <package id="log4net" version="2.0.2" targetFramework="net40" />
<package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net40" />
<package id="RazorEngine" version="3.3.0" targetFramework="net40" />
</packages>
\ No newline at end of file |
||
|
@@ -17,13 +17,25 @@ {typeof(decimal),value=>{return (value ?? "").ToString();}},
{typeof(bool),value=>{return (Boolean)value? "1" : "0";}},
- {typeof(DateTime),value=>{return string.Format("'{0}'", ((DateTime)value).ToString("yyy-MM-dd HH:mm:ss")); } },
+ {typeof(DateTime), value =>
+ {
+ if(value == null)
+ return "null";
+ if(value is String && value.ToString().ToLower() == "now")
+ return "GetDate()";
+
+ if(value is String && value.ToString().ToLower() == "utcnow")
+ return "GetUtcDate()";
+
+ return String.Format("'{0}'", ((DateTime)value).ToString("yyy-MM-dd HH:mm:ss"));
+
+ } },
{typeof(char),value=>{return value == null ? "null" : String.Format("'{0}'", value.ToString());}},
{typeof(Guid),value=>{return value == null ? "null" : String.Format("'{0}'", value.ToString());}},
{typeof(Guid?), value=>{return value == null ? "null" : String.Format("'{0}'", value.ToString());}},
{typeof(byte[]),value=>{return "image";}},
- {typeof(TimeSpan),value=>{return ((TimeSpan)value).TotalMilliseconds.ToString();;}},
+ {typeof(TimeSpan),value=>{return ((TimeSpan)value).TotalMilliseconds.ToString();}},
};
|
||
|
@@ -522,6 +522,8 @@ this._logger.Exception("Failed to begin migrating.", e);
else
this._logger.Exception(migratingVersion, GetMigrationDescription(GetMigration(migratingVersion).GetType()), e);
+
+ throw new MigrationException("", migratingVersion, e);
}
InitializeMigration(EndMigration).Up();
|
||
|
@@ -47,9 +47,9 @@ <DocumentationFile>bin\Migrator\Release\Migrator.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
- <Reference Include="log4net, Version=1.2.11.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+ <Reference Include="log4net, Version=1.2.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\log4net.dll</HintPath>
+ <HintPath>..\..\packages\log4net.2.0.2\lib\net40-full\log4net.dll</HintPath>
</Reference>
<Reference Include="Mono.Security, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<HintPath>..\..\lib\Npgsql\net-4.0\Mono.Security.dll</HintPath>
@@ -113,6 +113,7 @@ </ItemGroup>
<ItemGroup>
<None Include="app.config" />
+ <None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file |
||
|
@@ -523,7 +523,14 @@ catch (Exception ex)
{
System.Diagnostics.Debug.Write(ex.ToString());
- this.Rollback();
+ try
+ {
+ this.Rollback();
+ }
+ catch (Exception e)
+ {
+ _logger.Exception("Unable to rollback after a failed commit.", e);
+ }
throw;
}
}
|
||
|
|
@@ -0,0 +1,4 @@ + <?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="log4net" version="2.0.2" targetFramework="net40" />
+</packages>
\ No newline at end of file |
|
|
@@ -59,10 +59,8 @@ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="log4net, Version=1.2.9.0, Culture=neutral, PublicKeyToken=b32731d11ce58905">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\log4net.dll</HintPath>
- <Private>True</Private>
+ <Reference Include="log4net">
+ <HintPath>..\..\packages\log4net.2.0.2\lib\net35-full\log4net.dll</HintPath>
</Reference>
<Reference Include="NAnt.Core, Version=0.85.2344.0, Culture=neutral">
<SpecificVersion>False</SpecificVersion>
@@ -93,5 +91,8 @@ <Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
+ <ItemGroup>
+ <None Include="packages.config" />
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file |
||
|
|
@@ -0,0 +1,4 @@ + <?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="log4net" version="2.0.2" targetFramework="net35" />
+</packages>
\ No newline at end of file |
|
|
|
|
|
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
|
|
|
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
|
|
|
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
|
|
|
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
|
|
|
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
|
|
|
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
|
|
|
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
|
|
|
|
|
@@ -0,0 +1,23 @@ + <?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+ <metadata>
+ <id>log4net</id>
+ <version>2.0.2</version>
+ <title>log4net [1.2.12]</title>
+ <authors>Apache Software Foundation</authors>
+ <owners>Apache Software Foundation</owners>
+ <licenseUrl>http://logging.apache.org/log4net/license.html</licenseUrl>
+ <projectUrl>http://logging.apache.org/log4net/</projectUrl>
+ <requireLicenseAcceptance>false</requireLicenseAcceptance>
+ <description>log4net is a tool to help the programmer output log statements to a variety of output targets. In case of problems with an application, it is helpful to enable logging so that the problem can be located. With log4net it is possible to enable logging at runtime without modifying the application binary. The log4net package is designed so that log statements can remain in shipped code without incurring a high performance cost. It follows that the speed of logging (or rather not logging) is crucial.
+
+At the same time, log output can be so voluminous that it quickly becomes overwhelming. One of the distinctive features of log4net is the notion of hierarchical loggers. Using these loggers it is possible to selectively control which log statements are output at arbitrary granularity.
+
+log4net is designed with two distinct goals in mind: speed and flexibility</description>
+ <summary>The Apache log4net library is a tool to help the programmer output log statements to a variety of output targets.</summary>
+ <releaseNotes />
+ <copyright />
+ <language />
+ <tags>logging log tracing logfiles</tags>
+ </metadata>
+</package>
\ No newline at end of file |
|
|
@@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8"?>
<repositories>
<repository path="..\app\console\packages.config" />
+ <repository path="..\app\core\packages.config" />
+ <repository path="..\app\nant\packages.config" />
+ <repository path="..\test\packages.config" />
</repositories>
\ No newline at end of file |
||
|
|
@@ -0,0 +1,3 @@ + CD C:\sandboxes\Migrator2\app\console\bin\Migrator.Console\Debug
+migrator-cli.exe SqlServer "Server=localhost;Database=Nexport;Trusted_Connection=True" "C:\sandboxes\NexPort\NexPortVirtualCampus\bin\Nexport.Models.dll" -list
+pause
\ No newline at end of file |
|
|
@@ -44,8 +44,9 @@ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="log4net">
- <HintPath>..\lib\log4net.dll</HintPath>
+ <Reference Include="log4net, Version=1.2.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\log4net.2.0.2\lib\net40-full\log4net.dll</HintPath>
</Reference>
<Reference Include="MySql.Data">
<HintPath>..\lib\MySql.Data.dll</HintPath>
@@ -82,6 +83,7 @@ <None Include="App.config">
<SubType>Designer</SubType>
</None>
+ <None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file |
||
|
|
@@ -0,0 +1,4 @@ + <?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="log4net" version="2.0.2" targetFramework="net40" />
+</packages>
\ No newline at end of file |
|
Add a tag
Loading...