Extended type test

Author: JaBistDuNarrisch

src/Migrator.Tests/Providers/PostgreSQL/PostgreSQLTransformationProvider_GetColumnsDefaultValueTests.cs

@@ -21,14 +21,20 @@ public void GetColumns_DataTypeResolveSucceeds()
         const string guidColumnName1 = "guidcolumn1";
         const string booleanColumnName1 = "booleancolumn1";
         const string int32ColumnName1 = "int32column1";
+        const string int64ColumnName1 = "int64column1";
+        const string stringColumnName1 = "stringcolumn1";
+        const string stringColumnName2 = "stringcolumn2";
 
         Provider.AddTable(testTableName,
             new Column(dateTimeColumnName1, DbType.DateTime),
             new Column(dateTimeColumnName2, DbType.DateTime2),
             new Column(decimalColumnName1, DbType.Decimal),
             new Column(guidColumnName1, DbType.Guid),
             new Column(booleanColumnName1, DbType.Boolean),
-            new Column(int32ColumnName1, DbType.Int32)
+            new Column(int32ColumnName1, DbType.Int32),
+            new Column(int64ColumnName1, DbType.Int64),
+            new Column(stringColumnName1, DbType.String),
+            new Column(stringColumnName2, DbType.String) { Size = 30 }
         );
 
         // Act
@@ -40,22 +46,25 @@ public void GetColumns_DataTypeResolveSucceeds()
         var guidColumn1 = columns.Single(x => x.Name == guidColumnName1);
         var booleanColumn1 = columns.Single(x => x.Name == booleanColumnName1);
         var int32Column1 = columns.Single(x => x.Name == int32ColumnName1);
+        var int64column1 = columns.Single(x => x.Name == int64ColumnName1);
+        var stringColumn1 = columns.Single(x => x.Name == stringColumnName1);
+        var stringColumn2 = columns.Single(x => x.Name == stringColumnName2);
+
 
         // Assert
         Assert.That(dateTimeColumn1.Type, Is.EqualTo(DbType.DateTime));
         Assert.That(dateTimeColumn1.Precision, Is.EqualTo(3));
-
         Assert.That(dateTimeColumn2.Type, Is.EqualTo(DbType.DateTime2));
         Assert.That(dateTimeColumn2.Precision, Is.EqualTo(6));
-
         Assert.That(decimalColumn1.Type, Is.EqualTo(DbType.Decimal));
         Assert.That(decimalColumn1.Precision, Is.EqualTo(19));
         Assert.That(decimalColumn1.Scale, Is.EqualTo(5));
-
         Assert.That(guidColumn1.Type, Is.EqualTo(DbType.Guid));
-
         Assert.That(booleanColumn1.Type, Is.EqualTo(DbType.Boolean));
-
         Assert.That(int32Column1.Type, Is.EqualTo(DbType.Int32));
+        Assert.That(int64column1.Type, Is.EqualTo(DbType.Int64));
+        Assert.That(stringColumn1.Type, Is.EqualTo(DbType.String));
+        Assert.That(stringColumn2.Type, Is.EqualTo(DbType.String));
+        Assert.That(stringColumn2.Size, Is.EqualTo(30));
     }
 }

src/Migrator/Providers/Impl/PostgreSQL/PostgreSQLTransformationProvider.cs

@@ -17,7 +17,6 @@
 using System.Data;
 using System.Globalization;
 using System.Linq;
-using System.Reflection.Metadata.Ecma335;
 using System.Text;
 using Index = DotNetProjects.Migrator.Framework.Index;
 
@@ -361,18 +360,14 @@ public override Column[] GetColumns(string table)
                 {
                     dbType = DbType.Boolean;
                 }
-                else if (dataTypeString == "text")
+                else if (dataTypeString == "text" || dataTypeString == "character varying")
                 {
                     dbType = DbType.String;
-                }
-                else if (dataTypeString.StartsWith("character varying("))
-                {
-                    dbType = DbType.StringFixedLength;
                     size = characterMaximumLength;
                 }
                 else if (dataTypeString == "character" || dataTypeString.StartsWith("character("))
                 {
-                    throw new NotSupportedException("Data type 'character' detected. We do not support 'character'. Use 'text' or 'character varying(n)' instead");
+                    throw new NotSupportedException("Data type 'character' detected. We do not support 'character'. Use 'text' or 'character varying' instead");
                 }
                 else
                 {
@@ -382,7 +377,9 @@ public override Column[] GetColumns(string table)
                 var column = new Column(columnName, dbType)
                 {
                     Precision = precision,
-                    Scale = scale
+                    Scale = scale,
+                    // Size should be nullable
+                    Size = size ?? 0
                 };
 
                 column.ColumnProperty |= isNullable ? ColumnProperty.Null : ColumnProperty.NotNull;