Fix wrong resolved conflicts

drizzle-team · Nov 21, 2024 · 375ed28 · 375ed28
1 parent a2d734c
commit 375ed28
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/drizzle-orm/src/pg-core/query-builders/insert.ts b/drizzle-orm/src/pg-core/query-builders/insert.ts
@@ -70,9 +70,16 @@ export class PgInsertBuilder<
 		return this;
 	}
 
-	values(value: PgInsertValue<TTable>): PgInsertBase<TTable, TQueryResult>;
-	values(values: PgInsertValue<TTable>[]): PgInsertBase<TTable, TQueryResult>;
-	values(values: PgInsertValue<TTable> | PgInsertValue<TTable>[]): PgInsertBase<TTable, TQueryResult> {
+	overridingSystemValue(): Omit<PgInsertBuilder<TTable, TQueryResult, true>, 'overridingSystemValue'> {
+		this.overridingSystemValue_ = true;
+		return this as any;
+	}
+
+	values(value: PgInsertValue<TTable, OverrideT>): PgInsertBase<TTable, TQueryResult>;
+	values(values: PgInsertValue<TTable, OverrideT>[]): PgInsertBase<TTable, TQueryResult>;
+	values(
+		values: PgInsertValue<TTable, OverrideT> | PgInsertValue<TTable, OverrideT>[],
+	): PgInsertBase<TTable, TQueryResult> {
 		values = Array.isArray(values) ? values : [values];
 		if (values.length === 0) {
 			throw new Error('values() must be called with at least one value');