Fix the not null violation error message in detail

chequer-io · Apr 12, 2024 · 6da3d5b · 6da3d5b
1 parent cb19116
commit 6da3d5b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/Qsi.Tests/Vendor/PostgreSql/Driver/PostgreSqlRepositoryProvider.cs b/Qsi.Tests/Vendor/PostgreSql/Driver/PostgreSqlRepositoryProvider.cs
@@ -89,7 +89,7 @@ from information_schema.COLUMNS
                 var column = table.NewColumn();
                 column.Name = new QsiIdentifier(reader.GetString(0), false);
                 column.IsNullable = reader.GetString(1) == "YES";
-                column.Default = reader.GetString(2);
+                column.Default = reader.IsDBNull(2) ? null : reader.GetString(2);
             }
         }
 

diff --git a/Qsi/Analyzers/Action/QsiActionAnalyzer.cs b/Qsi/Analyzers/Action/QsiActionAnalyzer.cs
@@ -466,9 +466,10 @@ protected virtual async ValueTask<IQsiAnalysisResult[]> ExecuteDataInsertAction(
         }
 
         ColumnTarget[] columnTargets = ResolveColumnTargetsFromDataInsertAction(context, table, action);
+        var columnWithInvalidDefault = ResolveNotNullableColumnWithInvalidDefault(table.Columns, columnTargets);
 
-        if (CheckNotNullConstraintsExceptTarget(table.Columns, columnTargets))
-            throw new QsiException(QsiError.NotNullConstraints);
+        if (columnWithInvalidDefault is not null)
+            throw new QsiException(QsiError.NotNullConstraints, columnWithInvalidDefault.Name.Value);
 
         var dataContext = new TableDataInsertContext(context, table)
         {
@@ -609,13 +610,12 @@ protected virtual SetColumnTarget ResolveSetColumnTarget(
         );
     }
 
-    protected virtual bool CheckNotNullConstraintsExceptTarget(IEnumerable<QsiTableColumn> columns, IEnumerable<ColumnTarget> columnTargets)
+    protected virtual QsiTableColumn ResolveNotNullableColumnWithInvalidDefault(IEnumerable<QsiTableColumn> columns, IEnumerable<ColumnTarget> columnTargets)
     {
-        HashSet<int> targetIndices = columnTargets.Select(ct => ct.DeclaredOrder).ToHashSet();
+        HashSet<string> targetNames = columnTargets.Select(ct => ct.DeclaredName.SubIdentifier(0).ToString()).ToHashSet();
 
         return columns
-            .Where((x, i) => !targetIndices.Contains(i) && !x.IsNullable && x.Default == null)
-            .Any();
+            .FirstOrDefault(x => !targetNames.Contains(x.Name.Value) && !x.IsNullable && x.Default is null);
     }
 
     private async ValueTask ProcessQueryValues(TableDataInsertContext context, IQsiTableDirectivesNode directives, IQsiTableNode valueTable)
@@ -747,8 +747,8 @@ private void PopulateInsertRow(TableDataInsertContext context, DataValueSelector
                     ? valueSelector(pivot)
                     : ResolveDefaultColumnValue(pivot);
 
-                if (item is null && target.Table.Columns[pivot.DestinationOrder].IsNullable == false)
-                    throw new QsiException(QsiError.NotNullConstraints);
+                if (item.Value is null && target.Table.Columns[pivot.DestinationOrder].IsNullable == false)
+                    throw new QsiException(QsiError.NotNullConstraints, pivot.DestinationColumn.Name.Value);
             }
 
             target.InsertRows.Add(targetRow);

diff --git a/Qsi/QsiError.cs b/Qsi/QsiError.cs
@@ -73,7 +73,7 @@ internal static class SR
     public const string InvalidNestedExplain = "Invalid nested explain for '{0}'";
     public const string SubqueryReturnsMoreThanRow = "Subquery returns more than {0} row";
     public const string UnableResolveFunction = "Unable to resolve function '{0}'";
-    public const string NotNullConstraints = "Not Null constraints violation.";
+    public const string NotNullConstraints = "The column '{0}' has a Not Null constraint.";
 
     public static string GetResource(QsiError error)
     {