Merge pull request #43 from beginor/smart-code-contribution

fix etl template errors, add geometry and geography mapping.

Author: Ahoo-Wang

src/SmartCode.Generator/DbTypeConverter/DbTypeMap.xml

@@ -357,6 +357,8 @@
         <DbType Name="long" To="int8"/>
         <DbType Name="longtext" To="text"/>
         <DbType Name="timestamp" To="timestamp"/>
+        <DbType Name="geometry" To="geometry"/>
+        <DbType Name="geography" To="geography"/>
     </Database>
 
     <Database DbProvider="MySql" Language="PostgreSql">
@@ -376,6 +378,8 @@
         <DbType Name="numeric" To="decimal"/>
         <DbType Name="float" To="float8"/>
         <DbType Name="timestamp" To="timestamp"/>
+        <DbType Name="geometry" To="geometry"/>
+        <DbType Name="geography" To="geography"/>
     </Database>
     <!-- PostgreSql-Language End-->
 

src/SmartCode.Generator/RazorTemplates/ETL/ToPGBuild.cshtml

@@ -53,7 +53,7 @@ DataSource:
   Name: Extract
   Parameters:
     DbProvider: @dbSource.DbRepository.DbProviderName
-    ConnectionString: "@extractConnectionString"
+    ConnectionString: @extractConnectionString
     Query: 'Select * From @table.Name @GetExtractWhere()'
     PKColumn: @PKColumn.Name
     AutoIncrement: @(PKColumn.AutoIncrement ? "true" : "false")
@@ -77,7 +77,7 @@ Build:
     Type: Load
     Parameters:
       DbProvider: @loadDbProvider
-      ConnectionString: "@loadConnectionString"
+      ConnectionString: @loadConnectionString
       Table: @loadTable
     @switch (extractMode)
     {
@@ -109,4 +109,4 @@ Build:
         {@(",")}
     @Html.NewLine()
 }
-    ]
+    ]

src/SmartCode.Generator/RazorTemplates/Sql/DbToPGSql.cshtml

@@ -7,6 +7,9 @@
     String GetPGSqlType(SmartCode.Generator.Entity.Column col)
     {
         var sqlDbType = col.LanguageType;
+        if (string.IsNullOrEmpty(sqlDbType)) {
+            return "NAType";
+        }
         if (sqlDbType.StartsWith("varchar"))
         {
             if (col.DataLength == -1) {
@@ -51,4 +54,4 @@
             @Html.NewLine()
         }
         </text>
-    }
+    }