relq 1.0.100 → 1.0.102

package/dist/cjs/cli/commands/push.cjs

@@ -35,7 +35,6 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runPush = runPush;
 const citty_1 = require("citty");
-const fs = __importStar(require("node:fs"));
 const path = __importStar(require("node:path"));
 const p = __importStar(require("@clack/prompts"));
 const context_1 = require("../utils/context.cjs");
@@ -58,8 +57,6 @@ const schema_hash_1 = require("../utils/schema-hash.cjs");
 const migration_generator_1 = require("../utils/migration-generator.cjs");
 const migration_helpers_1 = require("../utils/migration-helpers.cjs");
 const ast_transformer_1 = require("../utils/ast-transformer.cjs");
-const ast_codegen_1 = require("../utils/ast-codegen.cjs");
-const schema_to_ast_1 = require("../utils/schema-to-ast.cjs");
 function formatColumnProps(col) {
     if (!col)
         return '';
@@ -470,38 +467,6 @@ async function runPush(config, projectRoot, opts = {}) {
         mergeTrackingIds(updatedSchema, desiredSchema);
         (0, snapshot_manager_1.saveSnapshot)(updatedSchema, snapshotPath, connection.database);
         spin.stop('Snapshot updated');
-        spin.start('Syncing schema from database...');
-        try {
-            const liveSchema = await (0, dialect_introspect_1.dialectIntrospect)(config, {
-                includeFunctions,
-                includeTriggers,
-            });
-            const parsedSchema = await (0, ast_transformer_1.introspectedToParsedSchema)(liveSchema);
-            try {
-                const { createJiti } = await Promise.resolve().then(() => __importStar(require('jiti')));
-                const jiti = createJiti(projectRoot, { interopDefault: true });
-                const existingModule = await jiti.import(schemaPath);
-                const existingAst = (0, schema_to_ast_1.schemaToAST)(existingModule);
-                (0, ast_codegen_1.mergeTrackingIdsFromParsed)(parsedSchema, existingAst);
-            }
-            catch { }
-            (0, ast_codegen_1.assignTrackingIds)(parsedSchema);
-            const builderImportPath = `relq/${(0, dialect_router_1.detectDialect)(config)}-builder`;
-            const typescript = (0, ast_codegen_1.generateTypeScriptFromAST)(parsedSchema, {
-                camelCase: config.generate?.camelCase ?? true,
-                importPath: builderImportPath,
-                includeFunctions: false,
-                includeTriggers: false,
-                includeEnums: parsedSchema.enums.length > 0,
-                includeDomains: parsedSchema.domains.length > 0,
-            });
-            fs.writeFileSync(schemaPath, typescript, 'utf-8');
-            spin.stop('Schema synced');
-        }
-        catch (syncErr) {
-            spin.stop('');
-            (0, ui_1.warning)(`Could not sync schema: ${syncErr instanceof Error ? syncErr.message : String(syncErr)}`);
-        }
         const duration = Date.now() - startTime;
         console.log('');
         console.log(`Push completed in ${(0, format_1.formatDuration)(duration)}`);

package/dist/cjs/core/helpers/ConnectedInsertBuilder.cjs

@@ -65,7 +65,7 @@ class ConnectedInsertBuilder {
     }
     doNothing(...args) {
         const columns = [...new Set(args.flat())];
-        this.builder._onConflict(columns, q => q.doNothing());
+        this.builder._onConflict(columns.length > 0 ? columns : null, q => q.doNothing());
         return this;
     }
     doUpdate(columns, values, where) {

package/dist/cjs/core/helpers/ConnectedQueryBuilder.cjs

@@ -113,8 +113,17 @@ class ConnectedQueryBuilder {
             update: options.update,
         });
     }
-    async insertMany(rows) {
-        return (0, query_convenience_1.executeInsertMany)(this.ctx, rows);
+    insertMany(rows) {
+        if (rows.length === 0) {
+            const builder = new insert_builder_1.InsertBuilder(this.tableName, {});
+            builder.clear();
+            return new ConnectedInsertBuilder_1.ConnectedInsertBuilder(builder, this.relq, this.tableName, this.schemaKey);
+        }
+        const builder = new insert_builder_1.InsertBuilder(this.tableName, rows[0]);
+        for (let i = 1; i < rows.length; i++) {
+            builder.addRow(rows[i]);
+        }
+        return new ConnectedInsertBuilder_1.ConnectedInsertBuilder(builder, this.relq, this.tableName, this.schemaKey);
     }
     async insertFrom(columns, selectCallback) {
         const tables = (0, table_accessor_1.createTableAccessor)(this.relq, this.relq.schema);

package/dist/cjs/core/helpers/query-convenience.cjs

@@ -38,7 +38,6 @@ exports.executeFindOne = executeFindOne;
 exports.executeFindMany = executeFindMany;
 exports.executeExists = executeExists;
 exports.executeUpsert = executeUpsert;
-exports.executeInsertMany = executeInsertMany;
 exports.executeSoftDelete = executeSoftDelete;
 exports.executeRestore = executeRestore;
 exports.executeInsertFrom = executeInsertFrom;
@@ -114,20 +113,6 @@ async function executeUpsert(ctx, options) {
     const transformed = ctx.relq[methods_1.INTERNAL].transformResultsFromDb(ctx.tableName, result.result.rows);
     return transformed[0];
 }
-async function executeInsertMany(ctx, rows) {
-    if (rows.length === 0)
-        return [];
-    const firstDbRow = ctx.relq[methods_1.INTERNAL].transformToDbColumns(ctx.tableName, rows[0]);
-    const builder = new insert_builder_1.InsertBuilder(ctx.tableName, firstDbRow);
-    for (let i = 1; i < rows.length; i++) {
-        const dbRow = ctx.relq[methods_1.INTERNAL].transformToDbColumns(ctx.tableName, rows[i]);
-        builder.addRow(dbRow);
-    }
-    builder.returning(['*']);
-    const sql = builder.toString();
-    const result = await ctx.relq[methods_1.INTERNAL].executeQuery(sql);
-    return ctx.relq[methods_1.INTERNAL].transformResultsFromDb(ctx.tableName, result.result.rows);
-}
 async function executeSoftDelete(ctx, filter) {
     const dbFilter = ctx.relq[methods_1.INTERNAL].transformToDbColumns(ctx.tableName, filter);
     const builder = new update_builder_1.UpdateBuilder(ctx.tableName, { deleted_at: new Date() });

package/dist/cjs/insert/insert-builder.cjs

@@ -97,7 +97,7 @@ class InsertBuilder {
         return this.insertData.length;
     }
     _onConflict(columns, callback) {
-        this.conflictColumns = Array.isArray(columns) ? columns : [columns];
+        this.conflictColumns = columns === null ? [] : Array.isArray(columns) ? columns : [columns];
         this.conflictBuilder = new conflict_builder_1.ConflictBuilder(this.tableName);
         if (callback) {
             callback(this.conflictBuilder);
@@ -215,12 +215,11 @@ class InsertBuilder {
         return { values: processedValues, placeholders: placeholderTypes.join(', ') };
     }
     buildConflictClause() {
-        if (!this.conflictColumns || !this.conflictBuilder)
+        if (!this.conflictBuilder)
             return '';
-        if (this.insertData.length > 1) {
-            throw new relq_errors_1.RelqBuilderError('ON CONFLICT (upsert) is not supported with multiple row inserts', { builder: 'InsertBuilder', hint: 'Use single row insert for upsert operations' });
-        }
-        let clause = (0, pg_format_1.default)(' ON CONFLICT (%I)', this.conflictColumns);
+        let clause = this.conflictColumns && this.conflictColumns.length > 0
+            ? (0, pg_format_1.default)(' ON CONFLICT (%I)', this.conflictColumns)
+            : ' ON CONFLICT';
         if (this.conflictBuilder.action === 'update') {
             const updateSql = (0, conflict_builder_1.buildConflictUpdateSql)(this.conflictBuilder.updateData, this.tableName);
             clause += ` DO UPDATE SET ${updateSql}`;

package/dist/esm/cli/commands/push.js

@@ -1,5 +1,4 @@
 import { defineCommand } from 'citty';
-import * as fs from 'node:fs';
 import * as path from 'node:path';
 import * as p from '@clack/prompts';
 import { buildContext } from "../utils/context.js";
@@ -22,8 +21,6 @@ import { normalizeSchema } from "../utils/schema-hash.js";
 import { generateTimestampedName, generateMigrationFromComparison, generateMigrationNameFromComparison } from "../utils/migration-generator.js";
 import { getMigrationTableDDL } from "../utils/migration-helpers.js";
 import { introspectedToParsedSchema } from "../utils/ast-transformer.js";
-import { generateTypeScriptFromAST, assignTrackingIds, mergeTrackingIdsFromParsed } from "../utils/ast-codegen.js";
-import { schemaToAST } from "../utils/schema-to-ast.js";
 function formatColumnProps(col) {
     if (!col)
         return '';
@@ -434,38 +431,6 @@ export async function runPush(config, projectRoot, opts = {}) {
         mergeTrackingIds(updatedSchema, desiredSchema);
         saveSnapshot(updatedSchema, snapshotPath, connection.database);
         spin.stop('Snapshot updated');
-        spin.start('Syncing schema from database...');
-        try {
-            const liveSchema = await dialectIntrospect(config, {
-                includeFunctions,
-                includeTriggers,
-            });
-            const parsedSchema = await introspectedToParsedSchema(liveSchema);
-            try {
-                const { createJiti } = await import('jiti');
-                const jiti = createJiti(projectRoot, { interopDefault: true });
-                const existingModule = await jiti.import(schemaPath);
-                const existingAst = schemaToAST(existingModule);
-                mergeTrackingIdsFromParsed(parsedSchema, existingAst);
-            }
-            catch { }
-            assignTrackingIds(parsedSchema);
-            const builderImportPath = `relq/${detectDialect(config)}-builder`;
-            const typescript = generateTypeScriptFromAST(parsedSchema, {
-                camelCase: config.generate?.camelCase ?? true,
-                importPath: builderImportPath,
-                includeFunctions: false,
-                includeTriggers: false,
-                includeEnums: parsedSchema.enums.length > 0,
-                includeDomains: parsedSchema.domains.length > 0,
-            });
-            fs.writeFileSync(schemaPath, typescript, 'utf-8');
-            spin.stop('Schema synced');
-        }
-        catch (syncErr) {
-            spin.stop('');
-            warning(`Could not sync schema: ${syncErr instanceof Error ? syncErr.message : String(syncErr)}`);
-        }
         const duration = Date.now() - startTime;
         console.log('');
         console.log(`Push completed in ${formatDuration(duration)}`);

package/dist/esm/core/helpers/ConnectedInsertBuilder.js

@@ -62,7 +62,7 @@ export class ConnectedInsertBuilder {
     }
     doNothing(...args) {
         const columns = [...new Set(args.flat())];
-        this.builder._onConflict(columns, q => q.doNothing());
+        this.builder._onConflict(columns.length > 0 ? columns : null, q => q.doNothing());
         return this;
     }
     doUpdate(columns, values, where) {

package/dist/esm/core/helpers/ConnectedQueryBuilder.js

@@ -13,7 +13,7 @@ import { ConnectedUpdateBuilder } from "./ConnectedUpdateBuilder.js";
 import { INTERNAL } from "./methods.js";
 import { PaginateBuilder } from "./PaginateBuilder.js";
 import { createTableAccessor } from "../shared/table-accessor.js";
-import { executeFindById, executeFindOne, executeFindMany, executeExists, executeUpsert, executeInsertMany, executeInsertFrom, executeCreateWith, executeSoftDelete, executeRestore, getPrimaryKeyColumn } from "./query-convenience.js";
+import { executeFindById, executeFindOne, executeFindMany, executeExists, executeUpsert, executeInsertFrom, executeCreateWith, executeSoftDelete, executeRestore, getPrimaryKeyColumn } from "./query-convenience.js";
 export class ConnectedQueryBuilder {
     tableName;
     relq;
@@ -110,8 +110,17 @@ export class ConnectedQueryBuilder {
             update: options.update,
         });
     }
-    async insertMany(rows) {
-        return executeInsertMany(this.ctx, rows);
+    insertMany(rows) {
+        if (rows.length === 0) {
+            const builder = new InsertBuilder(this.tableName, {});
+            builder.clear();
+            return new ConnectedInsertBuilder(builder, this.relq, this.tableName, this.schemaKey);
+        }
+        const builder = new InsertBuilder(this.tableName, rows[0]);
+        for (let i = 1; i < rows.length; i++) {
+            builder.addRow(rows[i]);
+        }
+        return new ConnectedInsertBuilder(builder, this.relq, this.tableName, this.schemaKey);
     }
     async insertFrom(columns, selectCallback) {
         const tables = createTableAccessor(this.relq, this.relq.schema);

package/dist/esm/core/helpers/query-convenience.js

@@ -68,20 +68,6 @@ export async function executeUpsert(ctx, options) {
     const transformed = ctx.relq[INTERNAL].transformResultsFromDb(ctx.tableName, result.result.rows);
     return transformed[0];
 }
-export async function executeInsertMany(ctx, rows) {
-    if (rows.length === 0)
-        return [];
-    const firstDbRow = ctx.relq[INTERNAL].transformToDbColumns(ctx.tableName, rows[0]);
-    const builder = new InsertBuilder(ctx.tableName, firstDbRow);
-    for (let i = 1; i < rows.length; i++) {
-        const dbRow = ctx.relq[INTERNAL].transformToDbColumns(ctx.tableName, rows[i]);
-        builder.addRow(dbRow);
-    }
-    builder.returning(['*']);
-    const sql = builder.toString();
-    const result = await ctx.relq[INTERNAL].executeQuery(sql);
-    return ctx.relq[INTERNAL].transformResultsFromDb(ctx.tableName, result.result.rows);
-}
 export async function executeSoftDelete(ctx, filter) {
     const dbFilter = ctx.relq[INTERNAL].transformToDbColumns(ctx.tableName, filter);
     const builder = new UpdateBuilder(ctx.tableName, { deleted_at: new Date() });

package/dist/esm/insert/insert-builder.js

@@ -91,7 +91,7 @@ export class InsertBuilder {
         return this.insertData.length;
     }
     _onConflict(columns, callback) {
-        this.conflictColumns = Array.isArray(columns) ? columns : [columns];
+        this.conflictColumns = columns === null ? [] : Array.isArray(columns) ? columns : [columns];
         this.conflictBuilder = new ConflictBuilder(this.tableName);
         if (callback) {
             callback(this.conflictBuilder);
@@ -209,12 +209,11 @@ export class InsertBuilder {
         return { values: processedValues, placeholders: placeholderTypes.join(', ') };
     }
     buildConflictClause() {
-        if (!this.conflictColumns || !this.conflictBuilder)
+        if (!this.conflictBuilder)
             return '';
-        if (this.insertData.length > 1) {
-            throw new RelqBuilderError('ON CONFLICT (upsert) is not supported with multiple row inserts', { builder: 'InsertBuilder', hint: 'Use single row insert for upsert operations' });
-        }
-        let clause = format(' ON CONFLICT (%I)', this.conflictColumns);
+        let clause = this.conflictColumns && this.conflictColumns.length > 0
+            ? format(' ON CONFLICT (%I)', this.conflictColumns)
+            : ' ON CONFLICT';
         if (this.conflictBuilder.action === 'update') {
             const updateSql = buildConflictUpdateSql(this.conflictBuilder.updateData, this.tableName);
             clause += ` DO UPDATE SET ${updateSql}`;

package/dist/index.d.ts

@@ -2997,7 +2997,7 @@ export declare class InsertBuilder {
 	 * @internal Handle ON CONFLICT - used by ConnectedInsertBuilder
 	 * Use .doNothing() or .doUpdate() for type-safe conflict handling
 	 */
-	_onConflict(columns: string | string[], callback?: (builder: ConflictBuilder) => void): InsertBuilder;
+	_onConflict(columns: string | string[] | null, callback?: (builder: ConflictBuilder) => void): InsertBuilder;
 	/**
 	 * RETURNING clause with simple column list
 	 *
@@ -8162,21 +8162,28 @@ declare class ConnectedInsertBuilder<TTable = any> {
 	 * | MySQL       | ⚠️        | Uses INSERT IGNORE (different semantics) |
 	 * | SQLite      | ✅        | Native ON CONFLICT support |
 	 *
-	 * @param columns - Column(s) for conflict detection (array or multiple args)
+	 * @param columns - Optional column(s) for conflict detection.
+	 *   Omit to match any constraint (`ON CONFLICT DO NOTHING`).
 	 *
 	 * @example
 	 * ```typescript
+	 * // Any constraint conflict
+	 * await db.table.users.insert({ email: 'test@example.com' })
+	 *   .doNothing()
+	 *   .run()
+	 *
 	 * // Single column conflict
 	 * await db.table.users.insert({ email: 'test@example.com' })
 	 *   .doNothing('email')
-	 *   .execute()
+	 *   .run()
 	 *
 	 * // Multiple columns (composite unique constraint)
 	 * await db.table.userRoles.insert({ userId, roleId })
 	 *   .doNothing('userId', 'roleId')
-	 *   .execute()
+	 *   .run()
 	 * ```
 	 */
+	doNothing(): this;
 	doNothing(columns: ColumnName<TTable>[]): this;
 	doNothing(...columns: ColumnName<TTable>[]): this;
 	/**
@@ -8470,12 +8477,26 @@ declare class ConnectedQueryBuilder<TSchema = any, TTable = any> {
 			$inferInsert: infer I;
 		} ? I : Record<string, any>>;
 	}): Promise<T>;
-	/** Insert multiple records at once */
-	insertMany<T = TTable extends {
-		$inferSelect: infer S;
-	} ? S : any>(rows: Array<TTable extends {
+	/**
+	 * Insert multiple records at once.
+	 * Returns a ConnectedInsertBuilder so you can chain
+	 * `.doNothing()`, `.doUpdate()`, `.returning()`, and `.run()`.
+	 *
+	 * @example
+	 * ```typescript
+	 * // Standard insert (returns row count)
+	 * await db.table.users.insertMany([...]).run()
+	 *
+	 * // With conflict resolution
+	 * await db.table.users.insertMany([...]).doNothing('email').run()
+	 *
+	 * // With RETURNING
+	 * const users = await db.table.users.insertMany([...]).returning('*').run()
+	 * ```
+	 */
+	insertMany(rows: Array<TTable extends {
 		$inferInsert: infer I;
-	} ? I : Record<string, any>>): Promise<T[]>;
+	} ? I : Record<string, any>>): Omit<ConnectedInsertBuilder<TTable>, "addRow" | "addRows" | "clear" | "total">;
 	/**
 	 * INSERT INTO ... SELECT — insert rows from a SELECT query.
 	 * The callback receives all schema tables so you can build

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "relq",
-  "version": "1.0.100",
+  "version": "1.0.102",
   "description": "The Fully-Typed PostgreSQL ORM for TypeScript",
   "author": "Olajide Mathew O. <olajide.mathew@yuniq.solutions>",
   "license": "MIT",