Scaffolding: Handle unknown computed column SQL in model factory (#32251

) Fixes #32179
dotnet · Nov 8, 2023 · 9ea08b9 · 9ea08b9
1 parent e4ff864
commit 9ea08b9
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 2 deletions.
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -8,7 +8,7 @@
     <!--
         When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
     -->
-    <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
+    <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
     <DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
     <DefaultNetCoreTargetFramework>net8.0</DefaultNetCoreTargetFramework>
   </PropertyGroup>

diff --git a/src/EFCore.Design/Scaffolding/Internal/RelationalScaffoldingModelFactory.cs b/src/EFCore.Design/Scaffolding/Internal/RelationalScaffoldingModelFactory.cs
@@ -466,7 +466,14 @@ protected virtual EntityTypeBuilder VisitColumns(EntityTypeBuilder builder, ICol
 
         if (column.ComputedColumnSql != null)
         {
-            property.HasComputedColumnSql(column.ComputedColumnSql, column.IsStored);
+            if (column.ComputedColumnSql.Length == 0)
+            {
+                property.HasComputedColumnSql();
+            }
+            else
+            {
+                property.HasComputedColumnSql(column.ComputedColumnSql, column.IsStored);
+            }
         }
 
         if (column.Comment != null)

diff --git a/test/EFCore.Design.Tests/Scaffolding/Internal/RelationalScaffoldingModelFactoryTest.cs b/test/EFCore.Design.Tests/Scaffolding/Internal/RelationalScaffoldingModelFactoryTest.cs
@@ -3072,4 +3072,36 @@ void AssertNavigations()
                 }
             );
     }
+
+    [ConditionalFact]
+    public void Computed_column_when_sql_unknown()
+    {
+        var database = new DatabaseModel
+        {
+            Tables =
+            {
+                new DatabaseTable
+                {
+                    Database = Database,
+                    Name = "Table",
+                    Columns =
+                    {
+                        IdColumn,
+                        new DatabaseColumn
+                        {
+                            Table = Table,
+                            Name = "Column",
+                            StoreType = "int",
+                            ComputedColumnSql = string.Empty
+                        }
+                    }
+                }
+            }
+        };
+
+        var model = _factory.Create(database, new ModelReverseEngineerOptions());
+
+        var column = model.FindEntityType("Table").GetProperty("Column");
+        Assert.Empty(column.GetComputedColumnSql());
+    }
 }