Dont require default columns

Author: wickwirew

Sources/Compiler/Columns.swift

@@ -23,15 +23,20 @@ extension Columns {
 public struct Column: Equatable, Sendable {
     public let type: Type
     public let isGenerated: Bool
+    public let hasDefault: Bool
 
-    public init(type: Type, isGenerated: Bool = false) {
+    public init(
+        type: Type,
+        hasDefault: Bool = false,
+        isGenerated: Bool = false
+    ) {
         self.type = type
+        self.hasDefault = hasDefault
         self.isGenerated = isGenerated
     }
 
     public var isRequired: Bool {
-        guard !isGenerated else { return false }
-        return !type.isOptional
+        return !isGenerated && !hasDefault && !type.isOptional
     }
 
     public func mapType(_ transform: (Type) -> Type) -> Column {

Sources/Compiler/Sema/StmtTypeChecker.swift

@@ -1165,13 +1165,7 @@ extension StmtTypeChecker {
         case let .columns(columnsDefs, constraints, options):
             var columns: Columns = [:]
             for (name, def) in columnsDefs {
-                let type = typeFor(
-                    column: def,
-                    tableColumns: columns,
-                    tableName: createTable.name.value
-                )
-                let isGenerated = def.constraints.contains { $0.isGenerated }
-                let column = Column(type: type, isGenerated: isGenerated)
+                let column = column(for: def, columns: columns, tableName: createTable.name.value)
                 columns.append(column, for: name.value)
             }
 
@@ -1200,6 +1194,28 @@ extension StmtTypeChecker {
         }
     }
 
+    mutating func column(
+        for columnDef: ColumnDefSyntax,
+        columns: Columns,
+        tableName: Substring
+    ) -> Column {
+        let type = typeFor(
+            column: columnDef,
+            tableColumns: columns,
+            tableName: tableName
+        )
+        
+        var isGenerated = false
+        var hasDefault = false
+        
+        for constraint in columnDef.constraints {
+            isGenerated = constraint.isGenerated || isGenerated
+            hasDefault = constraint.isDefault || isGenerated
+        }
+        
+        return Column(type: type, hasDefault: hasDefault, isGenerated: isGenerated)
+    }
+    
     mutating func typeCheck(alterTable: AlterTableStmtSyntax) {
         var tableName = qualifedName(for: alterTable.name, in: alterTable.schemaName)
 
@@ -1229,15 +1245,9 @@ extension StmtTypeChecker {
             table.name = tableName
         case let .renameColumn(oldName, newName):
             table.columns.rename(oldName.value, to: newName.value)
-        case let .addColumn(column):
-            let newType = typeFor(
-                column: column,
-                tableColumns: table.columns,
-                tableName: table.name.name
-            )
-            let isGenerated = column.constraints.contains { $0.isGenerated }
-            let newColumn = Column(type: newType, isGenerated: isGenerated)
-            table.columns.append(newColumn, for: column.name.value)
+        case let .addColumn(def):
+            let column = column(for: def, columns: table.columns, tableName: table.name.name)
+            table.columns.append(column, for: def.name.value)
         case let .dropColumn(column):
             table.columns = Columns(table.columns.filter { $0.key != column.value })
         }

Sources/Compiler/Syntax/ColumnConstraintSyntax.swift

@@ -47,4 +47,11 @@ struct ColumnConstraintSyntax: Syntax {
         default: return false
         }
     }
+    
+    var isDefault: Bool {
+        switch kind {
+        case .default: return true
+        default: return false
+        }
+    }
 }

Tests/CompilerTests/Compiler/CompileInsert.sql

@@ -1,6 +1,7 @@
 CREATE TABLE user (
     id INTEGER,
     name TEXT,
+    age INTEGER NOT NULL DEFAULT 0,
     description TEXT GENERATED ALWAYS AS (name || 'is a user')
 );
 
@@ -14,9 +15,13 @@ CREATE TABLE user (
 -- CHECK:       TYPE TEXT?
 -- CHECK:       INDEX 2
 -- CHECK:       NAME name
+-- CHECK:     PARAMETER
+-- CHECK:       TYPE INTEGER
+-- CHECK:       INDEX 3
+-- CHECK:       NAME age
 -- CHECK:     TABLES
 -- CHECK:       user
-INSERT INTO user (id, name) VALUES (?, ?);
+INSERT INTO user (id, name, age) VALUES (?, ?, ?);
 
 -- CHECK: SIGNATURE
 -- CHECK:   PARAMETERS
@@ -33,6 +38,7 @@ INSERT INTO user (id, name) VALUES (?, ?);
 -- CHECK:       OUTPUT
 -- CHECK:         id INTEGER?
 -- CHECK:         name TEXT?
+-- CHECK:         age INTEGER
 -- CHECK:         description TEXT?
 -- CHECK:     TABLES
 -- CHECK:       user
@@ -69,6 +75,7 @@ INSERT INTO user (id, name) VALUES (?, ?) RETURNING *;
 -- CHECK:       OUTPUT
 -- CHECK:         id INTEGER?
 -- CHECK:         name TEXT?
+-- CHECK:         age INTEGER
 -- CHECK:         description TEXT?
 -- CHECK:     TABLES
 -- CHECK:       user
@@ -84,9 +91,13 @@ INSERT INTO user (id, name) VALUES (?, ?), (?, ?), (?, ?) RETURNING *;
 -- CHECK:       TYPE TEXT?
 -- CHECK:       INDEX 2
 -- CHECK:       NAME name
+-- CHECK:     PARAMETER
+-- CHECK:       TYPE INTEGER
+-- CHECK:       INDEX 3
+-- CHECK:       NAME age
 -- CHECK:     TABLES
 -- CHECK:       user
-INSERT INTO user VALUES (?, ?);
+INSERT INTO user VALUES (?, ?, ?);
 
 -- CHECK: SIGNATURE
 -- CHECK:   PARAMETERS