Skip to content

Commit b2e509b

Browse files
committed
Updated tests
1 parent 1891859 commit b2e509b

5 files changed

Lines changed: 9 additions & 121 deletions

File tree

drizzle-orm/tests/casing/pg-to-camel.test.ts

Lines changed: 1 addition & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const developersRelations = relations(developers, ({ one }) => ({
2929
const devs = alias(developers, 'devs');
3030
const schema = { users, usersRelations, developers, developersRelations };
3131

32-
const db = drizzle({ client: postgres(''), schema, casing: 'camelCase' });
32+
const db = drizzle({ client: postgres(''), casing: 'camelCase' });
3333

3434
const usersCache = {
3535
'public.users.id': 'id',
@@ -130,62 +130,6 @@ describe('postgres to camel case', () => {
130130
expect(db.dialect.casing.cache).toEqual(usersCache);
131131
});
132132

133-
it('query (find first)', ({ expect }) => {
134-
const query = db._query.users.findFirst({
135-
columns: {
136-
id: true,
137-
age: true,
138-
},
139-
extras: {
140-
fullName,
141-
},
142-
where: eq(users.id, 1),
143-
with: {
144-
developers: {
145-
columns: {
146-
uses_drizzle_orm: true,
147-
},
148-
},
149-
},
150-
});
151-
152-
expect(query.toSQL()).toEqual({
153-
sql:
154-
'select "users"."id", "users"."AGE", "users"."firstName" || \' \' || "users"."lastName" as "name", "users_developers"."data" as "developers" from "users" "users" left join lateral (select json_build_array("users_developers"."usesDrizzleOrm") as "data" from (select * from "test"."developers" "users_developers" where "users_developers"."userId" = "users"."id" limit $1) "users_developers") "users_developers" on true where "users"."id" = $2 limit $3',
155-
params: [1, 1, 1],
156-
typings: ['none', 'none', 'none'],
157-
});
158-
expect(db.dialect.casing.cache).toEqual(cache);
159-
});
160-
161-
it('query (find many)', ({ expect }) => {
162-
const query = db._query.users.findMany({
163-
columns: {
164-
id: true,
165-
age: true,
166-
},
167-
extras: {
168-
fullName,
169-
},
170-
where: eq(users.id, 1),
171-
with: {
172-
developers: {
173-
columns: {
174-
uses_drizzle_orm: true,
175-
},
176-
},
177-
},
178-
});
179-
180-
expect(query.toSQL()).toEqual({
181-
sql:
182-
'select "users"."id", "users"."AGE", "users"."firstName" || \' \' || "users"."lastName" as "name", "users_developers"."data" as "developers" from "users" "users" left join lateral (select json_build_array("users_developers"."usesDrizzleOrm") as "data" from (select * from "test"."developers" "users_developers" where "users_developers"."userId" = "users"."id" limit $1) "users_developers") "users_developers" on true where "users"."id" = $2',
183-
params: [1, 1],
184-
typings: ['none', 'none'],
185-
});
186-
expect(db.dialect.casing.cache).toEqual(cache);
187-
});
188-
189133
it('insert (on conflict do nothing)', ({ expect }) => {
190134
const query = db
191135
.insert(users)

drizzle-orm/tests/casing/pg-to-snake.test.ts

Lines changed: 1 addition & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const developersRelations = relations(developers, ({ one }) => ({
2929
const devs = alias(developers, 'devs');
3030
const schema = { users, usersRelations, developers, developersRelations };
3131

32-
const db = drizzle({ client: postgres(''), schema, casing: 'snake_case' });
32+
const db = drizzle({ client: postgres(''), casing: 'snake_case' });
3333

3434
const usersCache = {
3535
'public.users.id': 'id',
@@ -132,62 +132,6 @@ describe('postgres to snake case', () => {
132132
expect(db.dialect.casing.cache).toEqual(usersCache);
133133
});
134134

135-
it('query (find first)', ({ expect }) => {
136-
const query = db._query.users.findFirst({
137-
columns: {
138-
id: true,
139-
age: true,
140-
},
141-
extras: {
142-
fullName,
143-
},
144-
where: eq(users.id, 1),
145-
with: {
146-
developers: {
147-
columns: {
148-
usesDrizzleORM: true,
149-
},
150-
},
151-
},
152-
});
153-
154-
expect(query.toSQL()).toEqual({
155-
sql:
156-
'select "users"."id", "users"."AGE", "users"."first_name" || \' \' || "users"."last_name" as "name", "users_developers"."data" as "developers" from "users" "users" left join lateral (select json_build_array("users_developers"."uses_drizzle_orm") as "data" from (select * from "test"."developers" "users_developers" where "users_developers"."user_id" = "users"."id" limit $1) "users_developers") "users_developers" on true where "users"."id" = $2 limit $3',
157-
params: [1, 1, 1],
158-
typings: ['none', 'none', 'none'],
159-
});
160-
expect(db.dialect.casing.cache).toEqual(cache);
161-
});
162-
163-
it('query (find many)', ({ expect }) => {
164-
const query = db._query.users.findMany({
165-
columns: {
166-
id: true,
167-
age: true,
168-
},
169-
extras: {
170-
fullName,
171-
},
172-
where: eq(users.id, 1),
173-
with: {
174-
developers: {
175-
columns: {
176-
usesDrizzleORM: true,
177-
},
178-
},
179-
},
180-
});
181-
182-
expect(query.toSQL()).toEqual({
183-
sql:
184-
'select "users"."id", "users"."AGE", "users"."first_name" || \' \' || "users"."last_name" as "name", "users_developers"."data" as "developers" from "users" "users" left join lateral (select json_build_array("users_developers"."uses_drizzle_orm") as "data" from (select * from "test"."developers" "users_developers" where "users_developers"."user_id" = "users"."id" limit $1) "users_developers") "users_developers" on true where "users"."id" = $2',
185-
params: [1, 1],
186-
typings: ['none', 'none'],
187-
});
188-
expect(db.dialect.casing.cache).toEqual(cache);
189-
});
190-
191135
it('insert (on conflict do nothing)', ({ expect }) => {
192136
const query = db
193137
.insert(users)

drizzle-orm/tests/makePgArray.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { describe, it } from 'vitest';
2-
import { makePgArray } from '~/pg-core/utils/array.ts';
2+
import { makePgArray } from '~/pg-core/utils.ts';
33

44
describe.concurrent('makePgArray', () => {
55
it('parses simple 1D array', ({ expect }) => {

drizzle-orm/tests/parsePgArray.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { describe, it } from 'vitest';
2-
import { parsePgArray } from '~/pg-core/utils/array.ts';
2+
import { parsePgArray } from '~/pg-core/utils.ts';
33

44
describe.concurrent('parsePgArray', () => {
55
it('parses simple 1D array', ({ expect }) => {

integration-tests/tests/pg/neon-http-batch.test.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ describe('batch', () => {
197197
}[],
198198
]>();
199199

200-
expect(batchResponse.length).eq(4);
200+
expect(batchResponse.length).eq(3);
201201

202202
expect(batchResponse[0]).toEqual([{
203203
id: 1,
@@ -239,7 +239,7 @@ describe('batch', () => {
239239
} | undefined,
240240
]>();
241241

242-
expect(batchResponse.length).eq(6);
242+
expect(batchResponse.length).eq(4);
243243

244244
expect(batchResponse[0]).toEqual([{
245245
id: 1,
@@ -307,7 +307,7 @@ describe('batch', () => {
307307
}>,
308308
]>();
309309

310-
expect(batchResponse.length).eq(5);
310+
expect(batchResponse.length).eq(4);
311311

312312
expect(batchResponse[0]).toEqual([{
313313
id: 1,
@@ -361,7 +361,7 @@ describe('batch', () => {
361361
}[],
362362
]>();
363363

364-
expect(batchResponse.length).eq(6);
364+
expect(batchResponse.length).eq(5);
365365

366366
expect(batchResponse[0]).toEqual([{
367367
id: 1,
@@ -414,7 +414,7 @@ describe('batch', () => {
414414
} | undefined,
415415
]>();
416416

417-
expect(batchResponse.length).eq(5);
417+
expect(batchResponse.length).eq(4);
418418

419419
expect(batchResponse[0]).toEqual([{
420420
id: 1,

0 commit comments

Comments
 (0)