Merge pull request #12 from carloscs/master

Add support for Informix databases
rvrn22 · Apr 14, 2020 · b6fd218 · b6fd218
2 parents 8043cfa + 903ffdc
commit b6fd218
Show file tree

Hide file tree

Showing 13 changed files with 571 additions and 8 deletions.
diff --git a/Lib/IBM.Data.DB.Provider/IBM.Data.DB2.dll b/Lib/IBM.Data.DB.Provider/IBM.Data.DB2.dll
diff --git a/NMG.App/App.Designer.cs b/NMG.App/App.Designer.cs
diff --git a/NMG.App/ConnectionDialog.cs b/NMG.App/ConnectionDialog.cs
@@ -94,6 +94,8 @@ private string GetDefaultConnectionStringForServerType(ServerType serverType)
                     return StringConstants.SQLITE_CONN_STR_TEMPLATE;
                 case ServerType.Sybase:
                     return StringConstants.SYBASE_CONN_STR_TEMPLATE;
+                case ServerType.Informix:
+                    return StringConstants.INFORMIX_CONN_STR_TEMPLATE;
                 case ServerType.Ingres:
                     return StringConstants.INGRES_CONN_STR_TEMPLATE;
                 case ServerType.CUBRID:

diff --git a/NMG.App/NMG.App.csproj b/NMG.App/NMG.App.csproj
@@ -34,16 +34,18 @@
     <StartupObject>NHibernateMappingGenerator.Program</StartupObject>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
+    <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;MONO</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -60,6 +62,9 @@
     <Reference Include="FastColoredTextBox">
       <HintPath>..\Lib\FastColoredTextBox\FastColoredTextBox.dll</HintPath>
     </Reference>
+    <Reference Include="IBM.Data.DB2, Version=9.7.4.4, Culture=neutral, PublicKeyToken=7c307b91aa13d208, processorArchitecture=AMD64">
+      <HintPath>..\packages\IBM.Data.DB.Provider.11.1.4040.4\lib\net451\x64\IBM.Data.DB2.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Data.ConnectionUI">
       <HintPath>..\Lib\Microsoft.Data.ConnectionUI\Microsoft.Data.ConnectionUI.dll</HintPath>
     </Reference>
@@ -119,6 +124,7 @@
       <DesignTime>True</DesignTime>
     </Compile>
     <None Include="app.config" />
+    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -157,6 +163,13 @@
     <Folder Include="Resources\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\IBM.Data.DB.Provider.11.1.4040.4\build\IBM.Data.DB.Provider.targets" Condition="Exists('..\packages\IBM.Data.DB.Provider.11.1.4040.4\build\IBM.Data.DB.Provider.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\IBM.Data.DB.Provider.11.1.4040.4\build\IBM.Data.DB.Provider.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\IBM.Data.DB.Provider.11.1.4040.4\build\IBM.Data.DB.Provider.targets'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/NMG.App/packages.config b/NMG.App/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="IBM.Data.DB.Provider" version="11.1.4040.4" targetFramework="net46" />
+</packages>
diff --git a/NMG.Core/DataTypeMapper.cs b/NMG.Core/DataTypeMapper.cs
@@ -52,10 +52,14 @@ public Type MapFromDBType(ServerType serverType, string dataType, int? dataLengt
                     return MapFromOracleDBType(dataType, dataLength, dataPrecision, dataScale);
                 case ServerType.MySQL:
                     return MapFromMySqlDBType(dataType, dataLength, dataPrecision, dataScale);
+                case ServerType.SQLite:
+                    return MapFromSqliteDbType(dataType, dataLength, dataPrecision, dataScale);
                 case ServerType.PostgreSQL:
                     return MapFromPostgreDBType(dataType, dataLength, dataPrecision, dataScale);
                 case ServerType.Sybase:
                     return MapFromSqlServerDBType(dataType, dataLength, dataPrecision, dataScale);
+                case ServerType.Informix:
+                    return MapFromInformixDbType(dataType, dataLength, dataPrecision, dataScale);
                 case ServerType.Ingres:
                     return MapFromIngresDbType(dataType, dataLength, dataPrecision, dataScale);
                 case ServerType.CUBRID:
@@ -156,6 +160,19 @@ private Type MapFromSqliteDbType(string dataType, int? dataLength, int? dataPrec
             return MapFromDBType(dataType, dataLength, dataPrecision, dataScale);
         }
 
+        private Type MapFromInformixDbType(string dataType, int? dataLength, int? dataPrecision, int? dataScale)
+        {
+            switch (dataType)
+            {
+                case "Serial":
+                    return typeof(int);
+                case "Serial8":
+                    return typeof(long);
+                default:
+                    return MapFromDBType(dataType, dataLength, dataPrecision, dataScale);
+            }
+        }
+
         /// <summary>
         /// CUBRID implementation of the data types NHIbernate mappings
         /// http://www.cubrid.org

diff --git a/NMG.Core/Domain/ServerType.cs b/NMG.Core/Domain/ServerType.cs
@@ -8,6 +8,7 @@ public enum ServerType
         MySQL,
         SQLite,
         Sybase,
+        Informix,
         Ingres,
         CUBRID
     }

diff --git a/NMG.Core/MetadataFactory.cs b/NMG.Core/MetadataFactory.cs
@@ -13,12 +13,16 @@ public static IMetadataReader GetReader(ServerType serverType, string connection
                     return new OracleMetadataReader(connectionStr);
                 case ServerType.SqlServer:
                     return new SqlServerMetadataReader(connectionStr);
+                case ServerType.PostgreSQL:
+                    return new NpgsqlMetadataReader(connectionStr);
                 case ServerType.MySQL:
                     return new MysqlMetadataReader(connectionStr);
                 case ServerType.SQLite:
                     return new SqliteMetadataReader(connectionStr);
                 case ServerType.Sybase:
                     return new SybaseMetadataReader(connectionStr);
+                case ServerType.Informix:
+                    return new InformixMetadataReader(connectionStr);
                 case ServerType.Ingres:
                     return new IngresMetadataReader(connectionStr);
                 case ServerType.CUBRID:

diff --git a/NMG.Core/NMG.Core.csproj b/NMG.Core/NMG.Core.csproj
@@ -32,6 +32,8 @@
     <BootstrapperEnabled>true</BootstrapperEnabled>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -41,7 +43,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -54,6 +56,9 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="IBM.Data.DB2, Version=9.7.4.4, Culture=neutral, PublicKeyToken=7c307b91aa13d208, processorArchitecture=AMD64">
+      <HintPath>..\packages\IBM.Data.DB.Provider.11.1.4040.4\lib\net451\x64\IBM.Data.DB2.dll</HintPath>
+    </Reference>
     <Reference Include="Ingres.Client, Version=2.1.0.0, Culture=neutral, PublicKeyToken=363043b363d069c5, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Lib\Ingres .NET Data Provider\Ingres.Client.dll</HintPath>
@@ -121,6 +126,7 @@
     <Compile Include="Reader\NpgsqlMetadataReader.cs" />
     <Compile Include="Reader\OracleConstraintType.cs" />
     <Compile Include="Reader\OracleMetadataReader.cs" />
+    <Compile Include="Reader\InformixMetadataReader.cs" />
     <Compile Include="Reader\SqliteMetadataReader.cs" />
     <Compile Include="Reader\SqlServerConstraintType.cs" />
     <Compile Include="Reader\SqlServerMetadataReader.cs" />
@@ -164,5 +170,14 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-  <ItemGroup />
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="..\packages\IBM.Data.DB.Provider.11.1.4040.4\build\IBM.Data.DB.Provider.targets" Condition="Exists('..\packages\IBM.Data.DB.Provider.11.1.4040.4\build\IBM.Data.DB.Provider.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\IBM.Data.DB.Provider.11.1.4040.4\build\IBM.Data.DB.Provider.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\IBM.Data.DB.Provider.11.1.4040.4\build\IBM.Data.DB.Provider.targets'))" />
+  </Target>
 </Project>
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ public enum ServerType @@
             MySQL,
             SQLite,
             Sybase,
+            Informix,
             Ingres,
             CUBRID
         }
@@ Expand Down @@