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

Feat: optional where clause in relations #1451

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

Feat: optional where clause in relations #1451

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d535e0b
Merge pull request #1677 from drizzle-team/beta
AndriiSherman Dec 25, 2023
9bee399
[All] Added types to the relations
Angelelz Oct 29, 2023
3c61f2a
[Mysql] initial implementation
Angelelz Oct 29, 2023
6b202cd
[MySql] fix where query for relational query
Angelelz Oct 30, 2023
63a04d6
[MySql] added integration tests and fixed data issues with tests. Nee…
Angelelz Oct 30, 2023
b760735
[All] fixed types when where is added to a one relation
Angelelz Nov 1, 2023
975d025
[MySql] Added find one integration tests
Angelelz Nov 1, 2023
42a9527
[Pg] Added implementention in Dialect
Angelelz Nov 1, 2023
96400c5
[Pg] Added type tests and integration tests
Angelelz Nov 1, 2023
92bd784
[SQLite] Added implementation in dialect
Angelelz Nov 1, 2023
cfa1c1d
[SQLite] Added type tests and integration tests
Angelelz Nov 1, 2023
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
Prev Previous commit
Next Next commit
[Mysql] initial implementation
  • Loading branch information
@Angelelz
Angelelz committed Dec 27, 2023
commit 3c61f2a65b0ea3416d4f2756c190d237acb1e195
54 changes: 44 additions & 10 deletions drizzle-orm/src/mysql-core/dialect.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,17 +603,33 @@ export class MySqlDialect {
)
),
);
let queryConfig = is(relation, One)
? (selectedRelationConfigValue === true
? { limit: 1 }
: { ...selectedRelationConfigValue, limit: 1 })
: selectedRelationConfigValue;
if (relation.getConfig()?.where) {
queryConfig = queryConfig === true
? { where: relation.getConfig()?.where }
: {
...queryConfig,
where: and(
sql`${
typeof queryConfig.where === 'function'
? queryConfig.where(aliasedColumns, getOperators())
: queryConfig.where
}`,
relation.getConfig()?.where,
),
};
}
const builtRelation = this.buildRelationalQuery({
fullSchema,
schema,
tableNamesMap,
table: fullSchema[relationTableTsName] as MySqlTable,
tableConfig: schema[relationTableTsName]!,
queryConfig: is(relation, One)
? (selectedRelationConfigValue === true
? { limit: 1 }
: { ...selectedRelationConfigValue, limit: 1 })
: selectedRelationConfigValue,
queryConfig,
tableAlias: relationTableAlias,
joinOn,
nestedQueryRelation: relation,
Expand Down Expand Up @@ -900,17 +916,35 @@ export class MySqlDialect {
)
),
);
let queryConfig = is(relation, One)
? (selectedRelationConfigValue === true
? { limit: 1 }
: { ...selectedRelationConfigValue, limit: 1 })
: selectedRelationConfigValue;
if (relation.getConfig()?.where) {
queryConfig = queryConfig === true
? { where: relation.getConfig()?.where }
: {
...queryConfig,
where: queryConfig.where
? and(
sql`${
typeof queryConfig.where === 'function'
? queryConfig.where(aliasedColumns, getOperators())
: queryConfig.where
}`,
relation.getConfig()?.where,
)
: relation.getConfig()?.where,
};
}
const builtRelation = this.buildRelationalQueryWithoutLateralSubqueries({
fullSchema,
schema,
tableNamesMap,
table: fullSchema[relationTableTsName] as MySqlTable,
tableConfig: schema[relationTableTsName]!,
queryConfig: is(relation, One)
? (selectedRelationConfigValue === true
? { limit: 1 }
: { ...selectedRelationConfigValue, limit: 1 })
: selectedRelationConfigValue,
queryConfig,
tableAlias: relationTableAlias,
joinOn,
nestedQueryRelation: relation,
Expand Down
10 changes: 10 additions & 0 deletions drizzle-orm/src/relations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ export abstract class Relation<TTableName extends string = string> {
}

abstract withFieldName(fieldName: string): Relation<TTableName>;

abstract getConfig(): RelationConfigBase | undefined;
}

export class Relations<
Expand Down Expand Up @@ -95,6 +97,10 @@ export class One<
relation.fieldName = fieldName;
return relation;
}

getConfig() {
return this.config;
}
}

export class Many<TTableName extends string> extends Relation<TTableName> {
Expand All @@ -119,6 +125,10 @@ export class Many<TTableName extends string> extends Relation<TTableName> {
relation.fieldName = fieldName;
return relation;
}

getConfig() {
return this.config;
}
}

export type TableRelationsKeysOnly<
Expand Down