drizzle-orm 0.44.2-512acc4 → 0.44.2-6baabce
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/aws-data-api/pg/driver.cjs +6 -14
- package/aws-data-api/pg/driver.cjs.map +1 -1
- package/aws-data-api/pg/driver.d.cts +3 -4
- package/aws-data-api/pg/driver.d.ts +3 -4
- package/aws-data-api/pg/driver.js +6 -14
- package/aws-data-api/pg/driver.js.map +1 -1
- package/aws-data-api/pg/session.cjs +9 -26
- package/aws-data-api/pg/session.cjs.map +1 -1
- package/aws-data-api/pg/session.d.cts +4 -5
- package/aws-data-api/pg/session.d.ts +4 -5
- package/aws-data-api/pg/session.js +9 -26
- package/aws-data-api/pg/session.js.map +1 -1
- package/better-sqlite3/driver.cjs.map +1 -1
- package/better-sqlite3/driver.d.cts +3 -4
- package/better-sqlite3/driver.d.ts +3 -4
- package/better-sqlite3/driver.js.map +1 -1
- package/better-sqlite3/session.cjs +4 -4
- package/better-sqlite3/session.cjs.map +1 -1
- package/better-sqlite3/session.d.cts +4 -4
- package/better-sqlite3/session.d.ts +4 -4
- package/better-sqlite3/session.js +4 -4
- package/better-sqlite3/session.js.map +1 -1
- package/bun-sql/driver.cjs +2 -3
- package/bun-sql/driver.cjs.map +1 -1
- package/bun-sql/driver.d.cts +3 -4
- package/bun-sql/driver.d.ts +3 -4
- package/bun-sql/driver.js +2 -3
- package/bun-sql/driver.js.map +1 -1
- package/bun-sql/session.cjs +11 -20
- package/bun-sql/session.cjs.map +1 -1
- package/bun-sql/session.d.cts +5 -6
- package/bun-sql/session.d.ts +5 -6
- package/bun-sql/session.js +11 -20
- package/bun-sql/session.js.map +1 -1
- package/bun-sqlite/driver.cjs.map +1 -1
- package/bun-sqlite/driver.d.cts +3 -4
- package/bun-sqlite/driver.d.ts +3 -4
- package/bun-sqlite/driver.js.map +1 -1
- package/bun-sqlite/session.cjs +4 -4
- package/bun-sqlite/session.cjs.map +1 -1
- package/bun-sqlite/session.d.cts +4 -4
- package/bun-sqlite/session.d.ts +4 -4
- package/bun-sqlite/session.js +4 -4
- package/bun-sqlite/session.js.map +1 -1
- package/column-builder.cjs.map +1 -1
- package/column-builder.d.cts +2 -7
- package/column-builder.d.ts +2 -7
- package/column-builder.js.map +1 -1
- package/column.cjs +0 -2
- package/column.cjs.map +1 -1
- package/column.d.cts +0 -6
- package/column.d.ts +0 -6
- package/column.js +0 -2
- package/column.js.map +1 -1
- package/d1/driver.cjs +2 -9
- package/d1/driver.cjs.map +1 -1
- package/d1/driver.d.cts +1 -2
- package/d1/driver.d.ts +1 -2
- package/d1/driver.js +2 -9
- package/d1/driver.js.map +1 -1
- package/d1/session.cjs +11 -20
- package/d1/session.cjs.map +1 -1
- package/d1/session.d.cts +7 -8
- package/d1/session.d.ts +7 -8
- package/d1/session.js +11 -20
- package/d1/session.js.map +1 -1
- package/durable-sqlite/driver.cjs.map +1 -1
- package/durable-sqlite/driver.d.cts +1 -2
- package/durable-sqlite/driver.d.ts +1 -2
- package/durable-sqlite/driver.js.map +1 -1
- package/durable-sqlite/session.cjs +4 -4
- package/durable-sqlite/session.cjs.map +1 -1
- package/durable-sqlite/session.d.cts +4 -4
- package/durable-sqlite/session.d.ts +4 -4
- package/durable-sqlite/session.js +4 -4
- package/durable-sqlite/session.js.map +1 -1
- package/expo-sqlite/driver.cjs.map +1 -1
- package/expo-sqlite/driver.d.cts +1 -2
- package/expo-sqlite/driver.d.ts +1 -2
- package/expo-sqlite/driver.js.map +1 -1
- package/expo-sqlite/session.cjs +4 -4
- package/expo-sqlite/session.cjs.map +1 -1
- package/expo-sqlite/session.d.cts +4 -4
- package/expo-sqlite/session.d.ts +4 -4
- package/expo-sqlite/session.js +4 -4
- package/expo-sqlite/session.js.map +1 -1
- package/gel/driver.cjs +4 -6
- package/gel/driver.cjs.map +1 -1
- package/gel/driver.d.cts +4 -6
- package/gel/driver.d.ts +4 -6
- package/gel/driver.js +4 -6
- package/gel/driver.js.map +1 -1
- package/gel/session.cjs +9 -12
- package/gel/session.cjs.map +1 -1
- package/gel/session.d.cts +4 -5
- package/gel/session.d.ts +4 -5
- package/gel/session.js +9 -12
- package/gel/session.js.map +1 -1
- package/gel-core/columns/common.cjs +0 -8
- package/gel-core/columns/common.cjs.map +1 -1
- package/gel-core/columns/common.d.cts +0 -2
- package/gel-core/columns/common.d.ts +0 -2
- package/gel-core/columns/common.js +0 -8
- package/gel-core/columns/common.js.map +1 -1
- package/gel-core/db.cjs +3 -5
- package/gel-core/db.cjs.map +1 -1
- package/gel-core/db.d.cts +1 -3
- package/gel-core/db.d.ts +1 -3
- package/gel-core/db.js +3 -5
- package/gel-core/db.js.map +1 -1
- package/gel-core/dialect.cjs +19 -24
- package/gel-core/dialect.cjs.map +1 -1
- package/gel-core/dialect.d.cts +6 -7
- package/gel-core/dialect.d.ts +6 -7
- package/gel-core/dialect.js +20 -25
- package/gel-core/dialect.js.map +1 -1
- package/gel-core/query-builders/delete.cjs +5 -19
- package/gel-core/query-builders/delete.cjs.map +1 -1
- package/gel-core/query-builders/delete.js +5 -19
- package/gel-core/query-builders/delete.js.map +1 -1
- package/gel-core/query-builders/insert.cjs +9 -44
- package/gel-core/query-builders/insert.cjs.map +1 -1
- package/gel-core/query-builders/insert.js +11 -46
- package/gel-core/query-builders/insert.js.map +1 -1
- package/gel-core/query-builders/query.cjs +2 -15
- package/gel-core/query-builders/query.cjs.map +1 -1
- package/gel-core/query-builders/query.js +2 -15
- package/gel-core/query-builders/query.js.map +1 -1
- package/gel-core/query-builders/select.cjs +5 -21
- package/gel-core/query-builders/select.cjs.map +1 -1
- package/gel-core/query-builders/select.js +5 -21
- package/gel-core/query-builders/select.js.map +1 -1
- package/gel-core/query-builders/update.cjs +6 -20
- package/gel-core/query-builders/update.cjs.map +1 -1
- package/gel-core/query-builders/update.js +6 -20
- package/gel-core/query-builders/update.js.map +1 -1
- package/gel-core/session.cjs +4 -47
- package/gel-core/session.cjs.map +1 -1
- package/gel-core/session.d.cts +5 -11
- package/gel-core/session.d.ts +5 -11
- package/gel-core/session.js +4 -47
- package/gel-core/session.js.map +1 -1
- package/libsql/driver-core.cjs +2 -3
- package/libsql/driver-core.cjs.map +1 -1
- package/libsql/driver-core.js +2 -3
- package/libsql/driver-core.js.map +1 -1
- package/libsql/driver.cjs +1 -4
- package/libsql/driver.cjs.map +1 -1
- package/libsql/driver.d.cts +3 -4
- package/libsql/driver.d.ts +3 -4
- package/libsql/driver.js +1 -4
- package/libsql/driver.js.map +1 -1
- package/libsql/http/index.cjs +1 -4
- package/libsql/http/index.cjs.map +1 -1
- package/libsql/http/index.d.cts +3 -4
- package/libsql/http/index.d.ts +3 -4
- package/libsql/http/index.js +1 -4
- package/libsql/http/index.js.map +1 -1
- package/libsql/node/index.cjs +1 -4
- package/libsql/node/index.cjs.map +1 -1
- package/libsql/node/index.d.cts +3 -4
- package/libsql/node/index.d.ts +3 -4
- package/libsql/node/index.js +1 -4
- package/libsql/node/index.js.map +1 -1
- package/libsql/session.cjs +12 -29
- package/libsql/session.cjs.map +1 -1
- package/libsql/session.d.cts +7 -8
- package/libsql/session.d.ts +7 -8
- package/libsql/session.js +12 -29
- package/libsql/session.js.map +1 -1
- package/libsql/sqlite3/index.cjs +1 -4
- package/libsql/sqlite3/index.cjs.map +1 -1
- package/libsql/sqlite3/index.d.cts +3 -4
- package/libsql/sqlite3/index.d.ts +3 -4
- package/libsql/sqlite3/index.js +1 -4
- package/libsql/sqlite3/index.js.map +1 -1
- package/libsql/wasm/index.cjs +1 -4
- package/libsql/wasm/index.cjs.map +1 -1
- package/libsql/wasm/index.d.cts +3 -4
- package/libsql/wasm/index.d.ts +3 -4
- package/libsql/wasm/index.js +1 -4
- package/libsql/wasm/index.js.map +1 -1
- package/libsql/web/index.cjs +1 -4
- package/libsql/web/index.cjs.map +1 -1
- package/libsql/web/index.d.cts +3 -4
- package/libsql/web/index.d.ts +3 -4
- package/libsql/web/index.js +1 -4
- package/libsql/web/index.js.map +1 -1
- package/libsql/ws/index.cjs +1 -4
- package/libsql/ws/index.cjs.map +1 -1
- package/libsql/ws/index.d.cts +3 -4
- package/libsql/ws/index.d.ts +3 -4
- package/libsql/ws/index.js +1 -4
- package/libsql/ws/index.js.map +1 -1
- package/mysql-core/db.cjs +3 -5
- package/mysql-core/db.cjs.map +1 -1
- package/mysql-core/db.d.cts +1 -3
- package/mysql-core/db.d.ts +1 -3
- package/mysql-core/db.js +3 -5
- package/mysql-core/db.js.map +1 -1
- package/mysql-core/dialect.cjs +23 -29
- package/mysql-core/dialect.cjs.map +1 -1
- package/mysql-core/dialect.d.cts +7 -8
- package/mysql-core/dialect.d.ts +7 -8
- package/mysql-core/dialect.js +24 -30
- package/mysql-core/dialect.js.map +1 -1
- package/mysql-core/query-builders/delete.cjs +1 -8
- package/mysql-core/query-builders/delete.cjs.map +1 -1
- package/mysql-core/query-builders/delete.js +1 -8
- package/mysql-core/query-builders/delete.js.map +1 -1
- package/mysql-core/query-builders/insert.cjs +6 -30
- package/mysql-core/query-builders/insert.cjs.map +1 -1
- package/mysql-core/query-builders/insert.js +8 -32
- package/mysql-core/query-builders/insert.js.map +1 -1
- package/mysql-core/query-builders/query.cjs +3 -19
- package/mysql-core/query-builders/query.cjs.map +1 -1
- package/mysql-core/query-builders/query.js +3 -19
- package/mysql-core/query-builders/query.js.map +1 -1
- package/mysql-core/query-builders/select.cjs +6 -23
- package/mysql-core/query-builders/select.cjs.map +1 -1
- package/mysql-core/query-builders/select.js +6 -23
- package/mysql-core/query-builders/select.js.map +1 -1
- package/mysql-core/query-builders/update.cjs +3 -15
- package/mysql-core/query-builders/update.cjs.map +1 -1
- package/mysql-core/query-builders/update.js +3 -15
- package/mysql-core/query-builders/update.js.map +1 -1
- package/mysql-core/session.cjs +4 -43
- package/mysql-core/session.cjs.map +1 -1
- package/mysql-core/session.d.cts +7 -14
- package/mysql-core/session.d.ts +7 -14
- package/mysql-core/session.js +4 -43
- package/mysql-core/session.js.map +1 -1
- package/mysql-proxy/driver.cjs +2 -3
- package/mysql-proxy/driver.cjs.map +1 -1
- package/mysql-proxy/driver.d.cts +1 -2
- package/mysql-proxy/driver.d.ts +1 -2
- package/mysql-proxy/driver.js +2 -3
- package/mysql-proxy/driver.js.map +1 -1
- package/mysql-proxy/session.cjs +8 -8
- package/mysql-proxy/session.cjs.map +1 -1
- package/mysql-proxy/session.d.cts +6 -5
- package/mysql-proxy/session.d.ts +6 -5
- package/mysql-proxy/session.js +8 -8
- package/mysql-proxy/session.js.map +1 -1
- package/mysql2/driver.cjs +4 -11
- package/mysql2/driver.cjs.map +1 -1
- package/mysql2/driver.d.cts +2 -4
- package/mysql2/driver.d.ts +2 -4
- package/mysql2/driver.js +4 -11
- package/mysql2/driver.js.map +1 -1
- package/mysql2/session.cjs +10 -14
- package/mysql2/session.cjs.map +1 -1
- package/mysql2/session.d.cts +5 -5
- package/mysql2/session.d.ts +5 -5
- package/mysql2/session.js +10 -14
- package/mysql2/session.js.map +1 -1
- package/neon-http/driver.cjs +3 -5
- package/neon-http/driver.cjs.map +1 -1
- package/neon-http/driver.d.cts +4 -6
- package/neon-http/driver.d.ts +4 -6
- package/neon-http/driver.js +3 -5
- package/neon-http/driver.js.map +1 -1
- package/neon-http/session.cjs +6 -8
- package/neon-http/session.cjs.map +1 -1
- package/neon-http/session.d.cts +4 -5
- package/neon-http/session.d.ts +4 -5
- package/neon-http/session.js +6 -8
- package/neon-http/session.js.map +1 -1
- package/neon-serverless/driver.cjs +4 -6
- package/neon-serverless/driver.cjs.map +1 -1
- package/neon-serverless/driver.d.cts +4 -6
- package/neon-serverless/driver.d.ts +4 -6
- package/neon-serverless/driver.js +4 -6
- package/neon-serverless/driver.js.map +1 -1
- package/neon-serverless/session.cjs +9 -23
- package/neon-serverless/session.cjs.map +1 -1
- package/neon-serverless/session.d.cts +4 -5
- package/neon-serverless/session.d.ts +4 -5
- package/neon-serverless/session.js +9 -23
- package/neon-serverless/session.js.map +1 -1
- package/node-postgres/driver.cjs +4 -6
- package/node-postgres/driver.cjs.map +1 -1
- package/node-postgres/driver.d.cts +4 -6
- package/node-postgres/driver.d.ts +4 -6
- package/node-postgres/driver.js +4 -6
- package/node-postgres/driver.js.map +1 -1
- package/node-postgres/session.cjs +9 -18
- package/node-postgres/session.cjs.map +1 -1
- package/node-postgres/session.d.cts +4 -5
- package/node-postgres/session.d.ts +4 -5
- package/node-postgres/session.js +9 -18
- package/node-postgres/session.js.map +1 -1
- package/op-sqlite/driver.cjs +2 -3
- package/op-sqlite/driver.cjs.map +1 -1
- package/op-sqlite/driver.d.cts +1 -2
- package/op-sqlite/driver.d.ts +1 -2
- package/op-sqlite/driver.js +2 -3
- package/op-sqlite/driver.js.map +1 -1
- package/op-sqlite/session.cjs +11 -20
- package/op-sqlite/session.cjs.map +1 -1
- package/op-sqlite/session.d.cts +7 -8
- package/op-sqlite/session.d.ts +7 -8
- package/op-sqlite/session.js +11 -20
- package/op-sqlite/session.js.map +1 -1
- package/package.json +5 -351
- package/pg-core/columns/common.cjs +0 -2
- package/pg-core/columns/common.cjs.map +1 -1
- package/pg-core/columns/common.js +0 -2
- package/pg-core/columns/common.js.map +1 -1
- package/pg-core/db.cjs +3 -5
- package/pg-core/db.cjs.map +1 -1
- package/pg-core/db.d.cts +1 -3
- package/pg-core/db.d.ts +1 -3
- package/pg-core/db.js +3 -5
- package/pg-core/db.js.map +1 -1
- package/pg-core/dialect.cjs +19 -25
- package/pg-core/dialect.cjs.map +1 -1
- package/pg-core/dialect.d.cts +6 -7
- package/pg-core/dialect.d.ts +6 -7
- package/pg-core/dialect.js +20 -26
- package/pg-core/dialect.js.map +1 -1
- package/pg-core/query-builders/delete.cjs +5 -19
- package/pg-core/query-builders/delete.cjs.map +1 -1
- package/pg-core/query-builders/delete.js +5 -19
- package/pg-core/query-builders/delete.js.map +1 -1
- package/pg-core/query-builders/insert.cjs +9 -49
- package/pg-core/query-builders/insert.cjs.map +1 -1
- package/pg-core/query-builders/insert.js +11 -51
- package/pg-core/query-builders/insert.js.map +1 -1
- package/pg-core/query-builders/query.cjs +2 -15
- package/pg-core/query-builders/query.cjs.map +1 -1
- package/pg-core/query-builders/query.js +2 -15
- package/pg-core/query-builders/query.js.map +1 -1
- package/pg-core/query-builders/select.cjs +7 -23
- package/pg-core/query-builders/select.cjs.map +1 -1
- package/pg-core/query-builders/select.js +7 -23
- package/pg-core/query-builders/select.js.map +1 -1
- package/pg-core/query-builders/update.cjs +6 -20
- package/pg-core/query-builders/update.cjs.map +1 -1
- package/pg-core/query-builders/update.js +6 -20
- package/pg-core/query-builders/update.js.map +1 -1
- package/pg-core/session.cjs +4 -48
- package/pg-core/session.cjs.map +1 -1
- package/pg-core/session.d.cts +5 -11
- package/pg-core/session.d.ts +5 -11
- package/pg-core/session.js +4 -48
- package/pg-core/session.js.map +1 -1
- package/pg-proxy/driver.cjs +2 -3
- package/pg-proxy/driver.cjs.map +1 -1
- package/pg-proxy/driver.d.cts +1 -2
- package/pg-proxy/driver.d.ts +1 -2
- package/pg-proxy/driver.js +2 -3
- package/pg-proxy/driver.js.map +1 -1
- package/pg-proxy/session.cjs +6 -8
- package/pg-proxy/session.cjs.map +1 -1
- package/pg-proxy/session.d.cts +4 -5
- package/pg-proxy/session.d.ts +4 -5
- package/pg-proxy/session.js +6 -8
- package/pg-proxy/session.js.map +1 -1
- package/pglite/driver.cjs +4 -6
- package/pglite/driver.cjs.map +1 -1
- package/pglite/driver.d.cts +4 -6
- package/pglite/driver.d.ts +4 -6
- package/pglite/driver.js +4 -6
- package/pglite/driver.js.map +1 -1
- package/pglite/session.cjs +9 -19
- package/pglite/session.cjs.map +1 -1
- package/pglite/session.d.cts +4 -5
- package/pglite/session.d.ts +4 -5
- package/pglite/session.js +9 -19
- package/pglite/session.js.map +1 -1
- package/planetscale-serverless/driver.cjs +2 -10
- package/planetscale-serverless/driver.cjs.map +1 -1
- package/planetscale-serverless/driver.d.cts +3 -4
- package/planetscale-serverless/driver.d.ts +3 -4
- package/planetscale-serverless/driver.js +2 -10
- package/planetscale-serverless/driver.js.map +1 -1
- package/planetscale-serverless/session.cjs +13 -23
- package/planetscale-serverless/session.cjs.map +1 -1
- package/planetscale-serverless/session.d.cts +7 -6
- package/planetscale-serverless/session.d.ts +7 -6
- package/planetscale-serverless/session.js +13 -23
- package/planetscale-serverless/session.js.map +1 -1
- package/postgres-js/driver.cjs +2 -3
- package/postgres-js/driver.cjs.map +1 -1
- package/postgres-js/driver.d.cts +3 -4
- package/postgres-js/driver.d.ts +3 -4
- package/postgres-js/driver.js +2 -3
- package/postgres-js/driver.js.map +1 -1
- package/postgres-js/session.cjs +16 -27
- package/postgres-js/session.cjs.map +1 -1
- package/postgres-js/session.d.cts +5 -6
- package/postgres-js/session.d.ts +5 -6
- package/postgres-js/session.js +16 -27
- package/postgres-js/session.js.map +1 -1
- package/prisma/mysql/driver.cjs +3 -3
- package/prisma/mysql/driver.cjs.map +1 -1
- package/prisma/mysql/driver.d.cts +2 -3
- package/prisma/mysql/driver.d.ts +2 -3
- package/prisma/mysql/driver.js +3 -3
- package/prisma/mysql/driver.js.map +1 -1
- package/prisma/mysql/session.cjs +11 -10
- package/prisma/mysql/session.cjs.map +1 -1
- package/prisma/mysql/session.d.cts +5 -10
- package/prisma/mysql/session.d.ts +5 -10
- package/prisma/mysql/session.js +11 -10
- package/prisma/mysql/session.js.map +1 -1
- package/prisma/pg/driver.cjs +3 -3
- package/prisma/pg/driver.cjs.map +1 -1
- package/prisma/pg/driver.d.cts +1 -2
- package/prisma/pg/driver.d.ts +1 -2
- package/prisma/pg/driver.js +3 -3
- package/prisma/pg/driver.js.map +1 -1
- package/prisma/pg/session.cjs +7 -7
- package/prisma/pg/session.cjs.map +1 -1
- package/prisma/pg/session.d.cts +5 -10
- package/prisma/pg/session.d.ts +5 -10
- package/prisma/pg/session.js +7 -7
- package/prisma/pg/session.js.map +1 -1
- package/prisma/sqlite/driver.cjs +1 -7
- package/prisma/sqlite/driver.cjs.map +1 -1
- package/prisma/sqlite/driver.d.cts +1 -2
- package/prisma/sqlite/driver.d.ts +1 -2
- package/prisma/sqlite/driver.js +1 -7
- package/prisma/sqlite/driver.js.map +1 -1
- package/prisma/sqlite/session.cjs +10 -10
- package/prisma/sqlite/session.cjs.map +1 -1
- package/prisma/sqlite/session.d.cts +7 -12
- package/prisma/sqlite/session.d.ts +7 -12
- package/prisma/sqlite/session.js +10 -10
- package/prisma/sqlite/session.js.map +1 -1
- package/singlestore/driver.cjs +25 -34
- package/singlestore/driver.cjs.map +1 -1
- package/singlestore/driver.d.cts +2 -4
- package/singlestore/driver.d.ts +2 -4
- package/singlestore/driver.js +25 -34
- package/singlestore/driver.js.map +1 -1
- package/singlestore/session.cjs +10 -14
- package/singlestore/session.cjs.map +1 -1
- package/singlestore/session.d.cts +5 -5
- package/singlestore/session.d.ts +5 -5
- package/singlestore/session.js +10 -14
- package/singlestore/session.js.map +1 -1
- package/singlestore-core/db.cjs +3 -5
- package/singlestore-core/db.cjs.map +1 -1
- package/singlestore-core/db.d.cts +1 -3
- package/singlestore-core/db.d.ts +1 -3
- package/singlestore-core/db.js +3 -5
- package/singlestore-core/db.js.map +1 -1
- package/singlestore-core/dialect.cjs +18 -24
- package/singlestore-core/dialect.cjs.map +1 -1
- package/singlestore-core/dialect.d.cts +6 -7
- package/singlestore-core/dialect.d.ts +6 -7
- package/singlestore-core/dialect.js +19 -25
- package/singlestore-core/dialect.js.map +1 -1
- package/singlestore-core/query-builders/delete.cjs +1 -8
- package/singlestore-core/query-builders/delete.cjs.map +1 -1
- package/singlestore-core/query-builders/delete.js +1 -8
- package/singlestore-core/query-builders/delete.js.map +1 -1
- package/singlestore-core/query-builders/insert.cjs +5 -30
- package/singlestore-core/query-builders/insert.cjs.map +1 -1
- package/singlestore-core/query-builders/insert.js +7 -32
- package/singlestore-core/query-builders/insert.js.map +1 -1
- package/singlestore-core/query-builders/query.cjs +2 -17
- package/singlestore-core/query-builders/query.cjs.map +1 -1
- package/singlestore-core/query-builders/query.js +2 -17
- package/singlestore-core/query-builders/query.js.map +1 -1
- package/singlestore-core/query-builders/select.cjs +7 -24
- package/singlestore-core/query-builders/select.cjs.map +1 -1
- package/singlestore-core/query-builders/select.js +7 -24
- package/singlestore-core/query-builders/select.js.map +1 -1
- package/singlestore-core/query-builders/update.cjs +2 -9
- package/singlestore-core/query-builders/update.cjs.map +1 -1
- package/singlestore-core/query-builders/update.js +2 -9
- package/singlestore-core/query-builders/update.js.map +1 -1
- package/singlestore-core/session.cjs +4 -43
- package/singlestore-core/session.cjs.map +1 -1
- package/singlestore-core/session.d.cts +6 -14
- package/singlestore-core/session.d.ts +6 -14
- package/singlestore-core/session.js +4 -43
- package/singlestore-core/session.js.map +1 -1
- package/singlestore-proxy/driver.cjs +2 -3
- package/singlestore-proxy/driver.cjs.map +1 -1
- package/singlestore-proxy/driver.d.cts +1 -2
- package/singlestore-proxy/driver.d.ts +1 -2
- package/singlestore-proxy/driver.js +2 -3
- package/singlestore-proxy/driver.js.map +1 -1
- package/singlestore-proxy/session.cjs +8 -8
- package/singlestore-proxy/session.cjs.map +1 -1
- package/singlestore-proxy/session.d.cts +6 -9
- package/singlestore-proxy/session.d.ts +6 -9
- package/singlestore-proxy/session.js +8 -8
- package/singlestore-proxy/session.js.map +1 -1
- package/sql/sql.cjs +2 -24
- package/sql/sql.cjs.map +1 -1
- package/sql/sql.d.cts +0 -12
- package/sql/sql.d.ts +0 -12
- package/sql/sql.js +2 -23
- package/sql/sql.js.map +1 -1
- package/sql-js/driver.cjs.map +1 -1
- package/sql-js/driver.d.cts +1 -2
- package/sql-js/driver.d.ts +1 -2
- package/sql-js/driver.js.map +1 -1
- package/sql-js/session.cjs +4 -4
- package/sql-js/session.cjs.map +1 -1
- package/sql-js/session.d.cts +4 -4
- package/sql-js/session.d.ts +4 -4
- package/sql-js/session.js +4 -4
- package/sql-js/session.js.map +1 -1
- package/sqlite-core/db.cjs +3 -5
- package/sqlite-core/db.cjs.map +1 -1
- package/sqlite-core/db.d.cts +1 -3
- package/sqlite-core/db.d.ts +1 -3
- package/sqlite-core/db.js +3 -5
- package/sqlite-core/db.js.map +1 -1
- package/sqlite-core/dialect.cjs +19 -29
- package/sqlite-core/dialect.cjs.map +1 -1
- package/sqlite-core/dialect.d.cts +6 -7
- package/sqlite-core/dialect.d.ts +6 -7
- package/sqlite-core/dialect.js +20 -30
- package/sqlite-core/dialect.js.map +1 -1
- package/sqlite-core/query-builders/delete.cjs +1 -8
- package/sqlite-core/query-builders/delete.cjs.map +1 -1
- package/sqlite-core/query-builders/delete.js +1 -8
- package/sqlite-core/query-builders/delete.js.map +1 -1
- package/sqlite-core/query-builders/insert.cjs +4 -28
- package/sqlite-core/query-builders/insert.cjs.map +1 -1
- package/sqlite-core/query-builders/insert.js +6 -35
- package/sqlite-core/query-builders/insert.js.map +1 -1
- package/sqlite-core/query-builders/query.cjs +2 -15
- package/sqlite-core/query-builders/query.cjs.map +1 -1
- package/sqlite-core/query-builders/query.js +2 -15
- package/sqlite-core/query-builders/query.js.map +1 -1
- package/sqlite-core/query-builders/select.cjs +6 -15
- package/sqlite-core/query-builders/select.cjs.map +1 -1
- package/sqlite-core/query-builders/select.js +6 -15
- package/sqlite-core/query-builders/select.js.map +1 -1
- package/sqlite-core/query-builders/update.cjs +2 -9
- package/sqlite-core/query-builders/update.cjs.map +1 -1
- package/sqlite-core/query-builders/update.js +2 -9
- package/sqlite-core/query-builders/update.js.map +1 -1
- package/sqlite-core/session.cjs +6 -81
- package/sqlite-core/session.cjs.map +1 -1
- package/sqlite-core/session.d.cts +9 -19
- package/sqlite-core/session.d.ts +9 -19
- package/sqlite-core/session.js +6 -81
- package/sqlite-core/session.js.map +1 -1
- package/sqlite-proxy/driver.cjs +3 -4
- package/sqlite-proxy/driver.cjs.map +1 -1
- package/sqlite-proxy/driver.d.cts +2 -3
- package/sqlite-proxy/driver.d.ts +2 -3
- package/sqlite-proxy/driver.js +3 -4
- package/sqlite-proxy/driver.js.map +1 -1
- package/sqlite-proxy/session.cjs +11 -20
- package/sqlite-proxy/session.cjs.map +1 -1
- package/sqlite-proxy/session.d.cts +7 -8
- package/sqlite-proxy/session.d.ts +7 -8
- package/sqlite-proxy/session.js +11 -20
- package/sqlite-proxy/session.js.map +1 -1
- package/tidb-serverless/driver.cjs +2 -16
- package/tidb-serverless/driver.cjs.map +1 -1
- package/tidb-serverless/driver.d.cts +3 -4
- package/tidb-serverless/driver.d.ts +3 -4
- package/tidb-serverless/driver.js +2 -16
- package/tidb-serverless/driver.js.map +1 -1
- package/tidb-serverless/session.cjs +13 -23
- package/tidb-serverless/session.cjs.map +1 -1
- package/tidb-serverless/session.d.cts +7 -6
- package/tidb-serverless/session.d.ts +7 -6
- package/tidb-serverless/session.js +13 -23
- package/tidb-serverless/session.js.map +1 -1
- package/tracing.cjs.map +1 -1
- package/tracing.js.map +1 -1
- package/utils.cjs +2 -38
- package/utils.cjs.map +1 -1
- package/utils.d.cts +2 -6
- package/utils.d.ts +2 -6
- package/utils.js +4 -39
- package/utils.js.map +1 -1
- package/vercel-postgres/driver.cjs +5 -10
- package/vercel-postgres/driver.cjs.map +1 -1
- package/vercel-postgres/driver.d.cts +4 -6
- package/vercel-postgres/driver.d.ts +4 -6
- package/vercel-postgres/driver.js +5 -10
- package/vercel-postgres/driver.js.map +1 -1
- package/vercel-postgres/session.cjs +9 -18
- package/vercel-postgres/session.cjs.map +1 -1
- package/vercel-postgres/session.d.cts +4 -5
- package/vercel-postgres/session.d.ts +4 -5
- package/vercel-postgres/session.js +9 -18
- package/vercel-postgres/session.js.map +1 -1
- package/version.cjs +1 -1
- package/version.d.cts +1 -1
- package/version.d.ts +1 -1
- package/version.js +1 -1
- package/xata-http/driver.cjs +4 -7
- package/xata-http/driver.cjs.map +1 -1
- package/xata-http/driver.d.cts +2 -4
- package/xata-http/driver.d.ts +2 -4
- package/xata-http/driver.js +4 -7
- package/xata-http/driver.js.map +1 -1
- package/xata-http/session.cjs +6 -8
- package/xata-http/session.cjs.map +1 -1
- package/xata-http/session.d.cts +4 -5
- package/xata-http/session.d.ts +4 -5
- package/xata-http/session.js +6 -8
- package/xata-http/session.js.map +1 -1
- package/extension-core/gel/index.cjs +0 -33
- package/extension-core/gel/index.cjs.map +0 -1
- package/extension-core/gel/index.d.cts +0 -67
- package/extension-core/gel/index.d.ts +0 -67
- package/extension-core/gel/index.js +0 -9
- package/extension-core/gel/index.js.map +0 -1
- package/extension-core/index.cjs +0 -42
- package/extension-core/index.cjs.map +0 -1
- package/extension-core/index.d.cts +0 -9
- package/extension-core/index.d.ts +0 -9
- package/extension-core/index.js +0 -15
- package/extension-core/index.js.map +0 -1
- package/extension-core/mysql/index.cjs +0 -33
- package/extension-core/mysql/index.cjs.map +0 -1
- package/extension-core/mysql/index.d.cts +0 -69
- package/extension-core/mysql/index.d.ts +0 -69
- package/extension-core/mysql/index.js +0 -9
- package/extension-core/mysql/index.js.map +0 -1
- package/extension-core/pg/index.cjs +0 -33
- package/extension-core/pg/index.cjs.map +0 -1
- package/extension-core/pg/index.d.cts +0 -67
- package/extension-core/pg/index.d.ts +0 -67
- package/extension-core/pg/index.js +0 -9
- package/extension-core/pg/index.js.map +0 -1
- package/extension-core/singlestore/index.cjs +0 -33
- package/extension-core/singlestore/index.cjs.map +0 -1
- package/extension-core/singlestore/index.d.cts +0 -67
- package/extension-core/singlestore/index.d.ts +0 -67
- package/extension-core/singlestore/index.js +0 -9
- package/extension-core/singlestore/index.js.map +0 -1
- package/extension-core/sqlite/index.cjs +0 -33
- package/extension-core/sqlite/index.cjs.map +0 -1
- package/extension-core/sqlite/index.d.cts +0 -68
- package/extension-core/sqlite/index.d.ts +0 -68
- package/extension-core/sqlite/index.js +0 -9
- package/extension-core/sqlite/index.js.map +0 -1
- package/extensions/hook/gel/index.cjs +0 -47
- package/extensions/hook/gel/index.cjs.map +0 -1
- package/extensions/hook/gel/index.d.cts +0 -11
- package/extensions/hook/gel/index.d.ts +0 -11
- package/extensions/hook/gel/index.js +0 -22
- package/extensions/hook/gel/index.js.map +0 -1
- package/extensions/hook/mysql/index.cjs +0 -47
- package/extensions/hook/mysql/index.cjs.map +0 -1
- package/extensions/hook/mysql/index.d.cts +0 -11
- package/extensions/hook/mysql/index.d.ts +0 -11
- package/extensions/hook/mysql/index.js +0 -22
- package/extensions/hook/mysql/index.js.map +0 -1
- package/extensions/hook/pg/index.cjs +0 -47
- package/extensions/hook/pg/index.cjs.map +0 -1
- package/extensions/hook/pg/index.d.cts +0 -11
- package/extensions/hook/pg/index.d.ts +0 -11
- package/extensions/hook/pg/index.js +0 -22
- package/extensions/hook/pg/index.js.map +0 -1
- package/extensions/hook/singlestore/index.cjs +0 -47
- package/extensions/hook/singlestore/index.cjs.map +0 -1
- package/extensions/hook/singlestore/index.d.cts +0 -11
- package/extensions/hook/singlestore/index.d.ts +0 -11
- package/extensions/hook/singlestore/index.js +0 -22
- package/extensions/hook/singlestore/index.js.map +0 -1
- package/extensions/hook/sqlite/index.cjs +0 -47
- package/extensions/hook/sqlite/index.cjs.map +0 -1
- package/extensions/hook/sqlite/index.d.cts +0 -11
- package/extensions/hook/sqlite/index.d.ts +0 -11
- package/extensions/hook/sqlite/index.js +0 -22
- package/extensions/hook/sqlite/index.js.map +0 -1
- package/extensions/s3-file/common.cjs +0 -313
- package/extensions/s3-file/common.cjs.map +0 -1
- package/extensions/s3-file/common.d.cts +0 -88
- package/extensions/s3-file/common.d.ts +0 -88
- package/extensions/s3-file/common.js +0 -280
- package/extensions/s3-file/common.js.map +0 -1
- package/extensions/s3-file/gel/column.cjs +0 -113
- package/extensions/s3-file/gel/column.cjs.map +0 -1
- package/extensions/s3-file/gel/column.d.cts +0 -105
- package/extensions/s3-file/gel/column.d.ts +0 -105
- package/extensions/s3-file/gel/column.js +0 -92
- package/extensions/s3-file/gel/column.js.map +0 -1
- package/extensions/s3-file/gel/extension.cjs +0 -262
- package/extensions/s3-file/gel/extension.cjs.map +0 -1
- package/extensions/s3-file/gel/extension.d.cts +0 -18
- package/extensions/s3-file/gel/extension.d.ts +0 -18
- package/extensions/s3-file/gel/extension.js +0 -248
- package/extensions/s3-file/gel/extension.js.map +0 -1
- package/extensions/s3-file/gel/index.cjs +0 -25
- package/extensions/s3-file/gel/index.cjs.map +0 -1
- package/extensions/s3-file/gel/index.d.cts +0 -2
- package/extensions/s3-file/gel/index.d.ts +0 -2
- package/extensions/s3-file/gel/index.js +0 -3
- package/extensions/s3-file/gel/index.js.map +0 -1
- package/extensions/s3-file/index.cjs +0 -23
- package/extensions/s3-file/index.cjs.map +0 -1
- package/extensions/s3-file/index.d.cts +0 -1
- package/extensions/s3-file/index.d.ts +0 -1
- package/extensions/s3-file/index.js +0 -2
- package/extensions/s3-file/index.js.map +0 -1
- package/extensions/s3-file/mysql/column.cjs +0 -110
- package/extensions/s3-file/mysql/column.cjs.map +0 -1
- package/extensions/s3-file/mysql/column.d.cts +0 -63
- package/extensions/s3-file/mysql/column.d.ts +0 -63
- package/extensions/s3-file/mysql/column.js +0 -86
- package/extensions/s3-file/mysql/column.js.map +0 -1
- package/extensions/s3-file/mysql/extension.cjs +0 -242
- package/extensions/s3-file/mysql/extension.cjs.map +0 -1
- package/extensions/s3-file/mysql/extension.d.cts +0 -18
- package/extensions/s3-file/mysql/extension.d.ts +0 -18
- package/extensions/s3-file/mysql/extension.js +0 -228
- package/extensions/s3-file/mysql/extension.js.map +0 -1
- package/extensions/s3-file/mysql/index.cjs +0 -25
- package/extensions/s3-file/mysql/index.cjs.map +0 -1
- package/extensions/s3-file/mysql/index.d.cts +0 -2
- package/extensions/s3-file/mysql/index.d.ts +0 -2
- package/extensions/s3-file/mysql/index.js +0 -3
- package/extensions/s3-file/mysql/index.js.map +0 -1
- package/extensions/s3-file/pg/column.cjs +0 -113
- package/extensions/s3-file/pg/column.cjs.map +0 -1
- package/extensions/s3-file/pg/column.d.cts +0 -105
- package/extensions/s3-file/pg/column.d.ts +0 -105
- package/extensions/s3-file/pg/column.js +0 -92
- package/extensions/s3-file/pg/column.js.map +0 -1
- package/extensions/s3-file/pg/extension.cjs +0 -264
- package/extensions/s3-file/pg/extension.cjs.map +0 -1
- package/extensions/s3-file/pg/extension.d.cts +0 -18
- package/extensions/s3-file/pg/extension.d.ts +0 -18
- package/extensions/s3-file/pg/extension.js +0 -250
- package/extensions/s3-file/pg/extension.js.map +0 -1
- package/extensions/s3-file/pg/index.cjs +0 -25
- package/extensions/s3-file/pg/index.cjs.map +0 -1
- package/extensions/s3-file/pg/index.d.cts +0 -2
- package/extensions/s3-file/pg/index.d.ts +0 -2
- package/extensions/s3-file/pg/index.js +0 -3
- package/extensions/s3-file/pg/index.js.map +0 -1
- package/extensions/s3-file/singlestore/column.cjs +0 -110
- package/extensions/s3-file/singlestore/column.cjs.map +0 -1
- package/extensions/s3-file/singlestore/column.d.cts +0 -63
- package/extensions/s3-file/singlestore/column.d.ts +0 -63
- package/extensions/s3-file/singlestore/column.js +0 -86
- package/extensions/s3-file/singlestore/column.js.map +0 -1
- package/extensions/s3-file/singlestore/extension.cjs +0 -239
- package/extensions/s3-file/singlestore/extension.cjs.map +0 -1
- package/extensions/s3-file/singlestore/extension.d.cts +0 -18
- package/extensions/s3-file/singlestore/extension.d.ts +0 -18
- package/extensions/s3-file/singlestore/extension.js +0 -225
- package/extensions/s3-file/singlestore/extension.js.map +0 -1
- package/extensions/s3-file/singlestore/index.cjs +0 -25
- package/extensions/s3-file/singlestore/index.cjs.map +0 -1
- package/extensions/s3-file/singlestore/index.d.cts +0 -2
- package/extensions/s3-file/singlestore/index.d.ts +0 -2
- package/extensions/s3-file/singlestore/index.js +0 -3
- package/extensions/s3-file/singlestore/index.js.map +0 -1
- package/extensions/s3-file/sqlite/column.cjs +0 -110
- package/extensions/s3-file/sqlite/column.cjs.map +0 -1
- package/extensions/s3-file/sqlite/column.d.cts +0 -63
- package/extensions/s3-file/sqlite/column.d.ts +0 -63
- package/extensions/s3-file/sqlite/column.js +0 -86
- package/extensions/s3-file/sqlite/column.js.map +0 -1
- package/extensions/s3-file/sqlite/extension.cjs +0 -242
- package/extensions/s3-file/sqlite/extension.cjs.map +0 -1
- package/extensions/s3-file/sqlite/extension.d.cts +0 -18
- package/extensions/s3-file/sqlite/extension.d.ts +0 -18
- package/extensions/s3-file/sqlite/extension.js +0 -228
- package/extensions/s3-file/sqlite/extension.js.map +0 -1
- package/extensions/s3-file/sqlite/index.cjs +0 -25
- package/extensions/s3-file/sqlite/index.cjs.map +0 -1
- package/extensions/s3-file/sqlite/index.d.cts +0 -2
- package/extensions/s3-file/sqlite/index.d.ts +0 -2
- package/extensions/s3-file/sqlite/index.js +0 -3
- package/extensions/s3-file/sqlite/index.js.map +0 -1
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import { entityKind, is } from "../../entity.js";
|
|
2
|
-
import { requiredExtension } from "../../extension-core/index.js";
|
|
3
2
|
import { QueryPromise } from "../../query-promise.js";
|
|
4
|
-
import {
|
|
3
|
+
import { Param, SQL, sql } from "../../sql/sql.js";
|
|
5
4
|
import { Columns, Table } from "../../table.js";
|
|
6
|
-
import {
|
|
5
|
+
import { haveSameKeys, mapUpdateSet } from "../../utils.js";
|
|
7
6
|
import { extractUsedTable } from "../utils.js";
|
|
8
7
|
import { QueryBuilder } from "./query-builder.js";
|
|
9
8
|
class MySqlInsertBuilder {
|
|
@@ -23,28 +22,15 @@ class MySqlInsertBuilder {
|
|
|
23
22
|
if (values.length === 0) {
|
|
24
23
|
throw new Error("values() must be called with at least one value");
|
|
25
24
|
}
|
|
26
|
-
const extColumns = /* @__PURE__ */ new Set();
|
|
27
|
-
const cols = this.table[Table.Symbol.Columns];
|
|
28
25
|
const mappedValues = values.map((entry) => {
|
|
29
26
|
const result = {};
|
|
27
|
+
const cols = this.table[Table.Symbol.Columns];
|
|
30
28
|
for (const colKey of Object.keys(entry)) {
|
|
31
29
|
const colValue = entry[colKey];
|
|
32
|
-
|
|
33
|
-
result[colKey] = colValue;
|
|
34
|
-
continue;
|
|
35
|
-
}
|
|
36
|
-
if (cols[colKey][requiredExtension]) {
|
|
37
|
-
extColumns.add(colKey);
|
|
38
|
-
result[colKey] = new ExtensionParam(cols[colKey][requiredExtension], colValue, cols[colKey]);
|
|
39
|
-
continue;
|
|
40
|
-
}
|
|
41
|
-
result[colKey] = new Param(colValue, cols[colKey]);
|
|
30
|
+
result[colKey] = is(colValue, SQL) ? colValue : new Param(colValue, cols[colKey]);
|
|
42
31
|
}
|
|
43
32
|
return result;
|
|
44
33
|
});
|
|
45
|
-
for (const colKey of extColumns.values()) {
|
|
46
|
-
columnExtensionsCheck(cols[colKey], this.session.extensions);
|
|
47
|
-
}
|
|
48
34
|
return new MySqlInsertBase(this.table, mappedValues, this.shouldIgnore, this.session, this.dialect);
|
|
49
35
|
}
|
|
50
36
|
select(selectQuery) {
|
|
@@ -94,11 +80,7 @@ class MySqlInsertBase extends QueryPromise {
|
|
|
94
80
|
* ```
|
|
95
81
|
*/
|
|
96
82
|
onDuplicateKeyUpdate(config) {
|
|
97
|
-
const setSql = this.dialect.buildUpdateSet(
|
|
98
|
-
this.config.table,
|
|
99
|
-
mapUpdateSet(this.config.table, config.set, this.session.extensions),
|
|
100
|
-
this.session.extensions
|
|
101
|
-
);
|
|
83
|
+
const setSql = this.dialect.buildUpdateSet(this.config.table, mapUpdateSet(this.config.table, config.set));
|
|
102
84
|
this.config.onConflict = sql`update ${setSql}`;
|
|
103
85
|
return this;
|
|
104
86
|
}
|
|
@@ -114,14 +96,14 @@ class MySqlInsertBase extends QueryPromise {
|
|
|
114
96
|
}
|
|
115
97
|
/** @internal */
|
|
116
98
|
getSQL() {
|
|
117
|
-
return this.dialect.buildInsertQuery(this.config
|
|
99
|
+
return this.dialect.buildInsertQuery(this.config).sql;
|
|
118
100
|
}
|
|
119
101
|
toSQL() {
|
|
120
102
|
const { typings: _typings, ...rest } = this.dialect.sqlToQuery(this.getSQL());
|
|
121
103
|
return rest;
|
|
122
104
|
}
|
|
123
105
|
prepare() {
|
|
124
|
-
const { sql: sql2, generatedIds } = this.dialect.buildInsertQuery(this.config
|
|
106
|
+
const { sql: sql2, generatedIds } = this.dialect.buildInsertQuery(this.config);
|
|
125
107
|
return this.session.prepareQuery(
|
|
126
108
|
this.dialect.sqlToQuery(sql2),
|
|
127
109
|
void 0,
|
|
@@ -132,13 +114,7 @@ class MySqlInsertBase extends QueryPromise {
|
|
|
132
114
|
type: "insert",
|
|
133
115
|
tables: extractUsedTable(this.config.table)
|
|
134
116
|
},
|
|
135
|
-
this.cacheConfig
|
|
136
|
-
{
|
|
137
|
-
query: "insert",
|
|
138
|
-
dialect: this.dialect,
|
|
139
|
-
session: this.session,
|
|
140
|
-
config: this.config
|
|
141
|
-
}
|
|
117
|
+
this.cacheConfig
|
|
142
118
|
);
|
|
143
119
|
}
|
|
144
120
|
execute = (placeholderValues) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/mysql-core/query-builders/insert.ts"],"sourcesContent":["import type { WithCacheConfig } from '~/cache/core/types.ts';\nimport { entityKind, is } from '~/entity.ts';\nimport { requiredExtension } from '~/extension-core/index.ts';\nimport type { MySqlDialect } from '~/mysql-core/dialect.ts';\nimport type {\n\tAnyMySqlQueryResultHKT,\n\tMySqlPreparedQueryConfig,\n\tMySqlQueryResultHKT,\n\tMySqlQueryResultKind,\n\tMySqlSession,\n\tPreparedQueryHKTBase,\n\tPreparedQueryKind,\n} from '~/mysql-core/session.ts';\nimport type { MySqlTable } from '~/mysql-core/table.ts';\nimport type { TypedQueryBuilder } from '~/query-builders/query-builder.ts';\nimport { QueryPromise } from '~/query-promise.ts';\nimport type { RunnableQuery } from '~/runnable-query.ts';\nimport type { Placeholder, Query, SQLWrapper } from '~/sql/sql.ts';\nimport { ExtensionParam, Param, SQL, sql } from '~/sql/sql.ts';\nimport type { InferModelFromColumns } from '~/table.ts';\nimport { Columns, Table } from '~/table.ts';\nimport { columnExtensionsCheck, haveSameKeys, mapUpdateSet } from '~/utils.ts';\nimport type { AnyMySqlColumn } from '../columns/common.ts';\nimport { extractUsedTable } from '../utils.ts';\nimport { QueryBuilder } from './query-builder.ts';\nimport type { SelectedFieldsOrdered } from './select.types.ts';\nimport type { MySqlUpdateSetSource } from './update.ts';\n\nexport interface MySqlInsertConfig<TTable extends MySqlTable = MySqlTable> {\n\ttable: TTable;\n\tvalues: Record<string, Param | SQL>[] | MySqlInsertSelectQueryBuilder<TTable> | SQL;\n\tignore: boolean;\n\tonConflict?: SQL;\n\treturning?: SelectedFieldsOrdered;\n\tselect?: boolean;\n}\n\nexport type AnyMySqlInsertConfig = MySqlInsertConfig<MySqlTable>;\n\nexport type MySqlInsertValue<TTable extends MySqlTable> =\n\t& {\n\t\t[Key in keyof TTable['$inferInsert']]: TTable['$inferInsert'][Key] | SQL | Placeholder;\n\t}\n\t& {};\n\nexport type MySqlInsertSelectQueryBuilder<TTable extends MySqlTable> = TypedQueryBuilder<\n\t{ [K in keyof TTable['$inferInsert']]: AnyMySqlColumn | SQL | SQL.Aliased | TTable['$inferInsert'][K] }\n>;\n\nexport class MySqlInsertBuilder<\n\tTTable extends MySqlTable,\n\tTQueryResult extends MySqlQueryResultHKT,\n\tTPreparedQueryHKT extends PreparedQueryHKTBase,\n> {\n\tstatic readonly [entityKind]: string = 'MySqlInsertBuilder';\n\n\tprivate shouldIgnore = false;\n\n\tconstructor(\n\t\tprivate table: TTable,\n\t\tprivate session: MySqlSession,\n\t\tprivate dialect: MySqlDialect,\n\t) {}\n\n\tignore(): this {\n\t\tthis.shouldIgnore = true;\n\t\treturn this;\n\t}\n\n\tvalues(value: MySqlInsertValue<TTable>): MySqlInsertBase<TTable, TQueryResult, TPreparedQueryHKT>;\n\tvalues(values: MySqlInsertValue<TTable>[]): MySqlInsertBase<TTable, TQueryResult, TPreparedQueryHKT>;\n\tvalues(\n\t\tvalues: MySqlInsertValue<TTable> | MySqlInsertValue<TTable>[],\n\t): MySqlInsertBase<TTable, TQueryResult, TPreparedQueryHKT> {\n\t\tvalues = Array.isArray(values) ? values : [values];\n\t\tif (values.length === 0) {\n\t\t\tthrow new Error('values() must be called with at least one value');\n\t\t}\n\n\t\tconst extColumns = new Set<string>();\n\t\tconst cols = this.table[Table.Symbol.Columns];\n\n\t\tconst mappedValues = values.map((entry) => {\n\t\t\tconst result: Record<string, Param | SQL> = {};\n\t\t\tfor (const colKey of Object.keys(entry)) {\n\t\t\t\tconst colValue = entry[colKey as keyof typeof entry];\n\n\t\t\t\tif (is(colValue, SQL)) {\n\t\t\t\t\tresult[colKey] = colValue;\n\t\t\t\t\tcontinue;\n\t\t\t\t}\n\n\t\t\t\tif (cols[colKey]![requiredExtension]) {\n\t\t\t\t\textColumns.add(colKey);\n\t\t\t\t\tresult[colKey] = new ExtensionParam(cols[colKey]![requiredExtension], colValue, cols[colKey]);\n\n\t\t\t\t\tcontinue;\n\t\t\t\t}\n\n\t\t\t\tresult[colKey] = new Param(colValue, cols[colKey]);\n\t\t\t}\n\t\t\treturn result;\n\t\t});\n\n\t\tfor (const colKey of extColumns.values()) {\n\t\t\tcolumnExtensionsCheck(cols[colKey]!, this.session.extensions);\n\t\t}\n\n\t\treturn new MySqlInsertBase(this.table, mappedValues, this.shouldIgnore, this.session, this.dialect);\n\t}\n\n\tselect(\n\t\tselectQuery: (qb: QueryBuilder) => MySqlInsertSelectQueryBuilder<TTable>,\n\t): MySqlInsertBase<TTable, TQueryResult, TPreparedQueryHKT>;\n\tselect(selectQuery: (qb: QueryBuilder) => SQL): MySqlInsertBase<TTable, TQueryResult, TPreparedQueryHKT>;\n\tselect(selectQuery: SQL): MySqlInsertBase<TTable, TQueryResult, TPreparedQueryHKT>;\n\tselect(selectQuery: MySqlInsertSelectQueryBuilder<TTable>): MySqlInsertBase<TTable, TQueryResult, TPreparedQueryHKT>;\n\tselect(\n\t\tselectQuery:\n\t\t\t| SQL\n\t\t\t| MySqlInsertSelectQueryBuilder<TTable>\n\t\t\t| ((qb: QueryBuilder) => MySqlInsertSelectQueryBuilder<TTable> | SQL),\n\t): MySqlInsertBase<TTable, TQueryResult, TPreparedQueryHKT> {\n\t\tconst select = typeof selectQuery === 'function' ? selectQuery(new QueryBuilder()) : selectQuery;\n\n\t\tif (\n\t\t\t!is(select, SQL)\n\t\t\t&& !haveSameKeys(this.table[Columns], select._.selectedFields)\n\t\t) {\n\t\t\tthrow new Error(\n\t\t\t\t'Insert select error: selected fields are not the same or are in a different order compared to the table definition',\n\t\t\t);\n\t\t}\n\n\t\treturn new MySqlInsertBase(this.table, select, this.shouldIgnore, this.session, this.dialect, true);\n\t}\n}\n\nexport type MySqlInsertWithout<T extends AnyMySqlInsert, TDynamic extends boolean, K extends keyof T & string> =\n\tTDynamic extends true ? T\n\t\t: Omit<\n\t\t\tMySqlInsertBase<\n\t\t\t\tT['_']['table'],\n\t\t\t\tT['_']['queryResult'],\n\t\t\t\tT['_']['preparedQueryHKT'],\n\t\t\t\tT['_']['returning'],\n\t\t\t\tTDynamic,\n\t\t\t\tT['_']['excludedMethods'] | '$returning'\n\t\t\t>,\n\t\t\tT['_']['excludedMethods'] | K\n\t\t>;\n\nexport type MySqlInsertDynamic<T extends AnyMySqlInsert> = MySqlInsert<\n\tT['_']['table'],\n\tT['_']['queryResult'],\n\tT['_']['preparedQueryHKT'],\n\tT['_']['returning']\n>;\n\nexport type MySqlInsertPrepare<\n\tT extends AnyMySqlInsert,\n\tTReturning extends Record<string, unknown> | undefined = undefined,\n> = PreparedQueryKind<\n\tT['_']['preparedQueryHKT'],\n\tMySqlPreparedQueryConfig & {\n\t\texecute: TReturning extends undefined ? MySqlQueryResultKind<T['_']['queryResult'], never> : TReturning[];\n\t\titerator: never;\n\t},\n\ttrue\n>;\n\nexport type MySqlInsertOnDuplicateKeyUpdateConfig<T extends AnyMySqlInsert> = {\n\tset: MySqlUpdateSetSource<T['_']['table']>;\n};\n\nexport type MySqlInsert<\n\tTTable extends MySqlTable = MySqlTable,\n\tTQueryResult extends MySqlQueryResultHKT = AnyMySqlQueryResultHKT,\n\tTPreparedQueryHKT extends PreparedQueryHKTBase = PreparedQueryHKTBase,\n\tTReturning extends Record<string, unknown> | undefined = Record<string, unknown> | undefined,\n> = MySqlInsertBase<TTable, TQueryResult, TPreparedQueryHKT, TReturning, true, never>;\n\nexport type MySqlInsertReturning<\n\tT extends AnyMySqlInsert,\n\tTDynamic extends boolean,\n> = MySqlInsertBase<\n\tT['_']['table'],\n\tT['_']['queryResult'],\n\tT['_']['preparedQueryHKT'],\n\tInferModelFromColumns<GetPrimarySerialOrDefaultKeys<T['_']['table']['_']['columns']>>,\n\tTDynamic,\n\tT['_']['excludedMethods'] | '$returning'\n>;\n\nexport type AnyMySqlInsert = MySqlInsertBase<any, any, any, any, any, any>;\n\nexport interface MySqlInsertBase<\n\tTTable extends MySqlTable,\n\tTQueryResult extends MySqlQueryResultHKT,\n\tTPreparedQueryHKT extends PreparedQueryHKTBase,\n\tTReturning extends Record<string, unknown> | undefined = undefined,\n\tTDynamic extends boolean = false,\n\tTExcludedMethods extends string = never,\n> extends\n\tQueryPromise<TReturning extends undefined ? MySqlQueryResultKind<TQueryResult, never> : TReturning[]>,\n\tRunnableQuery<TReturning extends undefined ? MySqlQueryResultKind<TQueryResult, never> : TReturning[], 'mysql'>,\n\tSQLWrapper\n{\n\treadonly _: {\n\t\treadonly dialect: 'mysql';\n\t\treadonly table: TTable;\n\t\treadonly queryResult: TQueryResult;\n\t\treadonly preparedQueryHKT: TPreparedQueryHKT;\n\t\treadonly dynamic: TDynamic;\n\t\treadonly excludedMethods: TExcludedMethods;\n\t\treadonly returning: TReturning;\n\t\treadonly result: TReturning extends undefined ? MySqlQueryResultKind<TQueryResult, never> : TReturning[];\n\t};\n}\n\nexport type PrimaryKeyKeys<T extends Record<string, AnyMySqlColumn>> = {\n\t[K in keyof T]: T[K]['_']['isPrimaryKey'] extends true ? T[K]['_']['isAutoincrement'] extends true ? K\n\t\t: T[K]['_']['hasRuntimeDefault'] extends true ? T[K]['_']['isPrimaryKey'] extends true ? K : never\n\t\t: never\n\t\t: T[K]['_']['hasRuntimeDefault'] extends true ? T[K]['_']['isPrimaryKey'] extends true ? K : never\n\t\t: never;\n}[keyof T];\n\nexport type GetPrimarySerialOrDefaultKeys<T extends Record<string, AnyMySqlColumn>> = {\n\t[K in PrimaryKeyKeys<T>]: T[K];\n};\n\nexport class MySqlInsertBase<\n\tTTable extends MySqlTable,\n\tTQueryResult extends MySqlQueryResultHKT,\n\t// eslint-disable-next-line @typescript-eslint/no-unused-vars\n\tTPreparedQueryHKT extends PreparedQueryHKTBase,\n\t// eslint-disable-next-line @typescript-eslint/no-unused-vars\n\tTReturning extends Record<string, unknown> | undefined = undefined,\n\t// eslint-disable-next-line @typescript-eslint/no-unused-vars\n\tTDynamic extends boolean = false,\n\t// eslint-disable-next-line @typescript-eslint/no-unused-vars\n\tTExcludedMethods extends string = never,\n> extends QueryPromise<TReturning extends undefined ? MySqlQueryResultKind<TQueryResult, never> : TReturning[]>\n\timplements\n\t\tRunnableQuery<TReturning extends undefined ? MySqlQueryResultKind<TQueryResult, never> : TReturning[], 'mysql'>,\n\t\tSQLWrapper\n{\n\tstatic override readonly [entityKind]: string = 'MySqlInsert';\n\n\tdeclare protected $table: TTable;\n\n\tprivate config: MySqlInsertConfig<TTable>;\n\tprotected cacheConfig?: WithCacheConfig;\n\n\tconstructor(\n\t\ttable: TTable,\n\t\tvalues: MySqlInsertConfig['values'],\n\t\tignore: boolean,\n\t\tprivate session: MySqlSession,\n\t\tprivate dialect: MySqlDialect,\n\t\tselect?: boolean,\n\t) {\n\t\tsuper();\n\t\tthis.config = { table, values: values as any, select, ignore };\n\t}\n\n\t/**\n\t * Adds an `on duplicate key update` clause to the query.\n\t *\n\t * Calling this method will update the row if any unique index conflicts. MySQL will automatically determine the conflict target based on the primary key and unique indexes.\n\t *\n\t * See docs: {@link https://orm.drizzle.team/docs/insert#on-duplicate-key-update}\n\t *\n\t * @param config The `set` clause\n\t *\n\t * @example\n\t * ```ts\n\t * await db.insert(cars)\n\t * .values({ id: 1, brand: 'BMW'})\n\t * .onDuplicateKeyUpdate({ set: { brand: 'Porsche' }});\n\t * ```\n\t *\n\t * While MySQL does not directly support doing nothing on conflict, you can perform a no-op by setting any column's value to itself and achieve the same effect:\n\t *\n\t * ```ts\n\t * import { sql } from 'drizzle-orm';\n\t *\n\t * await db.insert(cars)\n\t * .values({ id: 1, brand: 'BMW' })\n\t * .onDuplicateKeyUpdate({ set: { id: sql`id` } });\n\t * ```\n\t */\n\tonDuplicateKeyUpdate(\n\t\tconfig: MySqlInsertOnDuplicateKeyUpdateConfig<this>,\n\t): MySqlInsertWithout<this, TDynamic, 'onDuplicateKeyUpdate'> {\n\t\tconst setSql = this.dialect.buildUpdateSet(\n\t\t\tthis.config.table,\n\t\t\tmapUpdateSet(this.config.table, config.set, this.session.extensions),\n\t\t\tthis.session.extensions,\n\t\t);\n\t\tthis.config.onConflict = sql`update ${setSql}`;\n\t\treturn this as any;\n\t}\n\n\t$returningId(): MySqlInsertWithout<\n\t\tMySqlInsertReturning<this, TDynamic>,\n\t\tTDynamic,\n\t\t'$returningId'\n\t> {\n\t\tconst returning: SelectedFieldsOrdered = [];\n\t\tfor (const [key, value] of Object.entries(this.config.table[Table.Symbol.Columns])) {\n\t\t\tif (value.primary) {\n\t\t\t\treturning.push({ field: value, path: [key] });\n\t\t\t}\n\t\t}\n\t\tthis.config.returning = returning;\n\t\treturn this as any;\n\t}\n\n\t/** @internal */\n\tgetSQL(): SQL {\n\t\treturn this.dialect.buildInsertQuery(this.config, this.session.extensions).sql;\n\t}\n\n\ttoSQL(): Query {\n\t\tconst { typings: _typings, ...rest } = this.dialect.sqlToQuery(this.getSQL());\n\t\treturn rest;\n\t}\n\n\tprepare(): MySqlInsertPrepare<this, TReturning> {\n\t\tconst { sql, generatedIds } = this.dialect.buildInsertQuery(this.config, this.session.extensions);\n\t\treturn this.session.prepareQuery(\n\t\t\tthis.dialect.sqlToQuery(sql),\n\t\t\tundefined,\n\t\t\tundefined,\n\t\t\tgeneratedIds,\n\t\t\tthis.config.returning,\n\t\t\t{\n\t\t\t\ttype: 'insert',\n\t\t\t\ttables: extractUsedTable(this.config.table),\n\t\t\t},\n\t\t\tthis.cacheConfig,\n\t\t\t{\n\t\t\t\tquery: 'insert',\n\t\t\t\tdialect: this.dialect,\n\t\t\t\tsession: this.session,\n\t\t\t\tconfig: this.config,\n\t\t\t},\n\t\t) as MySqlInsertPrepare<this, TReturning>;\n\t}\n\n\toverride execute: ReturnType<this['prepare']>['execute'] = (placeholderValues) => {\n\t\treturn this.prepare().execute(placeholderValues);\n\t};\n\n\tprivate createIterator = (): ReturnType<this['prepare']>['iterator'] => {\n\t\tconst self = this;\n\t\treturn async function*(placeholderValues) {\n\t\t\tyield* self.prepare().iterator(placeholderValues);\n\t\t};\n\t};\n\n\titerator = this.createIterator();\n\n\t$dynamic(): MySqlInsertDynamic<this> {\n\t\treturn this as any;\n\t}\n}\n"],"mappings":"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","names":["sql"]}
|
|
1
|
+
{"version":3,"sources":["../../../src/mysql-core/query-builders/insert.ts"],"sourcesContent":["import type { WithCacheConfig } from '~/cache/core/types.ts';\nimport { entityKind, is } from '~/entity.ts';\nimport type { MySqlDialect } from '~/mysql-core/dialect.ts';\nimport type {\n\tAnyMySqlQueryResultHKT,\n\tMySqlPreparedQueryConfig,\n\tMySqlQueryResultHKT,\n\tMySqlQueryResultKind,\n\tMySqlSession,\n\tPreparedQueryHKTBase,\n\tPreparedQueryKind,\n} from '~/mysql-core/session.ts';\nimport type { MySqlTable } from '~/mysql-core/table.ts';\nimport type { TypedQueryBuilder } from '~/query-builders/query-builder.ts';\nimport { QueryPromise } from '~/query-promise.ts';\nimport type { RunnableQuery } from '~/runnable-query.ts';\nimport type { Placeholder, Query, SQLWrapper } from '~/sql/sql.ts';\nimport { Param, SQL, sql } from '~/sql/sql.ts';\nimport type { InferModelFromColumns } from '~/table.ts';\nimport { Columns, Table } from '~/table.ts';\nimport { haveSameKeys, mapUpdateSet } from '~/utils.ts';\nimport type { AnyMySqlColumn } from '../columns/common.ts';\nimport { extractUsedTable } from '../utils.ts';\nimport { QueryBuilder } from './query-builder.ts';\nimport type { SelectedFieldsOrdered } from './select.types.ts';\nimport type { MySqlUpdateSetSource } from './update.ts';\n\nexport interface MySqlInsertConfig<TTable extends MySqlTable = MySqlTable> {\n\ttable: TTable;\n\tvalues: Record<string, Param | SQL>[] | MySqlInsertSelectQueryBuilder<TTable> | SQL;\n\tignore: boolean;\n\tonConflict?: SQL;\n\treturning?: SelectedFieldsOrdered;\n\tselect?: boolean;\n}\n\nexport type AnyMySqlInsertConfig = MySqlInsertConfig<MySqlTable>;\n\nexport type MySqlInsertValue<TTable extends MySqlTable> =\n\t& {\n\t\t[Key in keyof TTable['$inferInsert']]: TTable['$inferInsert'][Key] | SQL | Placeholder;\n\t}\n\t& {};\n\nexport type MySqlInsertSelectQueryBuilder<TTable extends MySqlTable> = TypedQueryBuilder<\n\t{ [K in keyof TTable['$inferInsert']]: AnyMySqlColumn | SQL | SQL.Aliased | TTable['$inferInsert'][K] }\n>;\n\nexport class MySqlInsertBuilder<\n\tTTable extends MySqlTable,\n\tTQueryResult extends MySqlQueryResultHKT,\n\tTPreparedQueryHKT extends PreparedQueryHKTBase,\n> {\n\tstatic readonly [entityKind]: string = 'MySqlInsertBuilder';\n\n\tprivate shouldIgnore = false;\n\n\tconstructor(\n\t\tprivate table: TTable,\n\t\tprivate session: MySqlSession,\n\t\tprivate dialect: MySqlDialect,\n\t) {}\n\n\tignore(): this {\n\t\tthis.shouldIgnore = true;\n\t\treturn this;\n\t}\n\n\tvalues(value: MySqlInsertValue<TTable>): MySqlInsertBase<TTable, TQueryResult, TPreparedQueryHKT>;\n\tvalues(values: MySqlInsertValue<TTable>[]): MySqlInsertBase<TTable, TQueryResult, TPreparedQueryHKT>;\n\tvalues(\n\t\tvalues: MySqlInsertValue<TTable> | MySqlInsertValue<TTable>[],\n\t): MySqlInsertBase<TTable, TQueryResult, TPreparedQueryHKT> {\n\t\tvalues = Array.isArray(values) ? values : [values];\n\t\tif (values.length === 0) {\n\t\t\tthrow new Error('values() must be called with at least one value');\n\t\t}\n\t\tconst mappedValues = values.map((entry) => {\n\t\t\tconst result: Record<string, Param | SQL> = {};\n\t\t\tconst cols = this.table[Table.Symbol.Columns];\n\t\t\tfor (const colKey of Object.keys(entry)) {\n\t\t\t\tconst colValue = entry[colKey as keyof typeof entry];\n\t\t\t\tresult[colKey] = is(colValue, SQL) ? colValue : new Param(colValue, cols[colKey]);\n\t\t\t}\n\t\t\treturn result;\n\t\t});\n\n\t\treturn new MySqlInsertBase(this.table, mappedValues, this.shouldIgnore, this.session, this.dialect);\n\t}\n\n\tselect(\n\t\tselectQuery: (qb: QueryBuilder) => MySqlInsertSelectQueryBuilder<TTable>,\n\t): MySqlInsertBase<TTable, TQueryResult, TPreparedQueryHKT>;\n\tselect(selectQuery: (qb: QueryBuilder) => SQL): MySqlInsertBase<TTable, TQueryResult, TPreparedQueryHKT>;\n\tselect(selectQuery: SQL): MySqlInsertBase<TTable, TQueryResult, TPreparedQueryHKT>;\n\tselect(selectQuery: MySqlInsertSelectQueryBuilder<TTable>): MySqlInsertBase<TTable, TQueryResult, TPreparedQueryHKT>;\n\tselect(\n\t\tselectQuery:\n\t\t\t| SQL\n\t\t\t| MySqlInsertSelectQueryBuilder<TTable>\n\t\t\t| ((qb: QueryBuilder) => MySqlInsertSelectQueryBuilder<TTable> | SQL),\n\t): MySqlInsertBase<TTable, TQueryResult, TPreparedQueryHKT> {\n\t\tconst select = typeof selectQuery === 'function' ? selectQuery(new QueryBuilder()) : selectQuery;\n\n\t\tif (\n\t\t\t!is(select, SQL)\n\t\t\t&& !haveSameKeys(this.table[Columns], select._.selectedFields)\n\t\t) {\n\t\t\tthrow new Error(\n\t\t\t\t'Insert select error: selected fields are not the same or are in a different order compared to the table definition',\n\t\t\t);\n\t\t}\n\n\t\treturn new MySqlInsertBase(this.table, select, this.shouldIgnore, this.session, this.dialect, true);\n\t}\n}\n\nexport type MySqlInsertWithout<T extends AnyMySqlInsert, TDynamic extends boolean, K extends keyof T & string> =\n\tTDynamic extends true ? T\n\t\t: Omit<\n\t\t\tMySqlInsertBase<\n\t\t\t\tT['_']['table'],\n\t\t\t\tT['_']['queryResult'],\n\t\t\t\tT['_']['preparedQueryHKT'],\n\t\t\t\tT['_']['returning'],\n\t\t\t\tTDynamic,\n\t\t\t\tT['_']['excludedMethods'] | '$returning'\n\t\t\t>,\n\t\t\tT['_']['excludedMethods'] | K\n\t\t>;\n\nexport type MySqlInsertDynamic<T extends AnyMySqlInsert> = MySqlInsert<\n\tT['_']['table'],\n\tT['_']['queryResult'],\n\tT['_']['preparedQueryHKT'],\n\tT['_']['returning']\n>;\n\nexport type MySqlInsertPrepare<\n\tT extends AnyMySqlInsert,\n\tTReturning extends Record<string, unknown> | undefined = undefined,\n> = PreparedQueryKind<\n\tT['_']['preparedQueryHKT'],\n\tMySqlPreparedQueryConfig & {\n\t\texecute: TReturning extends undefined ? MySqlQueryResultKind<T['_']['queryResult'], never> : TReturning[];\n\t\titerator: never;\n\t},\n\ttrue\n>;\n\nexport type MySqlInsertOnDuplicateKeyUpdateConfig<T extends AnyMySqlInsert> = {\n\tset: MySqlUpdateSetSource<T['_']['table']>;\n};\n\nexport type MySqlInsert<\n\tTTable extends MySqlTable = MySqlTable,\n\tTQueryResult extends MySqlQueryResultHKT = AnyMySqlQueryResultHKT,\n\tTPreparedQueryHKT extends PreparedQueryHKTBase = PreparedQueryHKTBase,\n\tTReturning extends Record<string, unknown> | undefined = Record<string, unknown> | undefined,\n> = MySqlInsertBase<TTable, TQueryResult, TPreparedQueryHKT, TReturning, true, never>;\n\nexport type MySqlInsertReturning<\n\tT extends AnyMySqlInsert,\n\tTDynamic extends boolean,\n> = MySqlInsertBase<\n\tT['_']['table'],\n\tT['_']['queryResult'],\n\tT['_']['preparedQueryHKT'],\n\tInferModelFromColumns<GetPrimarySerialOrDefaultKeys<T['_']['table']['_']['columns']>>,\n\tTDynamic,\n\tT['_']['excludedMethods'] | '$returning'\n>;\n\nexport type AnyMySqlInsert = MySqlInsertBase<any, any, any, any, any, any>;\n\nexport interface MySqlInsertBase<\n\tTTable extends MySqlTable,\n\tTQueryResult extends MySqlQueryResultHKT,\n\tTPreparedQueryHKT extends PreparedQueryHKTBase,\n\tTReturning extends Record<string, unknown> | undefined = undefined,\n\tTDynamic extends boolean = false,\n\tTExcludedMethods extends string = never,\n> extends\n\tQueryPromise<TReturning extends undefined ? MySqlQueryResultKind<TQueryResult, never> : TReturning[]>,\n\tRunnableQuery<TReturning extends undefined ? MySqlQueryResultKind<TQueryResult, never> : TReturning[], 'mysql'>,\n\tSQLWrapper\n{\n\treadonly _: {\n\t\treadonly dialect: 'mysql';\n\t\treadonly table: TTable;\n\t\treadonly queryResult: TQueryResult;\n\t\treadonly preparedQueryHKT: TPreparedQueryHKT;\n\t\treadonly dynamic: TDynamic;\n\t\treadonly excludedMethods: TExcludedMethods;\n\t\treadonly returning: TReturning;\n\t\treadonly result: TReturning extends undefined ? MySqlQueryResultKind<TQueryResult, never> : TReturning[];\n\t};\n}\n\nexport type PrimaryKeyKeys<T extends Record<string, AnyMySqlColumn>> = {\n\t[K in keyof T]: T[K]['_']['isPrimaryKey'] extends true ? T[K]['_']['isAutoincrement'] extends true ? K\n\t\t: T[K]['_']['hasRuntimeDefault'] extends true ? T[K]['_']['isPrimaryKey'] extends true ? K : never\n\t\t: never\n\t\t: T[K]['_']['hasRuntimeDefault'] extends true ? T[K]['_']['isPrimaryKey'] extends true ? K : never\n\t\t: never;\n}[keyof T];\n\nexport type GetPrimarySerialOrDefaultKeys<T extends Record<string, AnyMySqlColumn>> = {\n\t[K in PrimaryKeyKeys<T>]: T[K];\n};\n\nexport class MySqlInsertBase<\n\tTTable extends MySqlTable,\n\tTQueryResult extends MySqlQueryResultHKT,\n\t// eslint-disable-next-line @typescript-eslint/no-unused-vars\n\tTPreparedQueryHKT extends PreparedQueryHKTBase,\n\t// eslint-disable-next-line @typescript-eslint/no-unused-vars\n\tTReturning extends Record<string, unknown> | undefined = undefined,\n\t// eslint-disable-next-line @typescript-eslint/no-unused-vars\n\tTDynamic extends boolean = false,\n\t// eslint-disable-next-line @typescript-eslint/no-unused-vars\n\tTExcludedMethods extends string = never,\n> extends QueryPromise<TReturning extends undefined ? MySqlQueryResultKind<TQueryResult, never> : TReturning[]>\n\timplements\n\t\tRunnableQuery<TReturning extends undefined ? MySqlQueryResultKind<TQueryResult, never> : TReturning[], 'mysql'>,\n\t\tSQLWrapper\n{\n\tstatic override readonly [entityKind]: string = 'MySqlInsert';\n\n\tdeclare protected $table: TTable;\n\n\tprivate config: MySqlInsertConfig<TTable>;\n\tprotected cacheConfig?: WithCacheConfig;\n\n\tconstructor(\n\t\ttable: TTable,\n\t\tvalues: MySqlInsertConfig['values'],\n\t\tignore: boolean,\n\t\tprivate session: MySqlSession,\n\t\tprivate dialect: MySqlDialect,\n\t\tselect?: boolean,\n\t) {\n\t\tsuper();\n\t\tthis.config = { table, values: values as any, select, ignore };\n\t}\n\n\t/**\n\t * Adds an `on duplicate key update` clause to the query.\n\t *\n\t * Calling this method will update the row if any unique index conflicts. MySQL will automatically determine the conflict target based on the primary key and unique indexes.\n\t *\n\t * See docs: {@link https://orm.drizzle.team/docs/insert#on-duplicate-key-update}\n\t *\n\t * @param config The `set` clause\n\t *\n\t * @example\n\t * ```ts\n\t * await db.insert(cars)\n\t * .values({ id: 1, brand: 'BMW'})\n\t * .onDuplicateKeyUpdate({ set: { brand: 'Porsche' }});\n\t * ```\n\t *\n\t * While MySQL does not directly support doing nothing on conflict, you can perform a no-op by setting any column's value to itself and achieve the same effect:\n\t *\n\t * ```ts\n\t * import { sql } from 'drizzle-orm';\n\t *\n\t * await db.insert(cars)\n\t * .values({ id: 1, brand: 'BMW' })\n\t * .onDuplicateKeyUpdate({ set: { id: sql`id` } });\n\t * ```\n\t */\n\tonDuplicateKeyUpdate(\n\t\tconfig: MySqlInsertOnDuplicateKeyUpdateConfig<this>,\n\t): MySqlInsertWithout<this, TDynamic, 'onDuplicateKeyUpdate'> {\n\t\tconst setSql = this.dialect.buildUpdateSet(this.config.table, mapUpdateSet(this.config.table, config.set));\n\t\tthis.config.onConflict = sql`update ${setSql}`;\n\t\treturn this as any;\n\t}\n\n\t$returningId(): MySqlInsertWithout<\n\t\tMySqlInsertReturning<this, TDynamic>,\n\t\tTDynamic,\n\t\t'$returningId'\n\t> {\n\t\tconst returning: SelectedFieldsOrdered = [];\n\t\tfor (const [key, value] of Object.entries(this.config.table[Table.Symbol.Columns])) {\n\t\t\tif (value.primary) {\n\t\t\t\treturning.push({ field: value, path: [key] });\n\t\t\t}\n\t\t}\n\t\tthis.config.returning = returning;\n\t\treturn this as any;\n\t}\n\n\t/** @internal */\n\tgetSQL(): SQL {\n\t\treturn this.dialect.buildInsertQuery(this.config).sql;\n\t}\n\n\ttoSQL(): Query {\n\t\tconst { typings: _typings, ...rest } = this.dialect.sqlToQuery(this.getSQL());\n\t\treturn rest;\n\t}\n\n\tprepare(): MySqlInsertPrepare<this, TReturning> {\n\t\tconst { sql, generatedIds } = this.dialect.buildInsertQuery(this.config);\n\t\treturn this.session.prepareQuery(\n\t\t\tthis.dialect.sqlToQuery(sql),\n\t\t\tundefined,\n\t\t\tundefined,\n\t\t\tgeneratedIds,\n\t\t\tthis.config.returning,\n\t\t\t{\n\t\t\t\ttype: 'insert',\n\t\t\t\ttables: extractUsedTable(this.config.table),\n\t\t\t},\n\t\t\tthis.cacheConfig,\n\t\t) as MySqlInsertPrepare<this, TReturning>;\n\t}\n\n\toverride execute: ReturnType<this['prepare']>['execute'] = (placeholderValues) => {\n\t\treturn this.prepare().execute(placeholderValues);\n\t};\n\n\tprivate createIterator = (): ReturnType<this['prepare']>['iterator'] => {\n\t\tconst self = this;\n\t\treturn async function*(placeholderValues) {\n\t\t\tyield* self.prepare().iterator(placeholderValues);\n\t\t};\n\t};\n\n\titerator = this.createIterator();\n\n\t$dynamic(): MySqlInsertDynamic<this> {\n\t\treturn this as any;\n\t}\n}\n"],"mappings":"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","names":["sql"]}
|
|
@@ -83,17 +83,6 @@ class MySqlRelationalQuery extends import_query_promise.QueryPromise {
|
|
|
83
83
|
static [import_entity.entityKind] = "MySqlRelationalQuery";
|
|
84
84
|
prepare() {
|
|
85
85
|
const { query, builtQuery } = this._toSQL();
|
|
86
|
-
const extCfg = this.session.extensions?.length ? {
|
|
87
|
-
query: "_query",
|
|
88
|
-
session: this.session,
|
|
89
|
-
dialect: this.dialect,
|
|
90
|
-
tableNamesMap: this.tableNamesMap,
|
|
91
|
-
tablesConfig: this.schema,
|
|
92
|
-
tableConfig: this.tableConfig,
|
|
93
|
-
mode: this.queryMode,
|
|
94
|
-
planetscale: this.mode === "planetscale",
|
|
95
|
-
config: query
|
|
96
|
-
} : void 0;
|
|
97
86
|
return this.session.prepareQuery(
|
|
98
87
|
builtQuery,
|
|
99
88
|
void 0,
|
|
@@ -103,12 +92,7 @@ class MySqlRelationalQuery extends import_query_promise.QueryPromise {
|
|
|
103
92
|
return rows[0];
|
|
104
93
|
}
|
|
105
94
|
return rows;
|
|
106
|
-
}
|
|
107
|
-
void 0,
|
|
108
|
-
void 0,
|
|
109
|
-
void 0,
|
|
110
|
-
void 0,
|
|
111
|
-
extCfg
|
|
95
|
+
}
|
|
112
96
|
);
|
|
113
97
|
}
|
|
114
98
|
_getQuery() {
|
|
@@ -120,7 +104,7 @@ class MySqlRelationalQuery extends import_query_promise.QueryPromise {
|
|
|
120
104
|
tableConfig: this.tableConfig,
|
|
121
105
|
queryConfig: this.config,
|
|
122
106
|
tableAlias: this.tableConfig.tsName
|
|
123
|
-
}
|
|
107
|
+
}) : this.dialect.buildRelationalQuery({
|
|
124
108
|
fullSchema: this.fullSchema,
|
|
125
109
|
schema: this.schema,
|
|
126
110
|
tableNamesMap: this.tableNamesMap,
|
|
@@ -128,7 +112,7 @@ class MySqlRelationalQuery extends import_query_promise.QueryPromise {
|
|
|
128
112
|
tableConfig: this.tableConfig,
|
|
129
113
|
queryConfig: this.config,
|
|
130
114
|
tableAlias: this.tableConfig.tsName
|
|
131
|
-
}
|
|
115
|
+
});
|
|
132
116
|
return query;
|
|
133
117
|
}
|
|
134
118
|
_toSQL() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/mysql-core/query-builders/query.ts"],"sourcesContent":["import { entityKind } from '~/entity.ts';\nimport
|
|
1
|
+
{"version":3,"sources":["../../../src/mysql-core/query-builders/query.ts"],"sourcesContent":["import { entityKind } from '~/entity.ts';\nimport { QueryPromise } from '~/query-promise.ts';\nimport {\n\ttype BuildQueryResult,\n\ttype BuildRelationalQueryResult,\n\ttype DBQueryConfig,\n\tmapRelationalRow,\n\ttype TableRelationalConfig,\n\ttype TablesRelationalConfig,\n} from '~/relations.ts';\nimport type { Query, QueryWithTypings, SQL } from '~/sql/sql.ts';\nimport type { KnownKeysOnly } from '~/utils.ts';\nimport type { MySqlDialect } from '../dialect.ts';\nimport type {\n\tMode,\n\tMySqlPreparedQueryConfig,\n\tMySqlSession,\n\tPreparedQueryHKTBase,\n\tPreparedQueryKind,\n} from '../session.ts';\nimport type { MySqlTable } from '../table.ts';\n\nexport class RelationalQueryBuilder<\n\tTPreparedQueryHKT extends PreparedQueryHKTBase,\n\tTSchema extends TablesRelationalConfig,\n\tTFields extends TableRelationalConfig,\n> {\n\tstatic readonly [entityKind]: string = 'MySqlRelationalQueryBuilder';\n\n\tconstructor(\n\t\tprivate fullSchema: Record<string, unknown>,\n\t\tprivate schema: TSchema,\n\t\tprivate tableNamesMap: Record<string, string>,\n\t\tprivate table: MySqlTable,\n\t\tprivate tableConfig: TableRelationalConfig,\n\t\tprivate dialect: MySqlDialect,\n\t\tprivate session: MySqlSession,\n\t\tprivate mode: Mode,\n\t) {}\n\n\tfindMany<TConfig extends DBQueryConfig<'many', true, TSchema, TFields>>(\n\t\tconfig?: KnownKeysOnly<TConfig, DBQueryConfig<'many', true, TSchema, TFields>>,\n\t): MySqlRelationalQuery<TPreparedQueryHKT, BuildQueryResult<TSchema, TFields, TConfig>[]> {\n\t\treturn new MySqlRelationalQuery(\n\t\t\tthis.fullSchema,\n\t\t\tthis.schema,\n\t\t\tthis.tableNamesMap,\n\t\t\tthis.table,\n\t\t\tthis.tableConfig,\n\t\t\tthis.dialect,\n\t\t\tthis.session,\n\t\t\tconfig ? (config as DBQueryConfig<'many', true>) : {},\n\t\t\t'many',\n\t\t\tthis.mode,\n\t\t);\n\t}\n\n\tfindFirst<TSelection extends Omit<DBQueryConfig<'many', true, TSchema, TFields>, 'limit'>>(\n\t\tconfig?: KnownKeysOnly<TSelection, Omit<DBQueryConfig<'many', true, TSchema, TFields>, 'limit'>>,\n\t): MySqlRelationalQuery<TPreparedQueryHKT, BuildQueryResult<TSchema, TFields, TSelection> | undefined> {\n\t\treturn new MySqlRelationalQuery(\n\t\t\tthis.fullSchema,\n\t\t\tthis.schema,\n\t\t\tthis.tableNamesMap,\n\t\t\tthis.table,\n\t\t\tthis.tableConfig,\n\t\t\tthis.dialect,\n\t\t\tthis.session,\n\t\t\tconfig ? { ...(config as DBQueryConfig<'many', true> | undefined), limit: 1 } : { limit: 1 },\n\t\t\t'first',\n\t\t\tthis.mode,\n\t\t);\n\t}\n}\n\nexport class MySqlRelationalQuery<\n\tTPreparedQueryHKT extends PreparedQueryHKTBase,\n\tTResult,\n> extends QueryPromise<TResult> {\n\tstatic override readonly [entityKind]: string = 'MySqlRelationalQuery';\n\n\tdeclare protected $brand: 'MySqlRelationalQuery';\n\n\tconstructor(\n\t\tprivate fullSchema: Record<string, unknown>,\n\t\tprivate schema: TablesRelationalConfig,\n\t\tprivate tableNamesMap: Record<string, string>,\n\t\tprivate table: MySqlTable,\n\t\tprivate tableConfig: TableRelationalConfig,\n\t\tprivate dialect: MySqlDialect,\n\t\tprivate session: MySqlSession,\n\t\tprivate config: DBQueryConfig<'many', true> | true,\n\t\tprivate queryMode: 'many' | 'first',\n\t\tprivate mode?: Mode,\n\t) {\n\t\tsuper();\n\t}\n\n\tprepare() {\n\t\tconst { query, builtQuery } = this._toSQL();\n\t\treturn this.session.prepareQuery(\n\t\t\tbuiltQuery,\n\t\t\tundefined,\n\t\t\t(rawRows) => {\n\t\t\t\tconst rows = rawRows.map((row) => mapRelationalRow(this.schema, this.tableConfig, row, query.selection));\n\t\t\t\tif (this.queryMode === 'first') {\n\t\t\t\t\treturn rows[0] as TResult;\n\t\t\t\t}\n\t\t\t\treturn rows as TResult;\n\t\t\t},\n\t\t) as PreparedQueryKind<TPreparedQueryHKT, MySqlPreparedQueryConfig & { execute: TResult }, true>;\n\t}\n\n\tprivate _getQuery() {\n\t\tconst query = this.mode === 'planetscale'\n\t\t\t? this.dialect.buildRelationalQueryWithoutLateralSubqueries({\n\t\t\t\tfullSchema: this.fullSchema,\n\t\t\t\tschema: this.schema,\n\t\t\t\ttableNamesMap: this.tableNamesMap,\n\t\t\t\ttable: this.table,\n\t\t\t\ttableConfig: this.tableConfig,\n\t\t\t\tqueryConfig: this.config,\n\t\t\t\ttableAlias: this.tableConfig.tsName,\n\t\t\t})\n\t\t\t: this.dialect.buildRelationalQuery({\n\t\t\t\tfullSchema: this.fullSchema,\n\t\t\t\tschema: this.schema,\n\t\t\t\ttableNamesMap: this.tableNamesMap,\n\t\t\t\ttable: this.table,\n\t\t\t\ttableConfig: this.tableConfig,\n\t\t\t\tqueryConfig: this.config,\n\t\t\t\ttableAlias: this.tableConfig.tsName,\n\t\t\t});\n\t\treturn query;\n\t}\n\n\tprivate _toSQL(): { query: BuildRelationalQueryResult; builtQuery: QueryWithTypings } {\n\t\tconst query = this._getQuery();\n\n\t\tconst builtQuery = this.dialect.sqlToQuery(query.sql as SQL);\n\n\t\treturn { builtQuery, query };\n\t}\n\n\t/** @internal */\n\tgetSQL(): SQL {\n\t\treturn this._getQuery().sql as SQL;\n\t}\n\n\ttoSQL(): Query {\n\t\treturn this._toSQL().builtQuery;\n\t}\n\n\toverride execute(): Promise<TResult> {\n\t\treturn this.prepare().execute();\n\t}\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAA2B;AAC3B,2BAA6B;AAC7B,uBAOO;AAaA,MAAM,uBAIX;AAAA,EAGD,YACS,YACA,QACA,eACA,OACA,aACA,SACA,SACA,MACP;AARO;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA,EACN;AAAA,EAXH,QAAiB,wBAAU,IAAY;AAAA,EAavC,SACC,QACyF;AACzF,WAAO,IAAI;AAAA,MACV,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,SAAU,SAAyC,CAAC;AAAA,MACpD;AAAA,MACA,KAAK;AAAA,IACN;AAAA,EACD;AAAA,EAEA,UACC,QACsG;AACtG,WAAO,IAAI;AAAA,MACV,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,SAAS,EAAE,GAAI,QAAoD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE;AAAA,MAC3F;AAAA,MACA,KAAK;AAAA,IACN;AAAA,EACD;AACD;AAEO,MAAM,6BAGH,kCAAsB;AAAA,EAK/B,YACS,YACA,QACA,eACA,OACA,aACA,SACA,SACA,QACA,WACA,MACP;AACD,UAAM;AAXE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA,EAGT;AAAA,EAjBA,QAA0B,wBAAU,IAAY;AAAA,EAmBhD,UAAU;AACT,UAAM,EAAE,OAAO,WAAW,IAAI,KAAK,OAAO;AAC1C,WAAO,KAAK,QAAQ;AAAA,MACnB;AAAA,MACA;AAAA,MACA,CAAC,YAAY;AACZ,cAAM,OAAO,QAAQ,IAAI,CAAC,YAAQ,mCAAiB,KAAK,QAAQ,KAAK,aAAa,KAAK,MAAM,SAAS,CAAC;AACvG,YAAI,KAAK,cAAc,SAAS;AAC/B,iBAAO,KAAK,CAAC;AAAA,QACd;AACA,eAAO;AAAA,MACR;AAAA,IACD;AAAA,EACD;AAAA,EAEQ,YAAY;AACnB,UAAM,QAAQ,KAAK,SAAS,gBACzB,KAAK,QAAQ,6CAA6C;AAAA,MAC3D,YAAY,KAAK;AAAA,MACjB,QAAQ,KAAK;AAAA,MACb,eAAe,KAAK;AAAA,MACpB,OAAO,KAAK;AAAA,MACZ,aAAa,KAAK;AAAA,MAClB,aAAa,KAAK;AAAA,MAClB,YAAY,KAAK,YAAY;AAAA,IAC9B,CAAC,IACC,KAAK,QAAQ,qBAAqB;AAAA,MACnC,YAAY,KAAK;AAAA,MACjB,QAAQ,KAAK;AAAA,MACb,eAAe,KAAK;AAAA,MACpB,OAAO,KAAK;AAAA,MACZ,aAAa,KAAK;AAAA,MAClB,aAAa,KAAK;AAAA,MAClB,YAAY,KAAK,YAAY;AAAA,IAC9B,CAAC;AACF,WAAO;AAAA,EACR;AAAA,EAEQ,SAA8E;AACrF,UAAM,QAAQ,KAAK,UAAU;AAE7B,UAAM,aAAa,KAAK,QAAQ,WAAW,MAAM,GAAU;AAE3D,WAAO,EAAE,YAAY,MAAM;AAAA,EAC5B;AAAA;AAAA,EAGA,SAAc;AACb,WAAO,KAAK,UAAU,EAAE;AAAA,EACzB;AAAA,EAEA,QAAe;AACd,WAAO,KAAK,OAAO,EAAE;AAAA,EACtB;AAAA,EAES,UAA4B;AACpC,WAAO,KAAK,QAAQ,EAAE,QAAQ;AAAA,EAC/B;AACD;","names":[]}
|
|
@@ -61,17 +61,6 @@ class MySqlRelationalQuery extends QueryPromise {
|
|
|
61
61
|
static [entityKind] = "MySqlRelationalQuery";
|
|
62
62
|
prepare() {
|
|
63
63
|
const { query, builtQuery } = this._toSQL();
|
|
64
|
-
const extCfg = this.session.extensions?.length ? {
|
|
65
|
-
query: "_query",
|
|
66
|
-
session: this.session,
|
|
67
|
-
dialect: this.dialect,
|
|
68
|
-
tableNamesMap: this.tableNamesMap,
|
|
69
|
-
tablesConfig: this.schema,
|
|
70
|
-
tableConfig: this.tableConfig,
|
|
71
|
-
mode: this.queryMode,
|
|
72
|
-
planetscale: this.mode === "planetscale",
|
|
73
|
-
config: query
|
|
74
|
-
} : void 0;
|
|
75
64
|
return this.session.prepareQuery(
|
|
76
65
|
builtQuery,
|
|
77
66
|
void 0,
|
|
@@ -81,12 +70,7 @@ class MySqlRelationalQuery extends QueryPromise {
|
|
|
81
70
|
return rows[0];
|
|
82
71
|
}
|
|
83
72
|
return rows;
|
|
84
|
-
}
|
|
85
|
-
void 0,
|
|
86
|
-
void 0,
|
|
87
|
-
void 0,
|
|
88
|
-
void 0,
|
|
89
|
-
extCfg
|
|
73
|
+
}
|
|
90
74
|
);
|
|
91
75
|
}
|
|
92
76
|
_getQuery() {
|
|
@@ -98,7 +82,7 @@ class MySqlRelationalQuery extends QueryPromise {
|
|
|
98
82
|
tableConfig: this.tableConfig,
|
|
99
83
|
queryConfig: this.config,
|
|
100
84
|
tableAlias: this.tableConfig.tsName
|
|
101
|
-
}
|
|
85
|
+
}) : this.dialect.buildRelationalQuery({
|
|
102
86
|
fullSchema: this.fullSchema,
|
|
103
87
|
schema: this.schema,
|
|
104
88
|
tableNamesMap: this.tableNamesMap,
|
|
@@ -106,7 +90,7 @@ class MySqlRelationalQuery extends QueryPromise {
|
|
|
106
90
|
tableConfig: this.tableConfig,
|
|
107
91
|
queryConfig: this.config,
|
|
108
92
|
tableAlias: this.tableConfig.tsName
|
|
109
|
-
}
|
|
93
|
+
});
|
|
110
94
|
return query;
|
|
111
95
|
}
|
|
112
96
|
_toSQL() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/mysql-core/query-builders/query.ts"],"sourcesContent":["import { entityKind } from '~/entity.ts';\nimport
|
|
1
|
+
{"version":3,"sources":["../../../src/mysql-core/query-builders/query.ts"],"sourcesContent":["import { entityKind } from '~/entity.ts';\nimport { QueryPromise } from '~/query-promise.ts';\nimport {\n\ttype BuildQueryResult,\n\ttype BuildRelationalQueryResult,\n\ttype DBQueryConfig,\n\tmapRelationalRow,\n\ttype TableRelationalConfig,\n\ttype TablesRelationalConfig,\n} from '~/relations.ts';\nimport type { Query, QueryWithTypings, SQL } from '~/sql/sql.ts';\nimport type { KnownKeysOnly } from '~/utils.ts';\nimport type { MySqlDialect } from '../dialect.ts';\nimport type {\n\tMode,\n\tMySqlPreparedQueryConfig,\n\tMySqlSession,\n\tPreparedQueryHKTBase,\n\tPreparedQueryKind,\n} from '../session.ts';\nimport type { MySqlTable } from '../table.ts';\n\nexport class RelationalQueryBuilder<\n\tTPreparedQueryHKT extends PreparedQueryHKTBase,\n\tTSchema extends TablesRelationalConfig,\n\tTFields extends TableRelationalConfig,\n> {\n\tstatic readonly [entityKind]: string = 'MySqlRelationalQueryBuilder';\n\n\tconstructor(\n\t\tprivate fullSchema: Record<string, unknown>,\n\t\tprivate schema: TSchema,\n\t\tprivate tableNamesMap: Record<string, string>,\n\t\tprivate table: MySqlTable,\n\t\tprivate tableConfig: TableRelationalConfig,\n\t\tprivate dialect: MySqlDialect,\n\t\tprivate session: MySqlSession,\n\t\tprivate mode: Mode,\n\t) {}\n\n\tfindMany<TConfig extends DBQueryConfig<'many', true, TSchema, TFields>>(\n\t\tconfig?: KnownKeysOnly<TConfig, DBQueryConfig<'many', true, TSchema, TFields>>,\n\t): MySqlRelationalQuery<TPreparedQueryHKT, BuildQueryResult<TSchema, TFields, TConfig>[]> {\n\t\treturn new MySqlRelationalQuery(\n\t\t\tthis.fullSchema,\n\t\t\tthis.schema,\n\t\t\tthis.tableNamesMap,\n\t\t\tthis.table,\n\t\t\tthis.tableConfig,\n\t\t\tthis.dialect,\n\t\t\tthis.session,\n\t\t\tconfig ? (config as DBQueryConfig<'many', true>) : {},\n\t\t\t'many',\n\t\t\tthis.mode,\n\t\t);\n\t}\n\n\tfindFirst<TSelection extends Omit<DBQueryConfig<'many', true, TSchema, TFields>, 'limit'>>(\n\t\tconfig?: KnownKeysOnly<TSelection, Omit<DBQueryConfig<'many', true, TSchema, TFields>, 'limit'>>,\n\t): MySqlRelationalQuery<TPreparedQueryHKT, BuildQueryResult<TSchema, TFields, TSelection> | undefined> {\n\t\treturn new MySqlRelationalQuery(\n\t\t\tthis.fullSchema,\n\t\t\tthis.schema,\n\t\t\tthis.tableNamesMap,\n\t\t\tthis.table,\n\t\t\tthis.tableConfig,\n\t\t\tthis.dialect,\n\t\t\tthis.session,\n\t\t\tconfig ? { ...(config as DBQueryConfig<'many', true> | undefined), limit: 1 } : { limit: 1 },\n\t\t\t'first',\n\t\t\tthis.mode,\n\t\t);\n\t}\n}\n\nexport class MySqlRelationalQuery<\n\tTPreparedQueryHKT extends PreparedQueryHKTBase,\n\tTResult,\n> extends QueryPromise<TResult> {\n\tstatic override readonly [entityKind]: string = 'MySqlRelationalQuery';\n\n\tdeclare protected $brand: 'MySqlRelationalQuery';\n\n\tconstructor(\n\t\tprivate fullSchema: Record<string, unknown>,\n\t\tprivate schema: TablesRelationalConfig,\n\t\tprivate tableNamesMap: Record<string, string>,\n\t\tprivate table: MySqlTable,\n\t\tprivate tableConfig: TableRelationalConfig,\n\t\tprivate dialect: MySqlDialect,\n\t\tprivate session: MySqlSession,\n\t\tprivate config: DBQueryConfig<'many', true> | true,\n\t\tprivate queryMode: 'many' | 'first',\n\t\tprivate mode?: Mode,\n\t) {\n\t\tsuper();\n\t}\n\n\tprepare() {\n\t\tconst { query, builtQuery } = this._toSQL();\n\t\treturn this.session.prepareQuery(\n\t\t\tbuiltQuery,\n\t\t\tundefined,\n\t\t\t(rawRows) => {\n\t\t\t\tconst rows = rawRows.map((row) => mapRelationalRow(this.schema, this.tableConfig, row, query.selection));\n\t\t\t\tif (this.queryMode === 'first') {\n\t\t\t\t\treturn rows[0] as TResult;\n\t\t\t\t}\n\t\t\t\treturn rows as TResult;\n\t\t\t},\n\t\t) as PreparedQueryKind<TPreparedQueryHKT, MySqlPreparedQueryConfig & { execute: TResult }, true>;\n\t}\n\n\tprivate _getQuery() {\n\t\tconst query = this.mode === 'planetscale'\n\t\t\t? this.dialect.buildRelationalQueryWithoutLateralSubqueries({\n\t\t\t\tfullSchema: this.fullSchema,\n\t\t\t\tschema: this.schema,\n\t\t\t\ttableNamesMap: this.tableNamesMap,\n\t\t\t\ttable: this.table,\n\t\t\t\ttableConfig: this.tableConfig,\n\t\t\t\tqueryConfig: this.config,\n\t\t\t\ttableAlias: this.tableConfig.tsName,\n\t\t\t})\n\t\t\t: this.dialect.buildRelationalQuery({\n\t\t\t\tfullSchema: this.fullSchema,\n\t\t\t\tschema: this.schema,\n\t\t\t\ttableNamesMap: this.tableNamesMap,\n\t\t\t\ttable: this.table,\n\t\t\t\ttableConfig: this.tableConfig,\n\t\t\t\tqueryConfig: this.config,\n\t\t\t\ttableAlias: this.tableConfig.tsName,\n\t\t\t});\n\t\treturn query;\n\t}\n\n\tprivate _toSQL(): { query: BuildRelationalQueryResult; builtQuery: QueryWithTypings } {\n\t\tconst query = this._getQuery();\n\n\t\tconst builtQuery = this.dialect.sqlToQuery(query.sql as SQL);\n\n\t\treturn { builtQuery, query };\n\t}\n\n\t/** @internal */\n\tgetSQL(): SQL {\n\t\treturn this._getQuery().sql as SQL;\n\t}\n\n\ttoSQL(): Query {\n\t\treturn this._toSQL().builtQuery;\n\t}\n\n\toverride execute(): Promise<TResult> {\n\t\treturn this.prepare().execute();\n\t}\n}\n"],"mappings":"AAAA,SAAS,kBAAkB;AAC3B,SAAS,oBAAoB;AAC7B;AAAA,EAIC;AAAA,OAGM;AAaA,MAAM,uBAIX;AAAA,EAGD,YACS,YACA,QACA,eACA,OACA,aACA,SACA,SACA,MACP;AARO;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA,EACN;AAAA,EAXH,QAAiB,UAAU,IAAY;AAAA,EAavC,SACC,QACyF;AACzF,WAAO,IAAI;AAAA,MACV,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,SAAU,SAAyC,CAAC;AAAA,MACpD;AAAA,MACA,KAAK;AAAA,IACN;AAAA,EACD;AAAA,EAEA,UACC,QACsG;AACtG,WAAO,IAAI;AAAA,MACV,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,SAAS,EAAE,GAAI,QAAoD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE;AAAA,MAC3F;AAAA,MACA,KAAK;AAAA,IACN;AAAA,EACD;AACD;AAEO,MAAM,6BAGH,aAAsB;AAAA,EAK/B,YACS,YACA,QACA,eACA,OACA,aACA,SACA,SACA,QACA,WACA,MACP;AACD,UAAM;AAXE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA,EAGT;AAAA,EAjBA,QAA0B,UAAU,IAAY;AAAA,EAmBhD,UAAU;AACT,UAAM,EAAE,OAAO,WAAW,IAAI,KAAK,OAAO;AAC1C,WAAO,KAAK,QAAQ;AAAA,MACnB;AAAA,MACA;AAAA,MACA,CAAC,YAAY;AACZ,cAAM,OAAO,QAAQ,IAAI,CAAC,QAAQ,iBAAiB,KAAK,QAAQ,KAAK,aAAa,KAAK,MAAM,SAAS,CAAC;AACvG,YAAI,KAAK,cAAc,SAAS;AAC/B,iBAAO,KAAK,CAAC;AAAA,QACd;AACA,eAAO;AAAA,MACR;AAAA,IACD;AAAA,EACD;AAAA,EAEQ,YAAY;AACnB,UAAM,QAAQ,KAAK,SAAS,gBACzB,KAAK,QAAQ,6CAA6C;AAAA,MAC3D,YAAY,KAAK;AAAA,MACjB,QAAQ,KAAK;AAAA,MACb,eAAe,KAAK;AAAA,MACpB,OAAO,KAAK;AAAA,MACZ,aAAa,KAAK;AAAA,MAClB,aAAa,KAAK;AAAA,MAClB,YAAY,KAAK,YAAY;AAAA,IAC9B,CAAC,IACC,KAAK,QAAQ,qBAAqB;AAAA,MACnC,YAAY,KAAK;AAAA,MACjB,QAAQ,KAAK;AAAA,MACb,eAAe,KAAK;AAAA,MACpB,OAAO,KAAK;AAAA,MACZ,aAAa,KAAK;AAAA,MAClB,aAAa,KAAK;AAAA,MAClB,YAAY,KAAK,YAAY;AAAA,IAC9B,CAAC;AACF,WAAO;AAAA,EACR;AAAA,EAEQ,SAA8E;AACrF,UAAM,QAAQ,KAAK,UAAU;AAE7B,UAAM,aAAa,KAAK,QAAQ,WAAW,MAAM,GAAU;AAE3D,WAAO,EAAE,YAAY,MAAM;AAAA,EAC5B;AAAA;AAAA,EAGA,SAAc;AACb,WAAO,KAAK,UAAU,EAAE;AAAA,EACzB;AAAA,EAEA,QAAe;AACd,WAAO,KAAK,OAAO,EAAE;AAAA,EACtB;AAAA,EAES,UAA4B;AACpC,WAAO,KAAK,QAAQ,EAAE,QAAQ;AAAA,EAC/B;AACD;","names":[]}
|
|
@@ -786,7 +786,7 @@ class MySqlSelectQueryBuilderBase extends import_query_builder.TypedQueryBuilder
|
|
|
786
786
|
}
|
|
787
787
|
/** @internal */
|
|
788
788
|
getSQL() {
|
|
789
|
-
return this.dialect.buildSelectQuery(this.config
|
|
789
|
+
return this.dialect.buildSelectQuery(this.config);
|
|
790
790
|
}
|
|
791
791
|
toSQL() {
|
|
792
792
|
const { typings: _typings, ...rest } = this.dialect.sqlToQuery(this.getSQL());
|
|
@@ -824,28 +824,11 @@ class MySqlSelectBase extends MySqlSelectQueryBuilderBase {
|
|
|
824
824
|
if (!this.session) {
|
|
825
825
|
throw new Error("Cannot execute a query on a query builder. Please use a database instance instead.");
|
|
826
826
|
}
|
|
827
|
-
const
|
|
828
|
-
const
|
|
829
|
-
|
|
830
|
-
this.
|
|
831
|
-
|
|
832
|
-
void 0,
|
|
833
|
-
void 0,
|
|
834
|
-
void 0,
|
|
835
|
-
{
|
|
836
|
-
type: "select",
|
|
837
|
-
tables: [...this.usedTables]
|
|
838
|
-
},
|
|
839
|
-
this.cacheConfig,
|
|
840
|
-
{
|
|
841
|
-
query: "select",
|
|
842
|
-
joinsNotNullableMap,
|
|
843
|
-
dialect,
|
|
844
|
-
session,
|
|
845
|
-
config,
|
|
846
|
-
fieldsOrdered: fieldsList
|
|
847
|
-
}
|
|
848
|
-
);
|
|
827
|
+
const fieldsList = (0, import_utils.orderSelectedFields)(this.config.fields);
|
|
828
|
+
const query = this.session.prepareQuery(this.dialect.sqlToQuery(this.getSQL()), fieldsList, void 0, void 0, void 0, {
|
|
829
|
+
type: "select",
|
|
830
|
+
tables: [...this.usedTables]
|
|
831
|
+
}, this.cacheConfig);
|
|
849
832
|
query.joinsNotNullableMap = this.joinsNotNullableMap;
|
|
850
833
|
return query;
|
|
851
834
|
}
|