fix

Author: James Cor

sql/analyzer/inserts.go

@@ -90,65 +90,6 @@ func resolveInsertRows(ctx *sql.Context, a *Analyzer, n sql.Node, scope *plan.Sc
 	})
 }
 
-func validateInsertRows(ctx *sql.Context, a *Analyzer, n sql.Node, scope *plan.Scope, sel RuleSelector, qFlags *sql.QueryFlags) (sql.Node, transform.TreeIdentity, error) {
-	if _, ok := n.(*plan.TriggerExecutor); ok {
-		return n, transform.SameTree, nil
-	} else if _, ok := n.(*plan.CreateProcedure); ok {
-		return n, transform.SameTree, nil
-	}
-	// We capture all INSERTs along the tree, such as those inside of block statements.
-	var err error
-	transform.Inspect(n, func(n sql.Node) bool {
-		insert, ok := n.(*plan.InsertInto)
-		if !ok {
-			return true
-		}
-
-		var insertable sql.InsertableTable
-		table := getResolvedTable(insert.Destination)
-		insertable, err = plan.GetInsertable(table)
-		if err != nil {
-			return false
-		}
-
-		source := insert.Source
-		dstSchema := insertable.Schema()
-
-		// normalize the column name
-		columnNames := make([]string, len(insert.ColumnNames))
-		for i, name := range insert.ColumnNames {
-			columnNames[i] = strings.ToLower(name)
-		}
-
-		// If no columns are given and value tuples are not all empty, use the full schema
-		if len(columnNames) == 0 && existsNonZeroValueCount(source) {
-			columnNames = make([]string, len(dstSchema))
-			for i, f := range dstSchema {
-				columnNames[i] = f.Name
-			}
-		}
-
-		for _, col := range dstSchema {
-			colIdx := findColIdx(col.Name, columnNames)
-			if colIdx != -1 {
-				continue
-			}
-
-			if _, isTrigExec := source.(*plan.TriggerExecutor); !isTrigExec && !col.AutoIncrement && !col.Nullable && col.Default == nil && col.Generated == nil {
-				err = sql.ErrInsertIntoNonNullableDefaultNullColumn.New(col.Name)
-				return false
-			}
-		}
-
-		return true
-	})
-
-	if err != nil {
-		return nil, transform.SameTree, err
-	}
-	return n, transform.SameTree, nil
-}
-
 // Ensures that the number of elements in each Value tuple is empty
 func existsNonZeroValueCount(values sql.Node) bool {
 	switch node := values.(type) {

sql/analyzer/rule_ids.go

@@ -61,7 +61,6 @@ const (
 	applyHashInId                // applyHashIn
 	resolveInsertRowsId          // resolveInsertRows
 	applyTriggersId              // applyTriggers
-	validateInsertRowsId         // validateInsertRows
 	applyProceduresId            // applyProcedures
 	assignRoutinesId             // assignRoutines
 	modifyUpdateExprsForJoinId   // modifyUpdateExprsForJoin

sql/analyzer/ruleid_string.go

@@ -20,7 +20,6 @@ func init() {
 		// resolveInsertRows inserts a projection wrapping values that cannot be seen by fixup
 		{resolveInsertRowsId, resolveInsertRows},
 		{applyTriggersId, applyTriggers},
-		{validateInsertRowsId, validateInsertRows},
 		{applyProceduresId, applyProcedures},
 		{inlineSubqueryAliasRefsId, inlineSubqueryAliasRefs},
 		{cacheSubqueryAliasesInJoinsId, cacheSubqueryAliasesInJoins},

sql/analyzer/rules.go

@@ -393,14 +393,19 @@ func (i *insertIter) evaluateChecks(ctx *sql.Context, row sql.Row) error {
 
 func (i *insertIter) validateNullability(ctx *sql.Context, dstSchema sql.Schema, row sql.Row) error {
 	for count, col := range dstSchema {
-		if !col.Nullable && row[count] == nil {
+		if row[count] != nil {
+			continue
+		}
+		if !col.Nullable {
 			// In the case of an IGNORE we set the nil value to a default and add a warning
-			if i.ignore {
-				row[count] = col.Type.Zero()
-				_ = warnOnIgnorableError(ctx, row, sql.ErrInsertIntoNonNullableProvidedNull.New(col.Name)) // will always return nil
-			} else {
+			if !i.ignore {
+				if col.Default != nil || col.Generated != nil {
+					return sql.ErrInsertIntoNonNullableDefaultNullColumn.New(col.Name)
+				}
 				return sql.ErrInsertIntoNonNullableProvidedNull.New(col.Name)
 			}
+			row[count] = col.Type.Zero()
+			_ = warnOnIgnorableError(ctx, row, sql.ErrInsertIntoNonNullableProvidedNull.New(col.Name)) // will always return nil
 		}
 	}
 	return nil