Extended type test for Postgre SQL

Author: JaBistDuNarrisch

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

@@ -18,11 +18,17 @@ public void GetColumns_DataTypeResolveSucceeds()
         const string dateTimeColumnName1 = "datetimecolumn1";
         const string dateTimeColumnName2 = "datetimecolumn2";
         const string decimalColumnName1 = "decimalcolumn";
+        const string guidColumnName1 = "guidcolumn1";
+        const string booleanColumnName1 = "booleancolumn1";
+        const string int32ColumnName1 = "int32column1";
 
         Provider.AddTable(testTableName,
             new Column(dateTimeColumnName1, DbType.DateTime),
             new Column(dateTimeColumnName2, DbType.DateTime2),
-            new Column(decimalColumnName1, DbType.Decimal)
+            new Column(decimalColumnName1, DbType.Decimal),
+            new Column(guidColumnName1, DbType.Guid),
+            new Column(booleanColumnName1, DbType.Boolean),
+            new Column(int32ColumnName1, DbType.Int32)
         );
 
         // Act
@@ -31,6 +37,9 @@ public void GetColumns_DataTypeResolveSucceeds()
         var dateTimeColumn1 = columns.Single(x => x.Name == dateTimeColumnName1);
         var dateTimeColumn2 = columns.Single(x => x.Name == dateTimeColumnName2);
         var decimalColumn1 = columns.Single(x => x.Name == decimalColumnName1);
+        var guidColumn1 = columns.Single(x => x.Name == guidColumnName1);
+        var booleanColumn1 = columns.Single(x => x.Name == booleanColumnName1);
+        var int32Column1 = columns.Single(x => x.Name == int32ColumnName1);
 
         // Assert
         Assert.That(dateTimeColumn1.Type, Is.EqualTo(DbType.DateTime));
@@ -40,23 +49,13 @@ public void GetColumns_DataTypeResolveSucceeds()
         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
-        // using (var command = Provider.GetCommand())
-        // {
-        //     using var reader = Provider.ExecuteQuery(command, $"SELECT max({propertyName1}) as max from {testTableName}");
-        //     reader.Read();
-
-        //     var primaryKeyValue = reader.GetInt32(reader.GetOrdinal("max"));
-        //     Assert.That(primaryKeyValue, Is.EqualTo(2));
-        // }
-
-        // // Act II
-        // var exception = Assert.Throws<PostgresException>(() => Provider.Insert(testTableName, [propertyName1, propertyName2], [1, 888]));
+        Assert.That(guidColumn1.Type, Is.EqualTo(DbType.Guid));
 
-        // // Assert II
-        // Assert.That(exception.SqlState, Is.EqualTo("428C9"));
+        Assert.That(booleanColumn1.Type, Is.EqualTo(DbType.Boolean));
 
-        throw new NotImplementedException();
+        Assert.That(int32Column1.Type, Is.EqualTo(DbType.Int32));
     }
 }

src/Migrator/Framework/Column.cs

@@ -147,8 +147,14 @@ public DbType Type
 
     public int Size { get; set; }
 
+    /// <summary>
+    /// Gets or sets the precision for NUMERIC/DECIMAL
+    /// </summary>
     public int? Precision { get; set; }
 
+    /// <summary>
+    /// Gets or sets the scale for NUMERIC/DECIMAL
+    /// </summary>
     public int? Scale { get; set; }
 
     public ColumnProperty ColumnProperty { get; set; }

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

@@ -17,6 +17,7 @@
 using System.Data;
 using System.Globalization;
 using System.Linq;
+using System.Reflection.Metadata.Ecma335;
 using System.Text;
 using Index = DotNetProjects.Migrator.Framework.Index;
 
@@ -257,7 +258,7 @@ public override Column[] GetColumns(string table)
         stringBuilder.AppendLine("  DATETIME_PRECISION,");
         stringBuilder.AppendLine("  CHARACTER_MAXIMUM_LENGTH,");
         stringBuilder.AppendLine("  NUMERIC_PRECISION,");
-        stringBuilder.AppendLine("  NUMERIC_SCALE,");
+        stringBuilder.AppendLine("  NUMERIC_SCALE");
         stringBuilder.AppendLine($"FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = 'public' AND TABLE_NAME = lower('{table}');");
 
         var columns = new List<Column>();
@@ -279,9 +280,12 @@ public override Column[] GetColumns(string table)
                 var dataTypeString = reader.GetString(reader.GetOrdinal("DATA_TYPE"));
                 var dateTimePrecision = reader.IsDBNull(dateTimePrecisionOrdinal) ? null : (int?)reader.GetInt32(dateTimePrecisionOrdinal);
                 var characterMaximumLength = reader.IsDBNull(characterMaximumLengthOrdinal) ? null : (int?)reader.GetInt32(characterMaximumLengthOrdinal);
+                var numericPrecision = reader.IsDBNull(numericPrecisionOrdinal) ? null : (int?)reader.GetInt32(numericPrecisionOrdinal);
+                var numericScale = reader.IsDBNull(numericScaleOrdinal) ? null : (int?)reader.GetInt32(numericScaleOrdinal);
 
                 DbType dbType = 0;
                 int? precision = null;
+                int? scale = null;
                 int? size = null;
 
                 if (new[] { "timestamptz", "timestamp with time zone" }.Contains(dataTypeString))
@@ -318,6 +322,8 @@ public override Column[] GetColumns(string table)
                 else if (dataTypeString == "numeric")
                 {
                     dbType = DbType.Decimal;
+                    precision = numericPrecision;
+                    scale = numericScale;
                 }
                 else if (dataTypeString == "real")
                 {
@@ -375,7 +381,8 @@ public override Column[] GetColumns(string table)
 
                 var column = new Column(columnName, dbType)
                 {
-                    Precision = precision
+                    Precision = precision,
+                    Scale = scale
                 };
 
                 column.ColumnProperty |= isNullable ? ColumnProperty.Null : ColumnProperty.NotNull;