@casekit/orm 0.0.1-alpha.2 → 0.0.1-alpha.21
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/migrate/commands/implode.js +1 -1
- package/lib/migrate/commands/implode.js.map +1 -1
- package/lib/migrate/sql/createTableSql.test.js +1 -0
- package/lib/migrate/sql/createTableSql.test.js.map +1 -1
- package/lib/orm.d.ts +2 -2
- package/lib/orm.d.ts.map +1 -1
- package/lib/orm.js +8 -0
- package/lib/orm.js.map +1 -1
- package/lib/queries/clauses/IncludeClause.d.ts +3 -3
- package/lib/queries/clauses/IncludeClause.d.ts.map +1 -1
- package/lib/queries/clauses/ReturningClause.d.ts +2 -3
- package/lib/queries/clauses/ReturningClause.d.ts.map +1 -1
- package/lib/queries/clauses/SelectClause.d.ts +2 -3
- package/lib/queries/clauses/SelectClause.d.ts.map +1 -1
- package/lib/queries/clauses/WhereClause.d.ts +1 -1
- package/lib/queries/clauses/WhereClause.d.ts.map +1 -1
- package/lib/queries/clauses/helpers/OptionalColumn.d.ts +5 -5
- package/lib/queries/clauses/helpers/OptionalColumn.d.ts.map +1 -1
- package/lib/queries/clauses/helpers/OptionalParams.d.ts +2 -2
- package/lib/queries/clauses/helpers/OptionalParams.d.ts.map +1 -1
- package/lib/queries/clauses/helpers/RequiredColumn.d.ts +2 -3
- package/lib/queries/clauses/helpers/RequiredColumn.d.ts.map +1 -1
- package/lib/queries/clauses/helpers/RequiredParams.d.ts +2 -2
- package/lib/queries/clauses/helpers/RequiredParams.d.ts.map +1 -1
- package/lib/queries/clauses/where/buildWhereClause.js +1 -1
- package/lib/queries/clauses/where/buildWhereClause.js.map +1 -1
- package/lib/queries/clauses/where/buildWhereClauses.d.ts +1 -1
- package/lib/queries/clauses/where/buildWhereClauses.d.ts.map +1 -1
- package/lib/queries/clauses/where/buildWhereClauses.js.map +1 -1
- package/lib/queries/clauses/where/buildWhereClauses.test.js +1 -1
- package/lib/queries/clauses/where/buildWhereClauses.test.js.map +1 -1
- package/lib/queries/clauses/where/types/WhereClauseValue.d.ts +1 -1
- package/lib/queries/clauses/where/types/WhereClauseValue.d.ts.map +1 -1
- package/lib/queries/count/buildCount.d.ts.map +1 -1
- package/lib/queries/count/buildCount.js +33 -29
- package/lib/queries/count/buildCount.js.map +1 -1
- package/lib/queries/count/countToSql.d.ts.map +1 -1
- package/lib/queries/count/countToSql.js +12 -17
- package/lib/queries/count/countToSql.js.map +1 -1
- package/lib/queries/count/types/CountBuilder.d.ts +12 -4
- package/lib/queries/count/types/CountBuilder.d.ts.map +1 -1
- package/lib/queries/count.d.ts.map +1 -1
- package/lib/queries/count.js +3 -1
- package/lib/queries/count.js.map +1 -1
- package/lib/queries/create/buildCreate.d.ts +4 -1
- package/lib/queries/create/buildCreate.d.ts.map +1 -1
- package/lib/queries/create/buildCreate.js +5 -2
- package/lib/queries/create/buildCreate.js.map +1 -1
- package/lib/queries/create/createResultSchema.d.ts.map +1 -1
- package/lib/queries/create/createResultSchema.js +3 -1
- package/lib/queries/create/createResultSchema.js.map +1 -1
- package/lib/queries/create/createToSql.d.ts.map +1 -1
- package/lib/queries/create/createToSql.js +5 -2
- package/lib/queries/create/createToSql.js.map +1 -1
- package/lib/queries/create/tests/createMany.varied-keys.test.d.ts +2 -0
- package/lib/queries/create/tests/createMany.varied-keys.test.d.ts.map +1 -0
- package/lib/queries/create/tests/createMany.varied-keys.test.js +24 -0
- package/lib/queries/create/tests/createMany.varied-keys.test.js.map +1 -0
- package/lib/queries/create/tests/createOne.test.js +53 -0
- package/lib/queries/create/tests/createOne.test.js.map +1 -1
- package/lib/queries/create/types/BaseCreateManyParams.d.ts +3 -0
- package/lib/queries/create/types/BaseCreateManyParams.d.ts.map +1 -1
- package/lib/queries/create/types/BaseCreateOneParams.d.ts +3 -0
- package/lib/queries/create/types/BaseCreateOneParams.d.ts.map +1 -1
- package/lib/queries/create/types/CreateManyParams.d.ts +4 -1
- package/lib/queries/create/types/CreateManyParams.d.ts.map +1 -1
- package/lib/queries/create/types/CreateManyResult.d.ts +1 -1
- package/lib/queries/create/types/CreateManyResult.d.ts.map +1 -1
- package/lib/queries/create/types/CreateOneParams.d.ts +4 -1
- package/lib/queries/create/types/CreateOneParams.d.ts.map +1 -1
- package/lib/queries/create/types/CreateOneResult.d.ts +1 -1
- package/lib/queries/create/types/CreateOneResult.d.ts.map +1 -1
- package/lib/queries/createMany.d.ts.map +1 -1
- package/lib/queries/createMany.js +3 -1
- package/lib/queries/createMany.js.map +1 -1
- package/lib/queries/createOne.d.ts.map +1 -1
- package/lib/queries/createOne.js +6 -0
- package/lib/queries/createOne.js.map +1 -1
- package/lib/queries/delete/buildDelete.d.ts +1 -1
- package/lib/queries/delete/buildDelete.d.ts.map +1 -1
- package/lib/queries/delete/buildDelete.js +1 -1
- package/lib/queries/delete/buildDelete.js.map +1 -1
- package/lib/queries/delete/deleteResultSchema.d.ts.map +1 -1
- package/lib/queries/delete/deleteResultSchema.js +3 -1
- package/lib/queries/delete/deleteResultSchema.js.map +1 -1
- package/lib/queries/delete/deleteToSql.js +1 -1
- package/lib/queries/delete/deleteToSql.js.map +1 -1
- package/lib/queries/delete/types/DeleteManyResult.d.ts +1 -1
- package/lib/queries/delete/types/DeleteManyResult.d.ts.map +1 -1
- package/lib/queries/delete/types/DeleteOneResult.d.ts +1 -1
- package/lib/queries/delete/types/DeleteOneResult.d.ts.map +1 -1
- package/lib/queries/delete/types/DeleteParams.d.ts +1 -1
- package/lib/queries/delete/types/DeleteParams.d.ts.map +1 -1
- package/lib/queries/deleteMany.d.ts.map +1 -1
- package/lib/queries/deleteMany.js +3 -1
- package/lib/queries/deleteMany.js.map +1 -1
- package/lib/queries/find/buildFind.d.ts.map +1 -1
- package/lib/queries/find/buildFind.js +39 -31
- package/lib/queries/find/buildFind.js.map +1 -1
- package/lib/queries/find/findResultSchema.d.ts.map +1 -1
- package/lib/queries/find/findResultSchema.js +9 -2
- package/lib/queries/find/findResultSchema.js.map +1 -1
- package/lib/queries/find/findToSql.d.ts.map +1 -1
- package/lib/queries/find/findToSql.js +15 -17
- package/lib/queries/find/findToSql.js.map +1 -1
- package/lib/queries/find/getIncludedManyToManyRelations.d.ts +17 -0
- package/lib/queries/find/getIncludedManyToManyRelations.d.ts.map +1 -0
- package/lib/queries/find/getIncludedManyToManyRelations.js +20 -0
- package/lib/queries/find/getIncludedManyToManyRelations.js.map +1 -0
- package/lib/queries/find/getIncludedOneToManyRelations.d.ts +12 -0
- package/lib/queries/find/getIncludedOneToManyRelations.d.ts.map +1 -0
- package/lib/queries/find/getIncludedOneToManyRelations.js +20 -0
- package/lib/queries/find/getIncludedOneToManyRelations.js.map +1 -0
- package/lib/queries/find/tests/findMany.include.test.d.ts +2 -0
- package/lib/queries/find/tests/findMany.include.test.d.ts.map +1 -0
- package/lib/queries/find/tests/findMany.include.test.js +93 -0
- package/lib/queries/find/tests/findMany.include.test.js.map +1 -0
- package/lib/queries/find/tests/findMany.lateral.test.d.ts +2 -0
- package/lib/queries/find/tests/findMany.lateral.test.d.ts.map +1 -0
- package/lib/queries/find/tests/findMany.lateral.test.js +86 -0
- package/lib/queries/find/tests/findMany.lateral.test.js.map +1 -0
- package/lib/queries/find/tests/findMany.nullable-relations.test.d.ts +2 -0
- package/lib/queries/find/tests/findMany.nullable-relations.test.d.ts.map +1 -0
- package/lib/queries/find/tests/findMany.nullable-relations.test.js +118 -0
- package/lib/queries/find/tests/findMany.nullable-relations.test.js.map +1 -0
- package/lib/queries/find/tests/middleware.find.where.test.js +12 -12
- package/lib/queries/find/tests/middleware.find.where.test.js.map +1 -1
- package/lib/queries/find/types/BaseFindParams.d.ts +2 -1
- package/lib/queries/find/types/BaseFindParams.d.ts.map +1 -1
- package/lib/queries/find/types/FindBuilder.d.ts +13 -4
- package/lib/queries/find/types/FindBuilder.d.ts.map +1 -1
- package/lib/queries/find/types/FindManyParams.d.ts +3 -2
- package/lib/queries/find/types/FindManyParams.d.ts.map +1 -1
- package/lib/queries/find/types/FindManyResult.d.ts +2 -1
- package/lib/queries/find/types/FindManyResult.d.ts.map +1 -1
- package/lib/queries/find/types/FindOneParams.d.ts +2 -1
- package/lib/queries/find/types/FindOneParams.d.ts.map +1 -1
- package/lib/queries/find/types/FindOneResult.d.ts +6 -0
- package/lib/queries/find/types/FindOneResult.d.ts.map +1 -1
- package/lib/queries/findMany.d.ts.map +1 -1
- package/lib/queries/findMany.js +71 -36
- package/lib/queries/findMany.js.map +1 -1
- package/lib/queries/middleware/Middleware.d.ts +1 -1
- package/lib/queries/middleware/Middleware.d.ts.map +1 -1
- package/lib/queries/update/buildUpdate.d.ts +2 -2
- package/lib/queries/update/buildUpdate.d.ts.map +1 -1
- package/lib/queries/update/buildUpdate.js +8 -8
- package/lib/queries/update/buildUpdate.js.map +1 -1
- package/lib/queries/update/tests/updateOne.test.js +3 -3
- package/lib/queries/update/tests/updateOne.test.js.map +1 -1
- package/lib/queries/update/types/BaseUpdateParams.d.ts +1 -1
- package/lib/queries/update/types/BaseUpdateParams.d.ts.map +1 -1
- package/lib/queries/update/types/UpdateManyResult.d.ts +1 -1
- package/lib/queries/update/types/UpdateManyResult.d.ts.map +1 -1
- package/lib/queries/update/types/UpdateOneResult.d.ts +1 -1
- package/lib/queries/update/types/UpdateOneResult.d.ts.map +1 -1
- package/lib/queries/update/types/UpdateParams.d.ts +2 -2
- package/lib/queries/update/types/UpdateParams.d.ts.map +1 -1
- package/lib/queries/update/types/UpdateValues.d.ts +1 -1
- package/lib/queries/update/types/UpdateValues.d.ts.map +1 -1
- package/lib/queries/update/updateResultSchema.d.ts.map +1 -1
- package/lib/queries/update/updateResultSchema.js +3 -1
- package/lib/queries/update/updateResultSchema.js.map +1 -1
- package/lib/queries/update/updateToSql.js +3 -3
- package/lib/queries/update/updateToSql.js.map +1 -1
- package/lib/queries/updateMany.d.ts.map +1 -1
- package/lib/queries/updateMany.js +3 -1
- package/lib/queries/updateMany.js.map +1 -1
- package/lib/queries/util/rowToObject.d.ts.map +1 -1
- package/lib/queries/util/rowToObject.js +1 -1
- package/lib/queries/util/rowToObject.js.map +1 -1
- package/lib/schema/populate/composeMiddleware.js +1 -1
- package/lib/schema/populate/composeMiddleware.js.map +1 -1
- package/lib/schema/populate/populateModel.d.ts.map +1 -1
- package/lib/schema/populate/populateModel.js +1 -0
- package/lib/schema/populate/populateModel.js.map +1 -1
- package/lib/schema/types/base/BaseColumn.d.ts +1 -0
- package/lib/schema/types/base/BaseColumn.d.ts.map +1 -1
- package/lib/schema/types/base/BaseRelation.d.ts +1 -0
- package/lib/schema/types/base/BaseRelation.d.ts.map +1 -1
- package/lib/schema/types/helpers/ColumnName.d.ts +2 -3
- package/lib/schema/types/helpers/ColumnName.d.ts.map +1 -1
- package/lib/schema/types/helpers/ColumnType.d.ts +2 -2
- package/lib/schema/types/helpers/ColumnType.d.ts.map +1 -1
- package/lib/schema/types/helpers/Columns.d.ts +2 -3
- package/lib/schema/types/helpers/Columns.d.ts.map +1 -1
- package/lib/schema/types/helpers/HasDefault.d.ts +2 -3
- package/lib/schema/types/helpers/HasDefault.d.ts.map +1 -1
- package/lib/schema/types/helpers/IsNullable.d.ts +2 -3
- package/lib/schema/types/helpers/IsNullable.d.ts.map +1 -1
- package/lib/schema/types/helpers/IsProvided.d.ts +5 -0
- package/lib/schema/types/helpers/IsProvided.d.ts.map +1 -0
- package/lib/schema/types/helpers/IsProvided.js +2 -0
- package/lib/schema/types/helpers/IsProvided.js.map +1 -0
- package/lib/schema/types/helpers/IsSerial.d.ts +2 -3
- package/lib/schema/types/helpers/IsSerial.d.ts.map +1 -1
- package/lib/schema/types/loose/LooseColumnDefinition.d.ts +5 -0
- package/lib/schema/types/loose/LooseColumnDefinition.d.ts.map +1 -1
- package/lib/schema/types/loose/LooseRelationDefinition.d.ts +1 -0
- package/lib/schema/types/loose/LooseRelationDefinition.d.ts.map +1 -1
- package/lib/schema/types/relations/ManyToManyRelation.d.ts +2 -2
- package/lib/schema/types/relations/ManyToManyRelation.d.ts.map +1 -1
- package/lib/schema/types/relations/ManyToOneRelation.d.ts +1 -1
- package/lib/schema/types/relations/ManyToOneRelation.d.ts.map +1 -1
- package/lib/schema/types/relations/OneToManyRelation.d.ts +2 -1
- package/lib/schema/types/relations/OneToManyRelation.d.ts.map +1 -1
- package/lib/schema/types/strict/ColumnDefinition.d.ts +5 -0
- package/lib/schema/types/strict/ColumnDefinition.d.ts.map +1 -1
- package/lib/test/db/index.d.ts +40 -0
- package/lib/test/db/index.d.ts.map +1 -1
- package/lib/test/db/models/post.model.d.ts +9 -0
- package/lib/test/db/models/post.model.d.ts.map +1 -1
- package/lib/test/db/models/post.model.js +6 -0
- package/lib/test/db/models/post.model.js.map +1 -1
- package/lib/test/db/models/post.relations.d.ts +6 -0
- package/lib/test/db/models/post.relations.d.ts.map +1 -1
- package/lib/test/db/models/post.relations.js +6 -0
- package/lib/test/db/models/post.relations.js.map +1 -1
- package/lib/test/db/models/user.model.d.ts +9 -0
- package/lib/test/db/models/user.model.d.ts.map +1 -1
- package/lib/test/db/models/user.model.js +6 -0
- package/lib/test/db/models/user.model.js.map +1 -1
- package/lib/test/db/models/user.relations.d.ts +16 -0
- package/lib/test/db/models/user.relations.d.ts.map +1 -1
- package/lib/test/db/models/user.relations.js +16 -0
- package/lib/test/db/models/user.relations.js.map +1 -1
- package/lib/test/db/models.d.ts +18 -0
- package/lib/test/db/models.d.ts.map +1 -1
- package/lib/test/db/relations.d.ts +22 -0
- package/lib/test/db/relations.d.ts.map +1 -1
- package/lib/test/gen/column.d.ts +1 -0
- package/lib/test/gen/column.d.ts.map +1 -1
- package/lib/test/seed/index.d.ts +40 -0
- package/lib/test/seed/index.d.ts.map +1 -1
- package/lib/types/ModelType.d.ts +10 -3
- package/lib/types/ModelType.d.ts.map +1 -1
- package/package.json +11 -4
- package/src/migrate/commands/implode.ts +1 -1
- package/src/migrate/sql/createTableSql.test.ts +1 -0
- package/src/orm.ts +10 -2
- package/src/queries/clauses/IncludeClause.ts +19 -3
- package/src/queries/clauses/ReturningClause.ts +4 -6
- package/src/queries/clauses/SelectClause.ts +4 -6
- package/src/queries/clauses/WhereClause.ts +1 -1
- package/src/queries/clauses/helpers/OptionalColumn.ts +10 -11
- package/src/queries/clauses/helpers/OptionalParams.ts +2 -2
- package/src/queries/clauses/helpers/RequiredColumn.ts +5 -6
- package/src/queries/clauses/helpers/RequiredParams.ts +2 -2
- package/src/queries/clauses/where/buildWhereClause.ts +1 -1
- package/src/queries/clauses/where/buildWhereClauses.test.ts +1 -1
- package/src/queries/clauses/where/buildWhereClauses.ts +1 -1
- package/src/queries/clauses/where/types/WhereClauseValue.ts +1 -1
- package/src/queries/count/buildCount.ts +39 -33
- package/src/queries/count/countToSql.ts +27 -32
- package/src/queries/count/types/CountBuilder.ts +23 -6
- package/src/queries/count.ts +3 -1
- package/src/queries/create/buildCreate.ts +8 -3
- package/src/queries/create/createResultSchema.ts +3 -1
- package/src/queries/create/createToSql.ts +10 -2
- package/src/queries/create/tests/createMany.varied-keys.test.ts +28 -0
- package/src/queries/create/tests/createOne.test.ts +70 -0
- package/src/queries/create/types/BaseCreateManyParams.ts +1 -0
- package/src/queries/create/types/BaseCreateOneParams.ts +1 -0
- package/src/queries/create/types/CreateManyParams.ts +4 -1
- package/src/queries/create/types/CreateManyResult.ts +1 -1
- package/src/queries/create/types/CreateOneParams.ts +4 -1
- package/src/queries/create/types/CreateOneResult.ts +1 -1
- package/src/queries/createMany.ts +3 -1
- package/src/queries/createOne.ts +9 -0
- package/src/queries/delete/buildDelete.ts +2 -2
- package/src/queries/delete/deleteResultSchema.ts +3 -1
- package/src/queries/delete/deleteToSql.ts +1 -1
- package/src/queries/delete/types/DeleteManyResult.ts +1 -1
- package/src/queries/delete/types/DeleteOneResult.ts +1 -1
- package/src/queries/delete/types/DeleteParams.ts +1 -1
- package/src/queries/deleteMany.ts +3 -1
- package/src/queries/find/buildFind.ts +46 -35
- package/src/queries/find/findResultSchema.ts +9 -2
- package/src/queries/find/findToSql.ts +31 -32
- package/src/queries/find/getIncludedManyToManyRelations.ts +49 -0
- package/src/queries/find/getIncludedOneToManyRelations.ts +44 -0
- package/src/queries/find/tests/findMany.include.test.ts +107 -0
- package/src/queries/find/tests/findMany.lateral.test.ts +90 -0
- package/src/queries/find/tests/findMany.nullable-relations.test.ts +127 -0
- package/src/queries/find/tests/middleware.find.where.test.ts +12 -12
- package/src/queries/find/types/BaseFindParams.ts +2 -1
- package/src/queries/find/types/FindBuilder.ts +25 -6
- package/src/queries/find/types/FindManyParams.ts +3 -2
- package/src/queries/find/types/FindManyResult.ts +2 -1
- package/src/queries/find/types/FindOneParams.ts +2 -1
- package/src/queries/find/types/FindOneResult.ts +48 -13
- package/src/queries/findMany.ts +127 -67
- package/src/queries/middleware/Middleware.ts +1 -1
- package/src/queries/update/buildUpdate.ts +10 -10
- package/src/queries/update/tests/updateOne.test.ts +3 -3
- package/src/queries/update/types/BaseUpdateParams.ts +1 -1
- package/src/queries/update/types/UpdateManyResult.ts +1 -1
- package/src/queries/update/types/UpdateOneResult.ts +1 -1
- package/src/queries/update/types/UpdateParams.ts +2 -2
- package/src/queries/update/types/UpdateValues.ts +1 -1
- package/src/queries/update/updateResultSchema.ts +3 -1
- package/src/queries/update/updateToSql.ts +3 -3
- package/src/queries/updateMany.ts +3 -1
- package/src/queries/util/rowToObject.ts +5 -1
- package/src/schema/populate/composeMiddleware.ts +1 -1
- package/src/schema/populate/populateModel.ts +1 -0
- package/src/schema/types/base/BaseColumn.ts +1 -0
- package/src/schema/types/base/BaseRelation.ts +1 -0
- package/src/schema/types/helpers/ColumnName.ts +5 -6
- package/src/schema/types/helpers/ColumnType.ts +2 -2
- package/src/schema/types/helpers/Columns.ts +2 -6
- package/src/schema/types/helpers/HasDefault.ts +5 -7
- package/src/schema/types/helpers/IsNullable.ts +4 -6
- package/src/schema/types/helpers/IsProvided.ts +8 -0
- package/src/schema/types/helpers/IsSerial.ts +4 -6
- package/src/schema/types/loose/LooseColumnDefinition.ts +6 -0
- package/src/schema/types/loose/LooseRelationDefinition.ts +1 -1
- package/src/schema/types/relations/ManyToManyRelation.ts +2 -2
- package/src/schema/types/relations/ManyToOneRelation.ts +1 -1
- package/src/schema/types/relations/OneToManyRelation.ts +2 -1
- package/src/schema/types/strict/ColumnDefinition.ts +6 -0
- package/src/test/db/models/post.model.ts +6 -0
- package/src/test/db/models/post.relations.ts +6 -0
- package/src/test/db/models/user.model.ts +6 -0
- package/src/test/db/models/user.relations.ts +16 -0
- package/src/types/ModelType.ts +16 -3
- package/.env +0 -2
- package/.eslintrc.cjs +0 -69
- package/.github/actions/ci-setup/action.yml +0 -19
- package/.github/dependabot.yml +0 -12
- package/.github/workflows/ci.yml +0 -119
- package/.github/workflows/dependabot.yml +0 -26
- package/.github/workflows/semgrep.yml +0 -24
- package/.prettierrc.cjs +0 -11
- package/.vscode/tasks.json +0 -28
- package/codecov.yml +0 -7
- package/lib/queries/clauses/helpers/ModelValues.d.ts +0 -8
- package/lib/queries/clauses/helpers/ModelValues.d.ts.map +0 -1
- package/lib/queries/clauses/helpers/ModelValues.js +0 -2
- package/lib/queries/clauses/helpers/ModelValues.js.map +0 -1
- package/src/queries/clauses/helpers/ModelValues.ts +0 -9
- package/tsconfig.json +0 -18
- package/vitest.config.ts +0 -15
|
@@ -3,24 +3,32 @@ import { LooseModelDefinitions } from "../../../schema/types/loose/LooseModelDef
|
|
|
3
3
|
import { WhereClause } from "../../clauses/WhereClause";
|
|
4
4
|
export type CountBuilder = {
|
|
5
5
|
tableIndex: number;
|
|
6
|
-
|
|
7
|
-
|
|
6
|
+
table: {
|
|
7
|
+
table: string;
|
|
8
8
|
model: string;
|
|
9
9
|
schema: string;
|
|
10
10
|
alias: string;
|
|
11
|
-
joins
|
|
11
|
+
joins: Join[];
|
|
12
12
|
conditions?: WhereClause<LooseModelDefinitions, ModelName<LooseModelDefinitions>>;
|
|
13
13
|
where?: WhereClause<LooseModelDefinitions, ModelName<LooseModelDefinitions>>;
|
|
14
|
-
}
|
|
14
|
+
};
|
|
15
15
|
};
|
|
16
16
|
export type Join = {
|
|
17
17
|
from: {
|
|
18
|
+
schema: string;
|
|
18
19
|
table: string;
|
|
20
|
+
alias: string;
|
|
21
|
+
model: string;
|
|
19
22
|
columns: string[];
|
|
20
23
|
};
|
|
21
24
|
to: {
|
|
25
|
+
schema: string;
|
|
22
26
|
table: string;
|
|
27
|
+
alias: string;
|
|
28
|
+
model: string;
|
|
23
29
|
columns: string[];
|
|
24
30
|
};
|
|
31
|
+
where?: WhereClause<LooseModelDefinitions, ModelName<LooseModelDefinitions>>;
|
|
32
|
+
type?: "inner" | "left";
|
|
25
33
|
};
|
|
26
34
|
//# sourceMappingURL=CountBuilder.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CountBuilder.d.ts","sourceRoot":"","sources":["../../../../src/queries/count/types/CountBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,MAAM,MAAM,YAAY,GAAG;IACvB,UAAU,EAAE,MAAM,CAAC;IAEnB,
|
|
1
|
+
{"version":3,"file":"CountBuilder.d.ts","sourceRoot":"","sources":["../../../../src/queries/count/types/CountBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,MAAM,MAAM,YAAY,GAAG;IACvB,UAAU,EAAE,MAAM,CAAC;IAEnB,KAAK,EAAE;QACH,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,IAAI,EAAE,CAAC;QACd,UAAU,CAAC,EAAE,WAAW,CACpB,qBAAqB,EACrB,SAAS,CAAC,qBAAqB,CAAC,CACnC,CAAC;QACF,KAAK,CAAC,EAAE,WAAW,CACf,qBAAqB,EACrB,SAAS,CAAC,qBAAqB,CAAC,CACnC,CAAC;KACL,CAAC;CACL,CAAC;AAEF,MAAM,MAAM,IAAI,GAAG;IACf,IAAI,EAAE;QACF,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;IACF,EAAE,EAAE;QACA,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;IACF,KAAK,CAAC,EAAE,WAAW,CACf,qBAAqB,EACrB,SAAS,CAAC,qBAAqB,CAAC,CACnC,CAAC;IACF,IAAI,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;CAC3B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"count.d.ts","sourceRoot":"","sources":["../../src/queries/count.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAE5E,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,eAAO,MAAM,KAAK,SACR,UAAU,UACR,iBAAiB,KACtB,MAAM,SACF,eAAe,
|
|
1
|
+
{"version":3,"file":"count.d.ts","sourceRoot":"","sources":["../../src/queries/count.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAE5E,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,eAAO,MAAM,KAAK,SACR,UAAU,UACR,iBAAiB,KACtB,MAAM,SACF,eAAe,iBAoBzB,CAAC"}
|
package/lib/queries/count.js
CHANGED
|
@@ -9,8 +9,10 @@ export const count = async (conn, config, m, query) => {
|
|
|
9
9
|
sql: statement.text,
|
|
10
10
|
values: statement.values,
|
|
11
11
|
});
|
|
12
|
-
if (process.env.
|
|
12
|
+
if (process.env.ORM_VERBOSE_LOGGING) {
|
|
13
13
|
console.log(statement.text);
|
|
14
|
+
console.log(statement.values);
|
|
15
|
+
}
|
|
14
16
|
const result = await conn
|
|
15
17
|
.query(statement)
|
|
16
18
|
.then((result) => result.rows[0].count);
|
package/lib/queries/count.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"count.js","sourceRoot":"","sources":["../../src/queries/count.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGhD,MAAM,CAAC,MAAM,KAAK,GAAG,KAAK,EACtB,IAAgB,EAChB,MAAyB,EACzB,CAAS,EACT,KAAsB,EACxB,EAAE;IACA,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;IAC7C,MAAM,SAAS,GAAG,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9C,MAAM,CAAC,IAAI,CAAC;QACR,OAAO,EAAE,iBAAiB;QAC1B,GAAG,EAAE,SAAS,CAAC,IAAI;QACnB,MAAM,EAAE,SAAS,CAAC,MAAM;KAC3B,CAAC,CAAC;IAEH,IAAI,OAAO,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"count.js","sourceRoot":"","sources":["../../src/queries/count.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGhD,MAAM,CAAC,MAAM,KAAK,GAAG,KAAK,EACtB,IAAgB,EAChB,MAAyB,EACzB,CAAS,EACT,KAAsB,EACxB,EAAE;IACA,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;IAC7C,MAAM,SAAS,GAAG,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9C,MAAM,CAAC,IAAI,CAAC;QACR,OAAO,EAAE,iBAAiB;QAC1B,GAAG,EAAE,SAAS,CAAC,IAAI;QACnB,MAAM,EAAE,SAAS,CAAC,MAAM;KAC3B,CAAC,CAAC;IAEH,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC;QAClC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC5B,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAClC,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,IAAI;SACpB,KAAK,CAAC,SAAS,CAAC;SAChB,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAE5C,OAAO,MAAM,CAAC;AAClB,CAAC,CAAC"}
|
|
@@ -3,7 +3,7 @@ import { BaseCreateManyParams } from "./types/BaseCreateManyParams";
|
|
|
3
3
|
export type CreateBuilder = {
|
|
4
4
|
tableIndex: number;
|
|
5
5
|
table: {
|
|
6
|
-
|
|
6
|
+
table: string;
|
|
7
7
|
schema: string;
|
|
8
8
|
};
|
|
9
9
|
params: {
|
|
@@ -11,6 +11,9 @@ export type CreateBuilder = {
|
|
|
11
11
|
path: string;
|
|
12
12
|
values: unknown[];
|
|
13
13
|
}[];
|
|
14
|
+
onConflict?: {
|
|
15
|
+
do: "nothing";
|
|
16
|
+
};
|
|
14
17
|
returning: {
|
|
15
18
|
name: string;
|
|
16
19
|
path: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildCreate.d.ts","sourceRoot":"","sources":["../../../src/queries/create/buildCreate.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"buildCreate.d.ts","sourceRoot":"","sources":["../../../src/queries/create/buildCreate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAI5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEpE,MAAM,MAAM,aAAa,GAAG;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IACzC,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,OAAO,EAAE,CAAA;KAAE,EAAE,CAAC;IAC5D,UAAU,CAAC,EAAE;QAAE,EAAE,EAAE,SAAS,CAAA;KAAE,CAAC;IAC/B,SAAS,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAC9D,CAAC;AAEF,eAAO,MAAM,WAAW,WACZ,iBAAiB,KACtB,MAAM,UACD,oBAAoB,2BAE7B,aA8CF,CAAC"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
|
+
import { uniq } from "lodash-es";
|
|
1
2
|
import { OrmError } from "../../errors";
|
|
2
3
|
import { tableAlias } from "../util/tableAlias";
|
|
3
4
|
export const buildCreate = (config, m, params, _tableIndex = 0) => {
|
|
4
5
|
const builder = {
|
|
5
6
|
tableIndex: _tableIndex,
|
|
6
7
|
table: {
|
|
7
|
-
|
|
8
|
+
table: config.models[m].table,
|
|
8
9
|
schema: config.models[m].schema,
|
|
9
10
|
},
|
|
10
11
|
params: [],
|
|
@@ -20,7 +21,8 @@ export const buildCreate = (config, m, params, _tableIndex = 0) => {
|
|
|
20
21
|
throw new OrmError("No data provided for create operation", {
|
|
21
22
|
data: { m, params },
|
|
22
23
|
});
|
|
23
|
-
|
|
24
|
+
const keys = uniq(values.flatMap((v) => Object.keys(v)));
|
|
25
|
+
for (const k of keys) {
|
|
24
26
|
builder.params.push({
|
|
25
27
|
name: model.columns[k]["name"],
|
|
26
28
|
path: k,
|
|
@@ -34,6 +36,7 @@ export const buildCreate = (config, m, params, _tableIndex = 0) => {
|
|
|
34
36
|
alias: `${table}_${colIndex++}`,
|
|
35
37
|
});
|
|
36
38
|
}
|
|
39
|
+
builder.onConflict = params.onConflict;
|
|
37
40
|
return builder;
|
|
38
41
|
};
|
|
39
42
|
//# sourceMappingURL=buildCreate.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildCreate.js","sourceRoot":"","sources":["../../../src/queries/create/buildCreate.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"buildCreate.js","sourceRoot":"","sources":["../../../src/queries/create/buildCreate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAGjC,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAWhD,MAAM,CAAC,MAAM,WAAW,GAAG,CACvB,MAAyB,EACzB,CAAS,EACT,MAA4B,EAC5B,WAAW,GAAG,CAAC,EACF,EAAE;IACf,MAAM,OAAO,GAAkB;QAC3B,UAAU,EAAE,WAAW;QACvB,KAAK,EAAE;YACH,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK;YAC7B,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM;SAClC;QACD,MAAM,EAAE,EAAE;QACV,SAAS,EAAE,EAAE;KAChB,CAAC;IAEF,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;IAC/C,IAAI,QAAQ,GAAG,CAAC,CAAC;IAEjB,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAC/B,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACnC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM;QAC5B,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;QAC1D,CAAC,CAAC,CAAC,CACV,CAAC;IAEF,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QACnB,MAAM,IAAI,QAAQ,CAAC,uCAAuC,EAAE;YACxD,IAAI,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE;SACtB,CAAC,CAAC;IAEP,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACzD,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;QACnB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;YAChB,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;YAC9B,IAAI,EAAE,CAAC;YACP,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SAClC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,SAAS,IAAI,EAAE,EAAE,CAAC;QACrC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC;YACnB,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;YAC9B,IAAI,EAAE,CAAC;YACP,KAAK,EAAE,GAAG,KAAK,IAAI,QAAQ,EAAE,EAAE;SAClC,CAAC,CAAC;IACP,CAAC;IAED,OAAO,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;IAEvC,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createResultSchema.d.ts","sourceRoot":"","sources":["../../../src/queries/create/createResultSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAEnC,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAElE,eAAO,MAAM,kBAAkB,WACnB,iBAAiB,KACtB,MAAM,UACD,oBAAoB,GAAG,mBAAmB;;;;
|
|
1
|
+
{"version":3,"file":"createResultSchema.d.ts","sourceRoot":"","sources":["../../../src/queries/create/createResultSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAEnC,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAElE,eAAO,MAAM,kBAAkB,WACnB,iBAAiB,KACtB,MAAM,UACD,oBAAoB,GAAG,mBAAmB;;;;EAcrD,CAAC"}
|
|
@@ -5,7 +5,9 @@ export const createResultSchema = (config, m, params) => {
|
|
|
5
5
|
const obj = {};
|
|
6
6
|
params.returning?.forEach((s) => {
|
|
7
7
|
const col = config.models[m].columns[s];
|
|
8
|
-
obj[s] = col.nullable
|
|
8
|
+
obj[s] = col.nullable
|
|
9
|
+
? col.zodSchema.nullish().transform((x) => x ?? null)
|
|
10
|
+
: col.zodSchema;
|
|
9
11
|
});
|
|
10
12
|
return z.object(obj);
|
|
11
13
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createResultSchema.js","sourceRoot":"","sources":["../../../src/queries/create/createResultSchema.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,CAAC,EAAE,MAAM,KAAK,CAAC;AAKnC,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAC9B,MAAyB,EACzB,CAAS,EACT,MAAkD,EACpD,EAAE;IACA,IAAI,CAAC,MAAM,CAAC,SAAS;QAAE,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC;IAEzC,MAAM,GAAG,GAAuC,EAAE,CAAC;IAEnD,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAC5B,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACxC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"createResultSchema.js","sourceRoot":"","sources":["../../../src/queries/create/createResultSchema.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,CAAC,EAAE,MAAM,KAAK,CAAC;AAKnC,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAC9B,MAAyB,EACzB,CAAS,EACT,MAAkD,EACpD,EAAE;IACA,IAAI,CAAC,MAAM,CAAC,SAAS;QAAE,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC;IAEzC,MAAM,GAAG,GAAuC,EAAE,CAAC;IAEnD,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAC5B,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACxC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,QAAQ;YACjB,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC;YACrD,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createToSql.d.ts","sourceRoot":"","sources":["../../../src/queries/create/createToSql.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAO,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C,eAAO,MAAM,WAAW,YAAa,aAAa,KAAG,
|
|
1
|
+
{"version":3,"file":"createToSql.d.ts","sourceRoot":"","sources":["../../../src/queries/create/createToSql.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAO,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C,eAAO,MAAM,WAAW,YAAa,aAAa,KAAG,YAsCpD,CAAC"}
|
|
@@ -4,10 +4,10 @@ export const createToSql = (builder) => {
|
|
|
4
4
|
const frag = new SQLStatement();
|
|
5
5
|
const { table, params, returning } = builder;
|
|
6
6
|
if (params.length === 0) {
|
|
7
|
-
frag.push(pgfmt("INSERT INTO %I.%I DEFAULT VALUES", table.schema, table.
|
|
7
|
+
frag.push(pgfmt("INSERT INTO %I.%I DEFAULT VALUES", table.schema, table.table));
|
|
8
8
|
}
|
|
9
9
|
else {
|
|
10
|
-
frag.push(pgfmt("INSERT INTO %I.%I (\n", table.schema, table.
|
|
10
|
+
frag.push(pgfmt("INSERT INTO %I.%I (\n", table.schema, table.table));
|
|
11
11
|
frag.push(params.map((p) => pgfmt(" %I", p.name)).join(",\n"));
|
|
12
12
|
frag.push(") VALUES ");
|
|
13
13
|
const values = params[0].values.map((_, index) => {
|
|
@@ -15,6 +15,9 @@ export const createToSql = (builder) => {
|
|
|
15
15
|
});
|
|
16
16
|
frag.push(sql.splat(values));
|
|
17
17
|
}
|
|
18
|
+
if (builder.onConflict?.do === "nothing") {
|
|
19
|
+
frag.push("\nON CONFLICT DO NOTHING");
|
|
20
|
+
}
|
|
18
21
|
if (returning.length > 0) {
|
|
19
22
|
frag.push("\nRETURNING ");
|
|
20
23
|
frag.push(returning
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createToSql.js","sourceRoot":"","sources":["../../../src/queries/create/createToSql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,WAAW,CAAC;AAE9B,OAAO,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAG9C,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,OAAsB,EAAgB,EAAE;IAChE,MAAM,IAAI,GAAG,IAAI,YAAY,EAAE,CAAC;IAEhC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IAE7C,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,IAAI,CAAC,IAAI,CACL,KAAK,
|
|
1
|
+
{"version":3,"file":"createToSql.js","sourceRoot":"","sources":["../../../src/queries/create/createToSql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,WAAW,CAAC;AAE9B,OAAO,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAG9C,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,OAAsB,EAAgB,EAAE;IAChE,MAAM,IAAI,GAAG,IAAI,YAAY,EAAE,CAAC;IAEhC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IAE7C,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,IAAI,CAAC,IAAI,CACL,KAAK,CACD,kCAAkC,EAClC,KAAK,CAAC,MAAM,EACZ,KAAK,CAAC,KAAK,CACd,CACJ,CAAC;IACN,CAAC;SAAM,CAAC;QACJ,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,uBAAuB,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;QACrE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QAClE,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACvB,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;YAC7C,OAAO,GAAG,CAAA,MAAM,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC;QACrE,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IACjC,CAAC;IAED,IAAI,OAAO,CAAC,UAAU,EAAE,EAAE,KAAK,SAAS,EAAE,CAAC;QACvC,IAAI,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;IAC1C,CAAC;IAED,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC1B,IAAI,CAAC,IAAI,CACL,SAAS;aACJ,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;aAClD,IAAI,CAAC,KAAK,CAAC,CACnB,CAAC;IACN,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAEjB,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"createMany.varied-keys.test.d.ts","sourceRoot":"","sources":["../../../../src/queries/create/tests/createMany.varied-keys.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { describe, expect, test } from "vitest";
|
|
2
|
+
import { db } from "../../../test/db";
|
|
3
|
+
describe("createMany", () => {
|
|
4
|
+
test("it can handle varied combinations of optional keys in its values", async () => {
|
|
5
|
+
await db.transact(async (db) => {
|
|
6
|
+
const russell = await db.createOne("user", {
|
|
7
|
+
values: { username: `Russell` },
|
|
8
|
+
returning: ["id", "username"],
|
|
9
|
+
});
|
|
10
|
+
const others = await db.createMany("user", {
|
|
11
|
+
values: [
|
|
12
|
+
{ username: "Fairooz" },
|
|
13
|
+
{ username: "Dan", invitedById: russell.id },
|
|
14
|
+
],
|
|
15
|
+
returning: ["username", "invitedById"],
|
|
16
|
+
});
|
|
17
|
+
expect(others).toEqual([
|
|
18
|
+
{ username: "Fairooz", invitedById: null },
|
|
19
|
+
{ username: "Dan", invitedById: russell.id },
|
|
20
|
+
]);
|
|
21
|
+
}, { rollback: true });
|
|
22
|
+
});
|
|
23
|
+
});
|
|
24
|
+
//# sourceMappingURL=createMany.varied-keys.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"createMany.varied-keys.test.js","sourceRoot":"","sources":["../../../../src/queries/create/tests/createMany.varied-keys.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEhD,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAEtC,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;IACxB,IAAI,CAAC,kEAAkE,EAAE,KAAK,IAAI,EAAE;QAChF,MAAM,EAAE,CAAC,QAAQ,CACb,KAAK,EAAE,EAAE,EAAE,EAAE;YACT,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,SAAS,CAAC,MAAM,EAAE;gBACvC,MAAM,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE;gBAC/B,SAAS,EAAE,CAAC,IAAI,EAAE,UAAU,CAAC;aAChC,CAAC,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,UAAU,CAAC,MAAM,EAAE;gBACvC,MAAM,EAAE;oBACJ,EAAE,QAAQ,EAAE,SAAS,EAAE;oBACvB,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,EAAE;iBAC/C;gBACD,SAAS,EAAE,CAAC,UAAU,EAAE,aAAa,CAAC;aACzC,CAAC,CAAC;YACH,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;gBACnB,EAAE,QAAQ,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,EAAE;gBAC1C,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,EAAE;aAC/C,CAAC,CAAC;QACP,CAAC,EACD,EAAE,QAAQ,EAAE,IAAI,EAAE,CACrB,CAAC;IACN,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -100,5 +100,58 @@ describe("createOne", () => {
|
|
|
100
100
|
expect(rows[0].name).toEqual("hello");
|
|
101
101
|
}, { rollback: true });
|
|
102
102
|
});
|
|
103
|
+
test("columns that are provided by middleware do not need to be specified", async () => {
|
|
104
|
+
const baz = {
|
|
105
|
+
columns: {
|
|
106
|
+
id: {
|
|
107
|
+
type: "uuid",
|
|
108
|
+
zodSchema: z.string().uuid(),
|
|
109
|
+
provided: true,
|
|
110
|
+
},
|
|
111
|
+
name: { type: "text", zodSchema: z.string() },
|
|
112
|
+
},
|
|
113
|
+
};
|
|
114
|
+
await orm({
|
|
115
|
+
schema: "casekit",
|
|
116
|
+
models: { baz },
|
|
117
|
+
relations: { baz: {} },
|
|
118
|
+
pool: new pg.Pool(),
|
|
119
|
+
middleware: [
|
|
120
|
+
{
|
|
121
|
+
create: {
|
|
122
|
+
values: (values) => ({ id: uuid.v4(), ...values }),
|
|
123
|
+
},
|
|
124
|
+
},
|
|
125
|
+
],
|
|
126
|
+
}).transact(async (db) => {
|
|
127
|
+
await db.connection.query(createTableSql(db.models.baz));
|
|
128
|
+
await db.createOne("baz", {
|
|
129
|
+
values: { name: "hello" },
|
|
130
|
+
});
|
|
131
|
+
const rows = await db.findMany("baz", {
|
|
132
|
+
select: ["id", "name"],
|
|
133
|
+
});
|
|
134
|
+
expect(rows).toHaveLength(1);
|
|
135
|
+
expect(rows[0].id).toBeTypeOf("string");
|
|
136
|
+
expect(rows[0].name).toEqual("hello");
|
|
137
|
+
}, { rollback: true });
|
|
138
|
+
});
|
|
139
|
+
test("conflicts can be ignored", async () => {
|
|
140
|
+
await db.transact(async (db) => {
|
|
141
|
+
await db.createOne("user", { values: { username: "russell" } });
|
|
142
|
+
// creating a duplicate user should throw an error
|
|
143
|
+
await expect(db.transact(async (db) => {
|
|
144
|
+
return db.createOne("user", {
|
|
145
|
+
values: { username: "russell" },
|
|
146
|
+
});
|
|
147
|
+
})).rejects.toThrow('duplicate key value violates unique constraint "user_username_idx"');
|
|
148
|
+
// but if we ignore the conflict, it should work
|
|
149
|
+
const result = await db.createOne("user", {
|
|
150
|
+
values: { username: "russell" },
|
|
151
|
+
onConflict: { do: "nothing" },
|
|
152
|
+
});
|
|
153
|
+
expect(result).toEqual(0);
|
|
154
|
+
}, { rollback: true });
|
|
155
|
+
});
|
|
103
156
|
});
|
|
104
157
|
//# sourceMappingURL=createOne.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createOne.test.js","sourceRoot":"","sources":["../../../../src/queries/create/tests/createOne.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"createOne.test.js","sourceRoot":"","sources":["../../../../src/queries/create/tests/createOne.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import { NonEmptyArray } from "../../../types/util/NonEmptyArray";
|
|
2
2
|
export type BaseCreateManyParams = {
|
|
3
3
|
values: Record<string, unknown | null>[];
|
|
4
|
+
onConflict?: {
|
|
5
|
+
do: "nothing";
|
|
6
|
+
};
|
|
4
7
|
returning?: NonEmptyArray<string>;
|
|
5
8
|
};
|
|
6
9
|
//# sourceMappingURL=BaseCreateManyParams.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseCreateManyParams.d.ts","sourceRoot":"","sources":["../../../../src/queries/create/types/BaseCreateManyParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAElE,MAAM,MAAM,oBAAoB,GAAG;IAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC;IACzC,SAAS,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;CACrC,CAAC"}
|
|
1
|
+
{"version":3,"file":"BaseCreateManyParams.d.ts","sourceRoot":"","sources":["../../../../src/queries/create/types/BaseCreateManyParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAElE,MAAM,MAAM,oBAAoB,GAAG;IAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC;IACzC,UAAU,CAAC,EAAE;QAAE,EAAE,EAAE,SAAS,CAAA;KAAE,CAAC;IAC/B,SAAS,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;CACrC,CAAC"}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import { NonEmptyArray } from "../../../types/util/NonEmptyArray";
|
|
2
2
|
export type BaseCreateOneParams = {
|
|
3
3
|
values: Record<string, unknown | null>;
|
|
4
|
+
onConflict?: {
|
|
5
|
+
do: "nothing";
|
|
6
|
+
};
|
|
4
7
|
returning?: NonEmptyArray<string>;
|
|
5
8
|
};
|
|
6
9
|
//# sourceMappingURL=BaseCreateOneParams.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseCreateOneParams.d.ts","sourceRoot":"","sources":["../../../../src/queries/create/types/BaseCreateOneParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAElE,MAAM,MAAM,mBAAmB,GAAG;IAC9B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI,CAAC,CAAC;IACvC,SAAS,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;CACrC,CAAC"}
|
|
1
|
+
{"version":3,"file":"BaseCreateOneParams.d.ts","sourceRoot":"","sources":["../../../../src/queries/create/types/BaseCreateOneParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAElE,MAAM,MAAM,mBAAmB,GAAG;IAC9B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI,CAAC,CAAC;IACvC,UAAU,CAAC,EAAE;QAAE,EAAE,EAAE,SAAS,CAAA;KAAE,CAAC;IAC/B,SAAS,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;CACrC,CAAC"}
|
|
@@ -4,6 +4,9 @@ import { ReturningClause } from "../../clauses/ReturningClause";
|
|
|
4
4
|
import { CreateValues } from "./CreateOneParams";
|
|
5
5
|
export type CreateManyParams<Models extends LooseModelDefinitions, M extends ModelName<Models>> = {
|
|
6
6
|
values: CreateValues<Models, M>[];
|
|
7
|
-
returning?: ReturningClause<Models
|
|
7
|
+
returning?: ReturningClause<Models[M]>;
|
|
8
|
+
onConflict?: {
|
|
9
|
+
do: "nothing";
|
|
10
|
+
};
|
|
8
11
|
};
|
|
9
12
|
//# sourceMappingURL=CreateManyParams.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CreateManyParams.d.ts","sourceRoot":"","sources":["../../../../src/queries/create/types/CreateManyParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,MAAM,MAAM,gBAAgB,CACxB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,IAC3B;IACA,MAAM,EAAE,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC;IAClC,SAAS,CAAC,EAAE,eAAe,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"CreateManyParams.d.ts","sourceRoot":"","sources":["../../../../src/queries/create/types/CreateManyParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,MAAM,MAAM,gBAAgB,CACxB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,IAC3B;IACA,MAAM,EAAE,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC;IAClC,SAAS,CAAC,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IACvC,UAAU,CAAC,EAAE;QACT,EAAE,EAAE,SAAS,CAAC;KACjB,CAAC;CACL,CAAC"}
|
|
@@ -4,7 +4,7 @@ import { LooseModelDefinitions } from "../../../schema/types/loose/LooseModelDef
|
|
|
4
4
|
import { ReturningClause } from "../../clauses/ReturningClause";
|
|
5
5
|
import { CreateManyParams } from "./CreateManyParams";
|
|
6
6
|
import { CreateOneParams } from "./CreateOneParams";
|
|
7
|
-
export type CreateManyResult<Models extends LooseModelDefinitions, M extends ModelName<Models>, P extends CreateOneParams<Models, M> | CreateManyParams<Models, M>> = P["returning"] extends ReturningClause<Models
|
|
7
|
+
export type CreateManyResult<Models extends LooseModelDefinitions, M extends ModelName<Models>, P extends CreateOneParams<Models, M> | CreateManyParams<Models, M>> = P["returning"] extends ReturningClause<Models[M]> ? Readonly<{
|
|
8
8
|
[C in P["returning"][number]]: ColumnType<Models, M, C>;
|
|
9
9
|
}>[] : number;
|
|
10
10
|
//# sourceMappingURL=CreateManyResult.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CreateManyResult.d.ts","sourceRoot":"","sources":["../../../../src/queries/create/types/CreateManyResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,MAAM,gBAAgB,CACxB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,EAC3B,CAAC,SAAS,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,gBAAgB,CAAC,MAAM,EAAE,CAAC,CAAC,IAElE,CAAC,CAAC,WAAW,CAAC,SAAS,eAAe,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"CreateManyResult.d.ts","sourceRoot":"","sources":["../../../../src/queries/create/types/CreateManyResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,MAAM,gBAAgB,CACxB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,EAC3B,CAAC,SAAS,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,gBAAgB,CAAC,MAAM,EAAE,CAAC,CAAC,IAElE,CAAC,CAAC,WAAW,CAAC,SAAS,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAC3C,QAAQ,CAAC;KACJ,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;CAC1D,CAAC,EAAE,GACJ,MAAM,CAAC"}
|
|
@@ -7,6 +7,9 @@ import { RequiredParams } from "../../clauses/helpers/RequiredParams";
|
|
|
7
7
|
export type CreateValues<Models extends LooseModelDefinitions, M extends ModelName<Models>> = Simplify<RequiredParams<Models, M> & OptionalParams<Models, M>>;
|
|
8
8
|
export type CreateOneParams<Models extends LooseModelDefinitions, M extends ModelName<Models>> = {
|
|
9
9
|
values: CreateValues<Models, M>;
|
|
10
|
-
returning?: ReturningClause<Models
|
|
10
|
+
returning?: ReturningClause<Models[M]>;
|
|
11
|
+
onConflict?: {
|
|
12
|
+
do: "nothing";
|
|
13
|
+
};
|
|
11
14
|
};
|
|
12
15
|
//# sourceMappingURL=CreateOneParams.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CreateOneParams.d.ts","sourceRoot":"","sources":["../../../../src/queries/create/types/CreateOneParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAEtE,MAAM,MAAM,YAAY,CACpB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,IAC3B,QAAQ,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;AAEpE,MAAM,MAAM,eAAe,CACvB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,IAC3B;IACA,MAAM,EAAE,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAChC,SAAS,CAAC,EAAE,eAAe,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"CreateOneParams.d.ts","sourceRoot":"","sources":["../../../../src/queries/create/types/CreateOneParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAEtE,MAAM,MAAM,YAAY,CACpB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,IAC3B,QAAQ,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;AAEpE,MAAM,MAAM,eAAe,CACvB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,IAC3B;IACA,MAAM,EAAE,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAChC,SAAS,CAAC,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IACvC,UAAU,CAAC,EAAE;QACT,EAAE,EAAE,SAAS,CAAC;KACjB,CAAC;CACL,CAAC"}
|
|
@@ -4,7 +4,7 @@ import { LooseModelDefinitions } from "../../../schema/types/loose/LooseModelDef
|
|
|
4
4
|
import { SelectClause } from "../../clauses/SelectClause";
|
|
5
5
|
import { CreateManyParams } from "./CreateManyParams";
|
|
6
6
|
import { CreateOneParams } from "./CreateOneParams";
|
|
7
|
-
export type CreateOneResult<Models extends LooseModelDefinitions, M extends ModelName<Models>, P extends CreateOneParams<Models, M> | CreateManyParams<Models, M>> = P["returning"] extends SelectClause<Models
|
|
7
|
+
export type CreateOneResult<Models extends LooseModelDefinitions, M extends ModelName<Models>, P extends CreateOneParams<Models, M> | CreateManyParams<Models, M>> = P["returning"] extends SelectClause<Models[M]> ? Readonly<{
|
|
8
8
|
[C in P["returning"][number]]: ColumnType<Models, M, C>;
|
|
9
9
|
}> : number;
|
|
10
10
|
//# sourceMappingURL=CreateOneResult.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CreateOneResult.d.ts","sourceRoot":"","sources":["../../../../src/queries/create/types/CreateOneResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,MAAM,eAAe,CACvB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,EAC3B,CAAC,SAAS,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,gBAAgB,CAAC,MAAM,EAAE,CAAC,CAAC,IAElE,CAAC,CAAC,WAAW,CAAC,SAAS,YAAY,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"CreateOneResult.d.ts","sourceRoot":"","sources":["../../../../src/queries/create/types/CreateOneResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,MAAM,eAAe,CACvB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,EAC3B,CAAC,SAAS,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,gBAAgB,CAAC,MAAM,EAAE,CAAC,CAAC,IAElE,CAAC,CAAC,WAAW,CAAC,SAAS,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GACxC,QAAQ,CAAC;KACJ,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;CAC1D,CAAC,GACF,MAAM,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createMany.d.ts","sourceRoot":"","sources":["../../src/queries/createMany.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAE5E,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAG3E,eAAO,MAAM,UAAU,SACb,UAAU,UACR,iBAAiB,KACtB,MAAM,UACD,oBAAoB,
|
|
1
|
+
{"version":3,"file":"createMany.d.ts","sourceRoot":"","sources":["../../src/queries/createMany.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAE5E,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAG3E,eAAO,MAAM,UAAU,SACb,UAAU,UACR,iBAAiB,KACtB,MAAM,UACD,oBAAoB,uDAwB/B,CAAC"}
|
|
@@ -13,8 +13,10 @@ export const createMany = async (conn, config, m, params) => {
|
|
|
13
13
|
sql: statement.text,
|
|
14
14
|
values: statement.values,
|
|
15
15
|
});
|
|
16
|
-
if (process.env.
|
|
16
|
+
if (process.env.ORM_VERBOSE_LOGGING) {
|
|
17
17
|
console.log(statement.text);
|
|
18
|
+
console.log(statement.values);
|
|
19
|
+
}
|
|
18
20
|
const result = await conn.query(statement);
|
|
19
21
|
return params.returning
|
|
20
22
|
? result.rows.map(rowToObject(builder.returning))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createMany.js","sourceRoot":"","sources":["../../src/queries/createMany.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,EAC3B,IAAgB,EAChB,MAAyB,EACzB,CAAS,EACT,MAA4B,EAC9B,EAAE;IACA,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7B,OAAO,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IACrC,CAAC;IAED,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;IAC/C,MAAM,SAAS,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IAEvC,MAAM,CAAC,IAAI,CAAC;QACR,OAAO,EAAE,kBAAkB;QAC3B,GAAG,EAAE,SAAS,CAAC,IAAI;QACnB,MAAM,EAAE,SAAS,CAAC,MAAM;KAC3B,CAAC,CAAC;IAEH,IAAI,OAAO,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"createMany.js","sourceRoot":"","sources":["../../src/queries/createMany.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,EAC3B,IAAgB,EAChB,MAAyB,EACzB,CAAS,EACT,MAA4B,EAC9B,EAAE;IACA,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7B,OAAO,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IACrC,CAAC;IAED,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;IAC/C,MAAM,SAAS,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IAEvC,MAAM,CAAC,IAAI,CAAC;QACR,OAAO,EAAE,kBAAkB;QAC3B,GAAG,EAAE,SAAS,CAAC,IAAI;QACnB,MAAM,EAAE,SAAS,CAAC,MAAM;KAC3B,CAAC,CAAC;IAEH,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC;QAClC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC5B,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAClC,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAC3C,OAAO,MAAM,CAAC,SAAS;QACnB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACjD,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;AAC1B,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createOne.d.ts","sourceRoot":"","sources":["../../src/queries/createOne.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;
|
|
1
|
+
{"version":3,"file":"createOne.d.ts","sourceRoot":"","sources":["../../src/queries/createOne.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAG5E,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAGzE,eAAO,MAAM,SAAS,SACZ,UAAU,UACR,iBAAiB,KACtB,MAAM,UACD,mBAAmB,qDAe9B,CAAC"}
|
package/lib/queries/createOne.js
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
1
|
+
import { OrmError } from "..";
|
|
1
2
|
import { createMany } from "./createMany";
|
|
2
3
|
export const createOne = async (conn, config, m, params) => {
|
|
4
|
+
if (params.onConflict?.do === "nothing" && params.returning) {
|
|
5
|
+
throw new OrmError("Cannot use 'returning' with 'onConflict' in createOne", {
|
|
6
|
+
data: { m, params },
|
|
7
|
+
});
|
|
8
|
+
}
|
|
3
9
|
const result = await createMany(conn, config, m, {
|
|
4
10
|
...params,
|
|
5
11
|
values: [params.values],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createOne.js","sourceRoot":"","sources":["../../src/queries/createOne.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createOne.js","sourceRoot":"","sources":["../../src/queries/createOne.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAG9B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,EAC1B,IAAgB,EAChB,MAAyB,EACzB,CAAS,EACT,MAA2B,EAC7B,EAAE;IACA,IAAI,MAAM,CAAC,UAAU,EAAE,EAAE,KAAK,SAAS,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;QAC1D,MAAM,IAAI,QAAQ,CACd,uDAAuD,EACvD;YACI,IAAI,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE;SACtB,CACJ,CAAC;IACN,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE;QAC7C,GAAG,MAAM;QACT,MAAM,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC;KAC1B,CAAC,CAAC;IACH,OAAO,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;AACtD,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildDelete.d.ts","sourceRoot":"","sources":["../../../src/queries/delete/buildDelete.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAG5E,OAAO,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAC;AACvF,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAErD,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,MAAM,MAAM,aAAa,GAAG;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE;QAAE,
|
|
1
|
+
{"version":3,"file":"buildDelete.d.ts","sourceRoot":"","sources":["../../../src/queries/delete/buildDelete.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAG5E,OAAO,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAC;AACvF,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAErD,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,MAAM,MAAM,aAAa,GAAG;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IACvE,KAAK,EAAE,WAAW,CAAC,qBAAqB,EAAE,SAAS,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAC5E,SAAS,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAC9D,CAAC;AAEF,eAAO,MAAM,WAAW,WACZ,iBAAiB,KACtB,MAAM,UACD,gBAAgB,2BAEzB,aAkCF,CAAC"}
|
|
@@ -4,7 +4,7 @@ export const buildDelete = (config, m, params, _tableIndex = 0) => {
|
|
|
4
4
|
const builder = {
|
|
5
5
|
tableIndex: _tableIndex,
|
|
6
6
|
table: {
|
|
7
|
-
|
|
7
|
+
table: config.models[m].table,
|
|
8
8
|
schema: config.models[m].schema,
|
|
9
9
|
model: m,
|
|
10
10
|
alias: tableAlias(_tableIndex++),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildDelete.js","sourceRoot":"","sources":["../../../src/queries/delete/buildDelete.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAIxC,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAUhD,MAAM,CAAC,MAAM,WAAW,GAAG,CACvB,MAAyB,EACzB,CAAS,EACT,MAAwB,EACxB,WAAW,GAAG,CAAC,EACF,EAAE;IACf,MAAM,OAAO,GAAkB;QAC3B,UAAU,EAAE,WAAW;QACvB,KAAK,EAAE;YACH,
|
|
1
|
+
{"version":3,"file":"buildDelete.js","sourceRoot":"","sources":["../../../src/queries/delete/buildDelete.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAIxC,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAUhD,MAAM,CAAC,MAAM,WAAW,GAAG,CACvB,MAAyB,EACzB,CAAS,EACT,MAAwB,EACxB,WAAW,GAAG,CAAC,EACF,EAAE;IACf,MAAM,OAAO,GAAkB;QAC3B,UAAU,EAAE,WAAW;QACvB,KAAK,EAAE;YACH,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK;YAC7B,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM;YAC/B,KAAK,EAAE,CAAC;YACR,KAAK,EAAE,UAAU,CAAC,WAAW,EAAE,CAAC;SACnC;QACD,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK;YAClC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE;gBACzC,MAAM;gBACN,KAAK,EAAE,CAAC;aACX,CAAE;YACL,CAAC,CAAC,MAAM,CAAC,KAAK;QAClB,SAAS,EAAE,EAAE;KAChB,CAAC;IACF,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAE/B,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1C,MAAM,IAAI,QAAQ,CAAC,+CAA+C,EAAE;YAChE,IAAI,EAAE,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE;SAC7B,CAAC,CAAC;IACP,CAAC;IAED,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,SAAS,IAAI,EAAE,EAAE,CAAC;QACrC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC;YACnB,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;YAC9B,IAAI,EAAE,CAAC;YACP,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,KAAK,IAAI,QAAQ,EAAE,EAAE;SAChD,CAAC,CAAC;IACP,CAAC;IACD,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deleteResultSchema.d.ts","sourceRoot":"","sources":["../../../src/queries/delete/deleteResultSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAEnC,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,eAAO,MAAM,kBAAkB,WACnB,iBAAiB,KACtB,MAAM,UACD,gBAAgB;;;;
|
|
1
|
+
{"version":3,"file":"deleteResultSchema.d.ts","sourceRoot":"","sources":["../../../src/queries/delete/deleteResultSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAEnC,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,eAAO,MAAM,kBAAkB,WACnB,iBAAiB,KACtB,MAAM,UACD,gBAAgB;;;;EAc3B,CAAC"}
|
|
@@ -5,7 +5,9 @@ export const deleteResultSchema = (config, m, params) => {
|
|
|
5
5
|
const obj = {};
|
|
6
6
|
params.returning?.forEach((s) => {
|
|
7
7
|
const col = config.models[m].columns[s];
|
|
8
|
-
obj[s] = col.nullable
|
|
8
|
+
obj[s] = col.nullable
|
|
9
|
+
? col.zodSchema.nullish().transform((x) => x ?? null)
|
|
10
|
+
: col.zodSchema;
|
|
9
11
|
});
|
|
10
12
|
return z.object(obj);
|
|
11
13
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deleteResultSchema.js","sourceRoot":"","sources":["../../../src/queries/delete/deleteResultSchema.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,CAAC,EAAE,MAAM,KAAK,CAAC;AAInC,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAC9B,MAAyB,EACzB,CAAS,EACT,MAAwB,EAC1B,EAAE;IACA,IAAI,CAAC,MAAM,CAAC,SAAS;QAAE,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC;IAEzC,MAAM,GAAG,GAAuC,EAAE,CAAC;IAEnD,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAC5B,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACxC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"deleteResultSchema.js","sourceRoot":"","sources":["../../../src/queries/delete/deleteResultSchema.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,CAAC,EAAE,MAAM,KAAK,CAAC;AAInC,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAC9B,MAAyB,EACzB,CAAS,EACT,MAAwB,EAC1B,EAAE;IACA,IAAI,CAAC,MAAM,CAAC,SAAS;QAAE,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC;IAEzC,MAAM,GAAG,GAAuC,EAAE,CAAC;IAEnD,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAC5B,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACxC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,QAAQ;YACjB,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC;YACrD,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC,CAAC"}
|
|
@@ -5,7 +5,7 @@ import { buildWhereClauses } from "../clauses/where/buildWhereClauses";
|
|
|
5
5
|
import { hasConditions } from "../util/hasConditions";
|
|
6
6
|
export const deleteToSql = (config, m, builder) => {
|
|
7
7
|
const { table, where, returning } = builder;
|
|
8
|
-
const frag = sql `DELETE FROM %I.%I AS %I`.withIdentifiers(table.schema, table.
|
|
8
|
+
const frag = sql `DELETE FROM %I.%I AS %I`.withIdentifiers(table.schema, table.table, table.alias);
|
|
9
9
|
if (!hasConditions(where)) {
|
|
10
10
|
throw new OrmError(`No where clause provided for delete`, {
|
|
11
11
|
data: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deleteToSql.js","sourceRoot":"","sources":["../../../src/queries/delete/deleteToSql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,WAAW,CAAC;AAE9B,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExC,OAAO,EAAgB,GAAG,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAGtD,MAAM,CAAC,MAAM,WAAW,GAAG,CACvB,MAAyB,EACzB,CAAS,EACT,OAAsB,EACV,EAAE;IACd,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IAE5C,MAAM,IAAI,GAAG,GAAG,CAAA,yBAAyB,CAAC,eAAe,CACrD,KAAK,CAAC,MAAM,EACZ,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"deleteToSql.js","sourceRoot":"","sources":["../../../src/queries/delete/deleteToSql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,WAAW,CAAC;AAE9B,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExC,OAAO,EAAgB,GAAG,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAGtD,MAAM,CAAC,MAAM,WAAW,GAAG,CACvB,MAAyB,EACzB,CAAS,EACT,OAAsB,EACV,EAAE;IACd,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IAE5C,MAAM,IAAI,GAAG,GAAG,CAAA,yBAAyB,CAAC,eAAe,CACrD,KAAK,CAAC,MAAM,EACZ,KAAK,CAAC,KAAK,EACX,KAAK,CAAC,KAAK,CACd,CAAC;IAEF,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,QAAQ,CAAC,qCAAqC,EAAE;YACtD,IAAI,EAAE;gBACF,KAAK;gBACL,KAAK;gBACL,SAAS;aACZ;SACJ,CAAC,CAAC;IACP,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAC3B,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;IAEnD,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC3B,IAAI,CAAC,IAAI,CACL,SAAS;aACJ,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACP,KAAK,CAAC,iBAAiB,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CACzD;aACA,IAAI,CAAC,KAAK,CAAC,CACnB,CAAC;IACN,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAEjB,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC"}
|
|
@@ -3,7 +3,7 @@ import { ModelName } from "../../../schema/types/helpers/ModelName";
|
|
|
3
3
|
import { LooseModelDefinitions } from "../../../schema/types/loose/LooseModelDefinitions";
|
|
4
4
|
import { ReturningClause } from "../../clauses/ReturningClause";
|
|
5
5
|
import { DeleteParams } from "./DeleteParams";
|
|
6
|
-
export type DeleteManyResult<Models extends LooseModelDefinitions, M extends ModelName<Models>, P extends DeleteParams<Models, M>> = P["returning"] extends ReturningClause<Models
|
|
6
|
+
export type DeleteManyResult<Models extends LooseModelDefinitions, M extends ModelName<Models>, P extends DeleteParams<Models, M>> = P["returning"] extends ReturningClause<Models[M]> ? Readonly<{
|
|
7
7
|
[C in P["returning"][number]]: ColumnType<Models, M, C>;
|
|
8
8
|
}>[] : number;
|
|
9
9
|
//# sourceMappingURL=DeleteManyResult.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeleteManyResult.d.ts","sourceRoot":"","sources":["../../../../src/queries/delete/types/DeleteManyResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,MAAM,MAAM,gBAAgB,CACxB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,EAC3B,CAAC,SAAS,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,IAEjC,CAAC,CAAC,WAAW,CAAC,SAAS,eAAe,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"DeleteManyResult.d.ts","sourceRoot":"","sources":["../../../../src/queries/delete/types/DeleteManyResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,MAAM,MAAM,gBAAgB,CACxB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,EAC3B,CAAC,SAAS,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,IAEjC,CAAC,CAAC,WAAW,CAAC,SAAS,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAC3C,QAAQ,CAAC;KACJ,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;CAC1D,CAAC,EAAE,GACJ,MAAM,CAAC"}
|