drizzle-graphql-plus 0.8.30 → 0.8.32

package/index.cjs

@@ -2460,8 +2460,17 @@ ${fields.join("\n")}
         false,
         isPrimaryKey
       );
-      const nullableType = typeStr.endsWith("!") ? typeStr.slice(0, -1) : typeStr;
-      insertFields.push(`  ${columnName}: ${nullableType}`);
+      const hasDefault = column.hasDefault || column.default !== void 0;
+      const isAutoIncrement = column.autoIncrement || column.generatedAlwaysAs;
+      const isNotNull3 = column.notNull;
+      const shouldBeOptional = hasDefault || isAutoIncrement || isPrimaryKey && !isNotNull3;
+      let insertFieldType;
+      if (shouldBeOptional) {
+        insertFieldType = typeStr.endsWith("!") ? typeStr.slice(0, -1) : typeStr;
+      } else {
+        insertFieldType = isNotNull3 && !typeStr.endsWith("!") ? `${typeStr}!` : typeStr;
+      }
+      insertFields.push(`  ${columnName}: ${insertFieldType}`);
     }
     if (insertFields.length > 0) {
       typeDefs.push(
@@ -3062,7 +3071,9 @@ var createInsertManyResolver = (db, queryBase, tableInfo, tables, relations, pri
         values,
         tableInfo.table
       );
-      const insertedRows = await db.insert(tableInfo.table).values(remappedValues).returning();
+      const insertedRows = await db.insert(tableInfo.table).values(remappedValues).returning({
+        [primaryKeyColumn.name]: primaryKeyColumn
+      });
       const insertedIds = insertedRows.map(
         (row) => row[primaryKeyColumn.name]
       );
@@ -3104,7 +3115,9 @@ var createUpdateManyResolver = (db, queryBase, tableInfo, tables, relations, pri
       if (whereClause) {
         query = query.where(whereClause);
       }
-      const updatedRows = await query.returning();
+      const updatedRows = await query.returning({
+        [primaryKeyColumn.name]: primaryKeyColumn
+      });
       const updatedIds = updatedRows.map(
         (row) => row[primaryKeyColumn.name]
       );
@@ -3142,7 +3155,9 @@ var createDeleteManyResolver = (db, queryBase, tableInfo, tables, relations, pri
       if (whereClause) {
         deleteQuery = deleteQuery.where(whereClause);
       }
-      const deletedRows = await deleteQuery.returning();
+      const deletedRows = await deleteQuery.returning({
+        [primaryKeyColumn.name]: primaryKeyColumn
+      });
       const deletedItems = deletedRows.map((row) => ({
         id: row[primaryKeyColumn.name]
       }));