Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

RQB v2 #3974

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

RQB v2 #3974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
4b33aac
Fixed `isConfig` checks using types of wrong fields
Sukairo-02 Nov 25, 2024
e464c5a
Merge branch 'beta' of https://github.com/drizzle-team/drizzle-orm in…
Sukairo-02 Nov 28, 2024
0133c69
Added changes from `relations-api-v2` branch, moved RQB v1 to `_query…
Sukairo-02 Dec 10, 2024
9076879
Temporarily removed `db.query` type errors on empty relations for `wi…
Sukairo-02 Dec 12, 2024
51fb18f
Removed unused export
Sukairo-02 Dec 12, 2024
8a1e156
Updated imports for RQBv1
Sukairo-02 Dec 12, 2024
5514d51
Fixed types in AWS Data Api, updated Session constructor in kit
Sukairo-02 Dec 12, 2024
6c94f51
Fixed misplaced execute and executeRqbV2
Sukairo-02 Dec 12, 2024
d21dbf5
Updated `query` to `_query` in `js-tests`
Sukairo-02 Dec 12, 2024
7f37974
Fixed lack of file formats in imports
Sukairo-02 Dec 12, 2024
dbf7383
Bump `better-sqlite3` version to `9.3.0` for jsonb functions support,…
Sukairo-02 Dec 16, 2024
3c69a1f
Fixed RQB types breaking on different table db and ts names
Sukairo-02 Dec 18, 2024
7665ad9
Reverted to using tsNames as `table._.name` & `column._.tableName` in…
Sukairo-02 Dec 19, 2024
68c5844
Updated database instance generics with new fields
Sukairo-02 Dec 20, 2024
0ab568f
Fixed sqlite rqb v2 query not working properly with sync drivers
Sukairo-02 Dec 20, 2024
661b6f2
Fixed extras inferrence with `SQL.Aliased`, returned `columns` argume…
Sukairo-02 Dec 20, 2024
66f461a
Fixed self-referencing relations, switched dbConfig callbacks table t…
Sukairo-02 Dec 27, 2024
29df678
Merge branch 'beta' of https://github.com/drizzle-team/drizzle-orm in…
Sukairo-02 Dec 27, 2024
23e557c
Restored pulled _relations changes
Sukairo-02 Dec 27, 2024
bad7b01
Implemented rqb-v2 changes to new drivers, updated tests, fixed neon-…
Sukairo-02 Dec 27, 2024
800631d
Fixed drizzle-seed test imports
Sukairo-02 Dec 27, 2024
549137f
Returned changes lost during merging
Sukairo-02 Dec 30, 2024
c095ebc
Updated types
Sukairo-02 Dec 30, 2024
791f459
Fixed broken new test cases
Sukairo-02 Dec 30, 2024
7db411e
Improved types, allowed true+false column selection, updated RQB v2 e…
Sukairo-02 Dec 31, 2024
e6823b4
Fixed SQLite RQB V2 self-relations, added `better-sqlite3` tests for …
Sukairo-02 Dec 31, 2024
38fedf0
Improved & fixed RQB filters, added runtime error on nulls in non-opt…
Sukairo-02 Jan 7, 2025
b4f992e
MySQL2 tests for RQBv2, workarounds for MySQL limitations on lateral …
Sukairo-02 Jan 8, 2025
348fb92
Switched MySQL RQBv2 builders to lateral left joins, fixed nested agg…
Sukairo-02 Jan 8, 2025
86fcd29
Removed unused code from planetscale session's `executeRqbV2()`, adde…
Sukairo-02 Jan 9, 2025
5734f71
Experimental `.through()` implementation, removed errors on nulls in …
Sukairo-02 Jan 15, 2025
f2d266c
New test cases for RQB, SQLite and MySQL RQB tests per-driver, mysql-…
Sukairo-02 Jan 18, 2025
2c70592
Fixed RQB v2 for `sqlite-proxy`, fixed out of scope sqlite tests, sim…
Sukairo-02 Jan 18, 2025
57eb6bd
RQBv2 schema fixes, fixed sql builder adding schemas on table aliases…
Sukairo-02 Jan 20, 2025
efed06b
Tests for `where` and `orderBy` RQBv2 builders, fixed `where.raw` cal…
Sukairo-02 Jan 20, 2025
0deb353
Merge branch 'beta' of https://github.com/drizzle-team/drizzle-orm in…
Sukairo-02 Jan 20, 2025
e36471e
Updated seeder test case schemae
Sukairo-02 Jan 20, 2025
b2a3e97
Version bump
Sukairo-02 Jan 20, 2025
b06bbcd
Version bump
Sukairo-02 Jan 20, 2025
389471d
Fixed and returned `neon-http-batch` tests, `sql-js` rqb v2 tests, sw…
Sukairo-02 Jan 21, 2025
19ccabb
Reverted latest changes for SQLite RQBv1 prepare logic
Sukairo-02 Jan 21, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion drizzle-kit/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "drizzle-kit",
"version": "0.30.2",
"version": "0.30.3",
"homepage": "https://orm.drizzle.team",
"keywords": [
"drizzle",
Expand Down
2 changes: 1 addition & 1 deletion drizzle-kit/src/cli/commands/introspect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,7 @@ export const relationsToTypeScript = (

const uniqueImports = [...new Set(imports)];

const importsTs = `import { relations } from "drizzle-orm/relations";\nimport { ${
const importsTs = `import { relations } from "drizzle-orm/_relations";\nimport { ${
uniqueImports.join(
', ',
)
Expand Down
1 change: 1 addition & 0 deletions drizzle-kit/src/cli/connections.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ export const preparePostgresDB = async (
rdsClient,
new PgDialect(),
undefined,
undefined,
config,
undefined,
);
Expand Down
2 changes: 1 addition & 1 deletion drizzle-kit/src/cli/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export const assertOrmCoreVersion = async () => {
try {
const { compatibilityVersion } = await import('drizzle-orm/version');

await import('drizzle-orm/relations');
await import('drizzle-orm/_relations');

if (compatibilityVersion && compatibilityVersion === requiredApiVersion) {
return;
Expand Down
4 changes: 2 additions & 2 deletions drizzle-kit/src/introspect-pg.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { getTableName, is } from 'drizzle-orm';
import { AnyPgTable } from 'drizzle-orm/pg-core';
import {
createTableRelationsHelpers,
extractTablesRelationalConfig,
Many,
One,
Relation,
Relations,
} from 'drizzle-orm/relations';
} from 'drizzle-orm/_relations';
import { AnyPgTable } from 'drizzle-orm/pg-core';
import './@types/utils';
import { toCamelCase } from 'drizzle-orm/casing';
import { Casing } from './cli/validations/common';
Expand Down
6 changes: 2 additions & 4 deletions drizzle-kit/src/serializer/studio.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
import { serve } from '@hono/node-server';
import { zValidator } from '@hono/zod-validator';
import { createHash } from 'crypto';
import { AnyColumn, AnyTable, is } from 'drizzle-orm';
import {
AnyColumn,
AnyTable,
createTableRelationsHelpers,
extractTablesRelationalConfig,
is,
Many,
normalizeRelation,
One,
Relations,
TablesRelationalConfig,
} from 'drizzle-orm';
} from 'drizzle-orm/_relations';
import { AnyMySqlTable, getTableConfig as mysqlTableConfig, MySqlTable } from 'drizzle-orm/mysql-core';
import { AnyPgTable, getTableConfig as pgTableConfig, PgTable } from 'drizzle-orm/pg-core';
import {
Expand Down
6 changes: 3 additions & 3 deletions drizzle-orm/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "drizzle-orm",
"version": "0.38.4",
"version": "0.39.0",
"description": "Drizzle ORM package for SQL databases",
"type": "module",
"scripts": {
Expand Down Expand Up @@ -62,7 +62,7 @@
"@types/sql.js": "*",
"@vercel/postgres": ">=0.8.0",
"@xata.io/client": "*",
"better-sqlite3": ">=7",
"better-sqlite3": ">=9.3.0",
"bun-types": "*",
"expo-sqlite": ">=14.0.0",
"knex": "*",
Expand Down Expand Up @@ -184,7 +184,7 @@
"@types/sql.js": "^1.4.4",
"@vercel/postgres": "^0.8.0",
"@xata.io/client": "^0.29.3",
"better-sqlite3": "^8.4.0",
"better-sqlite3": "^9.3.0",
"bun-types": "^0.6.6",
"cpy": "^10.1.0",
"expo-sqlite": "^14.0.0",
Expand Down
Loading