Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support update ... from (Pg | SQLite) #2963

Open
wants to merge 8 commits into
base: beta
Choose a base branch
from
Open

Support update ... from (Pg | SQLite) #2963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
77d4072
Implement `update ... from` in PG
L-Mario564 Aug 23, 2024
da7c87a
Merge remote-tracking branch 'upstream/beta' into update-from
L-Mario564 Sep 13, 2024
653d415
Add `update ... from` in SQLite
L-Mario564 Sep 13, 2024
5fd6ebf
Lint and format
L-Mario564 Sep 13, 2024
87fb5d6
Merge remote-tracking branch 'upstream/beta' into update-from
L-Mario564 Sep 16, 2024
8399bca
Fix type error
L-Mario564 Sep 16, 2024
0b8dd6b
Fix SQLite type errors
L-Mario564 Sep 16, 2024
ead4f3a
Lint and format
L-Mario564 Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
134 changes: 78 additions & 56 deletions drizzle-orm/src/pg-core/dialect.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,18 +157,30 @@ export class PgDialect {
}));
}

buildUpdateQuery({ table, set, where, returning, withList }: PgUpdateConfig): SQL {
buildUpdateQuery({ table, set, where, returning, withList, from, joins }: PgUpdateConfig): SQL {
const withSql = this.buildWithCTE(withList);

const tableName = table[PgTable.Symbol.Name];
const tableSchema = table[PgTable.Symbol.Schema];
const origTableName = table[PgTable.Symbol.OriginalName];
const alias = tableName === origTableName ? undefined : tableName;
const tableSql = sql`${tableSchema ? sql`${sql.identifier(tableSchema)}.` : undefined}${
sql.identifier(origTableName)
}${alias && sql` ${sql.identifier(alias)}`}`;

const setSql = this.buildUpdateSet(table, set);

const fromSql = from && sql.join([sql.raw(' from '), this.buildFromTable(from)]);

const joinsSql = this.buildJoins(joins);

const returningSql = returning
? sql` returning ${this.buildSelection(returning, { isSingleTable: true })}`
? sql` returning ${this.buildSelection(returning, { isSingleTable: !from })}`
: undefined;

const whereSql = where ? sql` where ${where}` : undefined;

return sql`${withSql}update ${table} set ${setSql}${whereSql}${returningSql}`;
return sql`${withSql}update ${tableSql} set ${setSql}${fromSql}${joinsSql}${whereSql}${returningSql}`;
}

/**
Expand Down Expand Up @@ -233,6 +245,67 @@ export class PgDialect {
return sql.join(chunks);
}

private buildJoins(joins: PgSelectJoinConfig[] | undefined): SQL | undefined {
if (!joins || joins.length === 0) {
return undefined;
}

const joinsArray: SQL[] = [];

for (const [index, joinMeta] of joins.entries()) {
if (index === 0) {
joinsArray.push(sql` `);
}
const table = joinMeta.table;
const lateralSql = joinMeta.lateral ? sql` lateral` : undefined;

if (is(table, PgTable)) {
const tableName = table[PgTable.Symbol.Name];
const tableSchema = table[PgTable.Symbol.Schema];
const origTableName = table[PgTable.Symbol.OriginalName];
const alias = tableName === origTableName ? undefined : joinMeta.alias;
joinsArray.push(
sql`${sql.raw(joinMeta.joinType)} join${lateralSql} ${
tableSchema ? sql`${sql.identifier(tableSchema)}.` : undefined
}${sql.identifier(origTableName)}${alias && sql` ${sql.identifier(alias)}`} on ${joinMeta.on}`,
);
} else if (is(table, View)) {
const viewName = table[ViewBaseConfig].name;
const viewSchema = table[ViewBaseConfig].schema;
const origViewName = table[ViewBaseConfig].originalName;
const alias = viewName === origViewName ? undefined : joinMeta.alias;
joinsArray.push(
sql`${sql.raw(joinMeta.joinType)} join${lateralSql} ${
viewSchema ? sql`${sql.identifier(viewSchema)}.` : undefined
}${sql.identifier(origViewName)}${alias && sql` ${sql.identifier(alias)}`} on ${joinMeta.on}`,
);
} else {
joinsArray.push(
sql`${sql.raw(joinMeta.joinType)} join${lateralSql} ${table} on ${joinMeta.on}`,
);
}
if (index < joins.length - 1) {
joinsArray.push(sql` `);
}
}

return sql.join(joinsArray);
}

private buildFromTable(
table: SQL | Subquery | PgViewBase | PgTable | undefined,
): SQL | Subquery | PgViewBase | PgTable | undefined {
if (is(table, Table) && table[Table.Symbol.OriginalName] !== table[Table.Symbol.Name]) {
let fullName = sql`${sql.identifier(table[Table.Symbol.OriginalName])}`;
if (table[Table.Symbol.Schema]) {
fullName = sql`${sql.identifier(table[Table.Symbol.Schema]!)}.${fullName}`;
}
return sql`${fullName} ${sql.identifier(table[Table.Symbol.Name])}`;
}

return table;
}

buildSelectQuery(
{
withList,
Expand Down Expand Up @@ -288,60 +361,9 @@ export class PgDialect {

const selection = this.buildSelection(fieldsList, { isSingleTable });

const tableSql = (() => {
if (is(table, Table) && table[Table.Symbol.OriginalName] !== table[Table.Symbol.Name]) {
let fullName = sql`${sql.identifier(table[Table.Symbol.OriginalName])}`;
if (table[Table.Symbol.Schema]) {
fullName = sql`${sql.identifier(table[Table.Symbol.Schema]!)}.${fullName}`;
}
return sql`${fullName} ${sql.identifier(table[Table.Symbol.Name])}`;
}

return table;
})();

const joinsArray: SQL[] = [];

if (joins) {
for (const [index, joinMeta] of joins.entries()) {
if (index === 0) {
joinsArray.push(sql` `);
}
const table = joinMeta.table;
const lateralSql = joinMeta.lateral ? sql` lateral` : undefined;

if (is(table, PgTable)) {
const tableName = table[PgTable.Symbol.Name];
const tableSchema = table[PgTable.Symbol.Schema];
const origTableName = table[PgTable.Symbol.OriginalName];
const alias = tableName === origTableName ? undefined : joinMeta.alias;
joinsArray.push(
sql`${sql.raw(joinMeta.joinType)} join${lateralSql} ${
tableSchema ? sql`${sql.identifier(tableSchema)}.` : undefined
}${sql.identifier(origTableName)}${alias && sql` ${sql.identifier(alias)}`} on ${joinMeta.on}`,
);
} else if (is(table, View)) {
const viewName = table[ViewBaseConfig].name;
const viewSchema = table[ViewBaseConfig].schema;
const origViewName = table[ViewBaseConfig].originalName;
const alias = viewName === origViewName ? undefined : joinMeta.alias;
joinsArray.push(
sql`${sql.raw(joinMeta.joinType)} join${lateralSql} ${
viewSchema ? sql`${sql.identifier(viewSchema)}.` : undefined
}${sql.identifier(origViewName)}${alias && sql` ${sql.identifier(alias)}`} on ${joinMeta.on}`,
);
} else {
joinsArray.push(
sql`${sql.raw(joinMeta.joinType)} join${lateralSql} ${table} on ${joinMeta.on}`,
);
}
if (index < joins.length - 1) {
joinsArray.push(sql` `);
}
}
}
const tableSql = this.buildFromTable(table);

const joinsSql = sql.join(joinsArray);
const joinsSql = this.buildJoins(joins);

const whereSql = where ? sql` where ${where}` : undefined;

Expand Down
4 changes: 2 additions & 2 deletions drizzle-orm/src/pg-core/query-builders/select.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ import type {
LockConfig,
LockStrength,
PgCreateSetOperatorFn,
PgJoinFn,
PgSelectConfig,
PgSelectDynamic,
PgSelectHKT,
PgSelectHKTBase,
PgSelectJoinFn,
PgSelectPrepare,
PgSelectWithout,
PgSetOperatorExcludedMethods,
Expand Down Expand Up @@ -194,7 +194,7 @@ export abstract class PgSelectQueryBuilderBase<

private createJoin<TJoinType extends JoinType>(
joinType: TJoinType,
): PgJoinFn<this, TDynamic, TJoinType> {
): PgSelectJoinFn<this, TDynamic, TJoinType> {
return (
table: PgTable | Subquery | PgViewBase | SQL,
on: ((aliases: TSelection) => SQL | undefined) | SQL | undefined,
Expand Down
6 changes: 3 additions & 3 deletions drizzle-orm/src/pg-core/query-builders/select.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export interface PgSelectConfig {
}[];
}

export type PgJoin<
export type PgSelectJoin<
T extends AnyPgSelectQueryBuilder,
TDynamic extends boolean,
TJoinType extends JoinType,
Expand Down Expand Up @@ -108,7 +108,7 @@ export type PgJoin<
>
: never;

export type PgJoinFn<
export type PgSelectJoinFn<
T extends AnyPgSelectQueryBuilder,
TDynamic extends boolean,
TJoinType extends JoinType,
Expand All @@ -118,7 +118,7 @@ export type PgJoinFn<
>(
table: TJoinedTable,
on: ((aliases: T['_']['selection']) => SQL | undefined) | SQL | undefined,
) => PgJoin<T, TDynamic, TJoinType, TJoinedTable, TJoinedName>;
) => PgSelectJoin<T, TDynamic, TJoinType, TJoinedTable, TJoinedName>;

export type SelectedFieldsFlat = SelectedFieldsFlatBase<PgColumn>;

Expand Down
Loading