Adjustments for Postgre Guid and decimal default values

Author: JaBistDuNarrisch

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

@@ -10,11 +10,17 @@ namespace Migrator.Tests.Providers.PostgreSQL;
 [Category("Postgre")]
 public class PostgreSQLTransformationProvider_GetColumnsDefaultTypeTests : PostgreSQLTransformationProviderTestBase
 {
+    private const decimal DecimalDefaultValue = 14.56565m;
+
     [Test]
     public void GetColumns_DataTypeResolveSucceeds()
     {
         // Arrange
+        var dateTimeDefaultValue = new DateTime(2000, 1, 2, 3, 4, 5, DateTimeKind.Utc);
+        var guidDefaultValue = Guid.NewGuid();
+
         const string testTableName = "MyDefaultTestTable";
+
         const string dateTimeColumnName1 = "datetimecolumn1";
         const string dateTimeColumnName2 = "datetimecolumn2";
         const string decimalColumnName1 = "decimalcolumn";
@@ -27,10 +33,10 @@ public void GetColumns_DataTypeResolveSucceeds()
 
         // Should be extended by remaining types
         Provider.AddTable(testTableName,
-            new Column(dateTimeColumnName1, DbType.DateTime, new DateTime(2000, 1, 2, 3, 4, 5, 6, DateTimeKind.Utc)),
-            new Column(dateTimeColumnName2, DbType.DateTime2, new DateTime(2000, 1, 2, 3, 4, 5, 6, DateTimeKind.Utc))
-        // new Column(decimalColumnName1, DbType.Decimal),
-        // new Column(guidColumnName1, DbType.Guid),
+            new Column(dateTimeColumnName1, DbType.DateTime, dateTimeDefaultValue),
+            new Column(dateTimeColumnName2, DbType.DateTime2, dateTimeDefaultValue),
+            new Column(decimalColumnName1, DbType.Decimal, DecimalDefaultValue),
+            new Column(guidColumnName1, DbType.Guid, guidDefaultValue)
         // new Column(booleanColumnName1, DbType.Boolean),
         // new Column(int32ColumnName1, DbType.Int32),
         // new Column(int64ColumnName1, DbType.Int64),
@@ -41,14 +47,20 @@ public void GetColumns_DataTypeResolveSucceeds()
         // Act
         var columns = Provider.GetColumns(testTableName);
 
+        // Assert
         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 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);
         // 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.That(dateTimeColumn1.DefaultValue, Is.EqualTo(dateTimeDefaultValue));
+        Assert.That(dateTimeColumn2.DefaultValue, Is.EqualTo(dateTimeDefaultValue));
+        Assert.That(decimalColumn1.DefaultValue, Is.EqualTo(DecimalDefaultValue));
+        Assert.That(guidColumn1.DefaultValue, Is.EqualTo(guidDefaultValue));
     }
 }

src/Migrator/Providers/Dialect.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Globalization;
 using DotNetProjects.Migrator.Framework;
 
 namespace DotNetProjects.Migrator.Providers;
@@ -344,7 +345,9 @@ public virtual string Default(object defaultValue)
         }
         else if (defaultValue is Guid)
         {
-            return string.Format("DEFAULT '{0}'", defaultValue.ToString());
+            var guidValue = string.Format("DEFAULT '{0}'", defaultValue.ToString());
+
+            return guidValue;
         }
         else if (defaultValue is DateTime)
         {
@@ -355,6 +358,11 @@ public virtual string Default(object defaultValue)
             defaultValue = ((string)defaultValue).Replace("'", "''");
             defaultValue = "'" + defaultValue + "'";
         }
+        else if (defaultValue is decimal)
+        {
+            // .ToString("N") does not exist in old .NET version
+            defaultValue = Convert.ToString(defaultValue, CultureInfo.InvariantCulture);
+        }
 
         return string.Format("DEFAULT {0}", defaultValue);
     }

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

@@ -28,6 +28,8 @@ namespace DotNetProjects.Migrator.Providers.Impl.PostgreSQL;
 /// </summary>
 public class PostgreSQLTransformationProvider : TransformationProvider
 {
+    private Regex stripSingleQuoteRegEx = new("(?<=')[^']*(?=')");
+
     public PostgreSQLTransformationProvider(Dialect dialect, string connectionString, string defaultSchema, string scope, string providerName)
         : base(dialect, connectionString, defaultSchema, scope)
     {
@@ -407,9 +409,8 @@ public override Column[] GetColumns(string table)
                     {
                         if (defaultValueString.StartsWith("'"))
                         {
-                            var regEx = new Regex("(?<=')[^']*(?=')");
+                            var match = stripSingleQuoteRegEx.Match(defaultValueString);
 
-                            var match = regEx.Match(defaultValueString);
                             if (!match.Success)
                             {
                                 throw new Exception("Postgre default value for date time: We expected single quotes around the date time string.");
@@ -429,18 +430,25 @@ public override Column[] GetColumns(string table)
                     }
                     else if (column.Type == DbType.Guid)
                     {
-                        if (column.DefaultValue is string defVal)
+                        if (defaultValueString.StartsWith("'"))
                         {
-                            var dt = defVal;
+                            var match = stripSingleQuoteRegEx.Match(defaultValueString);
 
-                            if (defVal.StartsWith("'"))
+                            if (!match.Success)
                             {
-                                dt = defVal.Substring(1, defVal.Length - 2);
+                                throw new Exception("Postgre default value for uniqueidentifier: We expected single quotes around the Guid string.");
                             }
 
-                            var d = Guid.Parse(dt);
-                            column.DefaultValue = d;
+                            column.DefaultValue = Guid.Parse(match.Value);
                         }
+                        else
+                        {
+                            throw new NotImplementedException();
+                        }
+                    }
+                    else if (column.Type == DbType.Decimal)
+                    {
+                        column.DefaultValue = decimal.Parse(defaultValueString, CultureInfo.InvariantCulture);
                     }
                 }