#123 escapeNames not correctly passed down postgresql indexes

CopyToSQLite/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.7.8.0")]
-[assembly: AssemblyFileVersion("2.7.8.0")]
+[assembly: AssemblyVersion("2.7.9.0")]
+[assembly: AssemblyFileVersion("2.7.9.0")]

DatabaseSchemaReader/DatabaseSchemaReader.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>Any ADO provider can be read  (SqlServer, SqlServer CE 4, MySQL, SQLite, System.Data.OracleClient, ODP, Devart, PostgreSql, DB2...) into a single standard model.</Description>
     <AssemblyTitle>DatabaseSchemaReader</AssemblyTitle>
-    <VersionPrefix>2.7.8</VersionPrefix>
+    <VersionPrefix>2.7.9</VersionPrefix>
     <Authors>Martin Willey</Authors>
     <TargetFrameworks>netstandard2.0;netstandard1.5;net45;net40;net35</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -17,6 +17,7 @@
 2.7.6: PostgreSql MigrationGenerator cascade escaping thanks @groogiam
 2.7.7: fixes null 'RefersToTable' of FK when only one table is read thanks @mjalil
 2.7.8: PostgreSql sequences missing thanks @groogiam
+2.7.9: PostgreSql sqlgen escaping thanks @r-work
 	</PackageReleaseNotes>
     <PackageProjectUrl>https://github.com/martinjw/dbschemareader</PackageProjectUrl>
     <PackageLicenseUrl>http://www.microsoft.com/en-us/openness/licenses.aspx#MPL</PackageLicenseUrl>

DatabaseSchemaReader/Properties/AssemblyInfo.cs

@@ -32,7 +32,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.7.8.0")]
-[assembly: AssemblyFileVersion("2.7.8.0")]
+[assembly: AssemblyVersion("2.7.9.0")]
+[assembly: AssemblyFileVersion("2.7.9.0")]
 [assembly: CLSCompliant(true)]
 [assembly: InternalsVisibleTo("DatabaseSchemaReaderTest")]

DatabaseSchemaReader/SqlGen/Db2/TableGenerator.cs

@@ -89,7 +89,7 @@ protected override string ConstraintWriter()
         }
         protected virtual IMigrationGenerator CreateMigrationGenerator()
         {
-            return new Db2MigrationGenerator { IncludeSchema = IncludeSchema };
+            return new Db2MigrationGenerator { IncludeSchema = IncludeSchema, EscapeNames = EscapeNames};
         }
         private void AddIndexes(StringBuilder sb)
         {

DatabaseSchemaReader/SqlGen/MySql/TableGenerator.cs

@@ -100,7 +100,7 @@ protected override string ConstraintWriter()
         }
         protected virtual IMigrationGenerator CreateMigrationGenerator()
         {
-            return new MySqlMigrationGenerator { IncludeSchema = IncludeSchema };
+            return new MySqlMigrationGenerator { IncludeSchema = IncludeSchema, EscapeNames = EscapeNames};
         }
         private void AddIndexes(StringBuilder sb)
         {

DatabaseSchemaReader/SqlGen/PostgreSql/TableGenerator.cs

@@ -99,7 +99,7 @@ private static string TranslateCheckExpression(string expression)
         }
         protected virtual IMigrationGenerator CreateMigrationGenerator()
         {
-            return new PostgreSqlMigrationGenerator { IncludeSchema = IncludeSchema };
+            return new PostgreSqlMigrationGenerator { IncludeSchema = IncludeSchema, EscapeNames = EscapeNames};
         }
         private void AddIndexes(StringBuilder sb)
         {

DatabaseSchemaReader/SqlGen/SqlServer/TableGenerator.cs

@@ -104,6 +104,7 @@ protected virtual IMigrationGenerator CreateMigrationGenerator()
             var migrations = new SqlServerMigrationGenerator();
             //ensure we're not writing schema prefixes
             if (!IncludeSchema) migrations.IncludeSchema = false;
+            migrations.EscapeNames = EscapeNames;
             return migrations;
         }
 

DatabaseSchemaReaderTest/DatabaseSchemaReaderTest.csproj

@@ -298,6 +298,7 @@
     <Compile Include="SqlGen\Oracle\LongIntegerTest.cs" />
     <Compile Include="SqlGen\PostgreSql\DateTimeDataTypesTest.cs" />
     <Compile Include="SqlGen\PostgreSql\StringDataTypesTest.cs" />
+    <Compile Include="SqlGen\PostgreSql\GeneratorTest.cs" />
     <Compile Include="SqlGen\SqlServerCe\AllTablesGeneratorTest.cs" />
     <Compile Include="SqlGen\SqlServerCe\TableGeneratorTest.cs" />
     <Compile Include="SqlGen\SqlServer\AccessCheckConstraintTest.cs" />

DatabaseSchemaReaderTest/SqlGen/PostgreSql/GeneratorTest.cs

@@ -0,0 +1,34 @@
+using DatabaseSchemaReader.DataSchema;
+using DatabaseSchemaReader.SqlGen;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace DatabaseSchemaReaderTest.SqlGen.PostgreSql
+{
+    [TestClass]
+    public class GeneratorTest
+    {
+        [TestMethod]
+        public void TestGeneratorEscaping()
+        {
+            //arrange
+            var schema = new DatabaseSchema(null, SqlType.PostgreSql);
+            var table = schema.AddTable("AllTypes")
+                .AddColumn<int>("Id").AddIdentity()
+                .AddColumn<string>("Name").AddLength(200)
+                .AddColumn<int>("Age")
+                .AddColumn<int>("Period")
+                .Table;
+            table.AddIndex("TableIndex", new[] { table.FindColumn("Name") });
+
+            var factory = new DdlGeneratorFactory(SqlType.PostgreSql);
+            var tableGen = factory.TableGenerator(table);
+            tableGen.EscapeNames = false;
+
+            //act
+            var ddl = tableGen.Write();
+
+            //assert
+            Assert.IsTrue(ddl.Contains("INDEX TableIndex ON AllTypes(Name)"));
+        }
+    }
+}

DatabaseSchemaViewer/Properties/AssemblyInfo.cs

@@ -30,5 +30,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.7.8.0")]
-[assembly: AssemblyFileVersion("2.7.8.0")]
+[assembly: AssemblyVersion("2.7.9.0")]
+[assembly: AssemblyFileVersion("2.7.9.0")]