Skip to content

Commit b2af4f4

Browse files
committed
Merge branch 'beta' of https://github.com/drizzle-team/drizzle-orm into alternation-engine
2 parents d0591b8 + 7722e6a commit b2af4f4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+5111
-191
lines changed

.github/workflows/release-feature-branch.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,4 +405,4 @@ jobs:
405405
run: |
406406
set -euxo pipefail
407407
npm publish ./artifacts/${{ matrix.package }}/package.tgz --tag "${{ steps.checks.outputs.tag }}"
408-
echo "npm: \`${{ matrix.package }}@${{ steps.checks.outputs.tag }} | ${{ steps.checks.outputs.version }}\`" >> $GITHUB_STEP_SUMMARY
408+
echo "npm: \`${{ matrix.package }}@${{ steps.checks.outputs.tag }} | ${{ steps.checks.outputs.version }}\`" >> $GITHUB_STEP_SUMMARY

.github/workflows/release-latest.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
ports:
102102
- 33306:3306
103103
singlestore:
104-
image: ghcr.io/singlestore-labs/singlestoredb-dev:latest
104+
image: ghcr.io/singlestore-labs/singlestoredb-dev:0.2.67
105105
env:
106106
ROOT_PASSWORD: singlestore
107107
ports:

.github/workflows/router.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
workflow_dispatch:
99

1010
jobs:
11-
detect:
11+
switch:
1212
runs-on: ubuntu-latest
1313
outputs:
1414
target: ${{ steps.route.outputs.target }}
@@ -23,8 +23,8 @@ jobs:
2323
fi
2424
2525
run-feature:
26-
needs: detect
27-
if: needs.detect.outputs.target == 'feature'
26+
needs: switch
27+
if: needs.switch.outputs.target == 'feature'
2828
uses: ./.github/workflows/release-feature-branch.yaml
2929
secrets:
3030
PLANETSCALE_CONNECTION_STRING: ${{ secrets.PLANETSCALE_CONNECTION_STRING }}
@@ -39,8 +39,8 @@ jobs:
3939
SQLITE_MANY_CLOUD_CONNECTION_STRING: ${{ secrets.SQLITE_MANY_CLOUD_CONNECTION_STRING }}
4040

4141
run-latest:
42-
needs: detect
43-
if: needs.detect.outputs.target == 'latest'
42+
needs: switch
43+
if: needs.switch.outputs.target == 'latest'
4444
uses: ./.github/workflows/release-latest.yaml
4545
secrets:
4646
PLANETSCALE_CONNECTION_STRING: ${{ secrets.PLANETSCALE_CONNECTION_STRING }}

changelogs/drizzle-kit/0.31.8.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
### Bug fixes
2+
3+
- Fixed `algorythm` => `algorithm` typo

changelogs/drizzle-orm/0.45.0.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
- Fixed pg-native Pool detection in node-postgres transactions
2+
- Allowed subqueries in select fields
3+
- Updated typo algorythm => algorithm
4+
- Fixed `$onUpdate` not handling `SQL` values (fixes [#2388](https://github.com/drizzle-team/drizzle-orm/issues/2388), tests implemented by [L-Mario564](https://github.com/L-Mario564) in [#2911](https://github.com/drizzle-team/drizzle-orm/pull/2911))
5+
- Fixed `pg` mappers not handling `Date` instances in `bun-sql:postgresql` driver responses for `date`, `timestamp` types (fixes [#4493](https://github.com/drizzle-team/drizzle-orm/issues/4493))

dprint.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"**/_journal.json",
2323
"**/tsup.config*.mjs",
2424
"**/.sst",
25+
"rollup.config-*.mjs",
2526
"integration-tests/tests/prisma/*/client",
2627
"integration-tests/tests/prisma/*/drizzle"
2728
],

drizzle-arktype/tests/mysql.test.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,8 @@ test('all data types', (t) => {
374374
bigint2: bigint({ mode: 'bigint' }).notNull(),
375375
bigint3: bigint({ unsigned: true, mode: 'number' }).notNull(),
376376
bigint4: bigint({ unsigned: true, mode: 'bigint' }).notNull(),
377+
bigint5: bigint({ mode: 'string' }).notNull(),
378+
bigint6: bigint({ unsigned: true, mode: 'string' }).notNull(),
377379
binary: binary({ length: 10 }).notNull(),
378380
boolean: boolean().notNull(),
379381
char1: char({ length: 10 }).notNull(),
@@ -427,6 +429,8 @@ test('all data types', (t) => {
427429
bigint2: type.bigint.narrow(bigintNarrow),
428430
bigint3: type.keywords.number.integer.atLeast(0).atMost(Number.MAX_SAFE_INTEGER),
429431
bigint4: type.bigint.narrow(unsignedBigintNarrow),
432+
bigint5: type.string,
433+
bigint6: type.string,
430434
binary: type(`/^[01]{0,10}$/`).describe(
431435
`a string containing ones or zeros while being up to 10 characters long`,
432436
) as Type<string>,

drizzle-arktype/tests/pg.test.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,7 @@ test('all data types', (t) => {
420420
}) => ({
421421
bigint1: bigint({ mode: 'number' }).notNull(),
422422
bigint2: bigint({ mode: 'bigint' }).notNull(),
423+
bigint3: bigint({ mode: 'string' }).notNull(),
423424
bigserial1: bigserial({ mode: 'number' }).notNull(),
424425
bigserial2: bigserial({ mode: 'bigint' }).notNull(),
425426
bit: bit({ dimensions: 5 }).notNull(),
@@ -470,6 +471,7 @@ test('all data types', (t) => {
470471
const expected = type({
471472
bigint1: type.keywords.number.integer.atLeast(Number.MIN_SAFE_INTEGER).atMost(Number.MAX_SAFE_INTEGER),
472473
bigint2: type.bigint.narrow(bigintNarrow),
474+
bigint3: type.string,
473475
bigserial1: type.keywords.number.integer.atLeast(Number.MIN_SAFE_INTEGER).atMost(Number.MAX_SAFE_INTEGER),
474476
bigserial2: type.bigint.narrow(bigintNarrow),
475477
bit: type(/^[01]{5}$/).describe('a string containing ones or zeros while being 5 characters long'),

drizzle-arktype/tests/singlestore.test.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,8 @@ test('all data types', (t) => {
377377
bigint2: bigint({ mode: 'bigint' }).notNull(),
378378
bigint3: bigint({ unsigned: true, mode: 'number' }).notNull(),
379379
bigint4: bigint({ unsigned: true, mode: 'bigint' }).notNull(),
380+
bigint5: bigint({ mode: 'string' }).notNull(),
381+
bigint6: bigint({ unsigned: true, mode: 'string' }).notNull(),
380382
binary: binary({ length: 10 }).notNull(),
381383
boolean: boolean().notNull(),
382384
char1: char({ length: 10 }).notNull(),
@@ -438,6 +440,8 @@ test('all data types', (t) => {
438440
bigint2: type.bigint.narrow(bigintNarrow),
439441
bigint3: type.keywords.number.integer.atLeast(0).atMost(Number.MAX_SAFE_INTEGER),
440442
bigint4: type.bigint.narrow(unsignedBigintNarrow),
443+
bigint5: type.string,
444+
bigint6: type.string,
441445
binary: type(`/^[01]{0,10}$/`).describe(
442446
`a string containing ones or zeros while being up to 10 characters long`,
443447
) as Type<string>,

drizzle-kit/build.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ const driversPackages = [
1818
'@libsql/client',
1919
'better-sqlite3',
2020
'bun:sqlite',
21+
'@sqlitecloud/drivers',
22+
'@tursodatabase/database',
23+
'bun',
2124
];
2225

2326
esbuild.buildSync({

0 commit comments

Comments
 (0)