Skip to content

Commit 53b9b57

Browse files
dankochetovdankochetov
committed
Replace tsx with ts-node for integration tests
1 parent 410f881 commit 53b9b57

20 files changed

+184
-49
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,5 @@ dist.new
1010
.rollup.cache
1111
dist-dts
1212
rollup.config-*.mjs
13+
*.log
14+
.DS_Store

‎drizzle-orm/src/pg-core/schema.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { entityKind, is } from '~/entity.ts';
2-
import type { SQLWrapper } from '~/index.ts';
3-
import { SQL, sql } from '~/index.ts';
2+
import { SQL, sql, type SQLWrapper } from '~/sql/sql.ts';
43
import type { pgEnum } from './columns/enum.ts';
54
import { pgEnumWithSchema } from './columns/enum.ts';
65
import { type PgTableFn, pgTableWithSchema } from './table.ts';

‎drizzle-typebox/tests/mysql.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import {
3232
year,
3333
} from 'drizzle-orm/mysql-core';
3434
import { createInsertSchema, createSelectSchema, jsonSchema } from '../src';
35-
import { expectSchemaShape } from './utils';
35+
import { expectSchemaShape } from './utils.ts';
3636

3737
const customInt = customType<{ data: number }>({
3838
dataType() {

‎drizzle-typebox/tests/pg.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Value } from '@sinclair/typebox/value';
33
import test from 'ava';
44
import { char, date, integer, pgEnum, pgTable, serial, text, timestamp, varchar } from 'drizzle-orm/pg-core';
55
import { createInsertSchema, createSelectSchema, Nullable } from '../src';
6-
import { expectSchemaShape } from './utils';
6+
import { expectSchemaShape } from './utils.ts';
77

88
export const roleEnum = pgEnum('role', ['admin', 'user']);
99

‎drizzle-typebox/tests/sqlite.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Value } from '@sinclair/typebox/value';
33
import test from 'ava';
44
import { blob, integer, numeric, real, sqliteTable, text } from 'drizzle-orm/sqlite-core';
55
import { createInsertSchema, createSelectSchema, jsonSchema, Nullable } from '../src';
6-
import { expectSchemaShape } from './utils';
6+
import { expectSchemaShape } from './utils.ts';
77

88
const blobJsonSchema = Type.Object({
99
foo: Type.String(),

‎drizzle-valibot/tests/mysql.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ import {
4545
string,
4646
} from 'valibot';
4747
import { createInsertSchema, createSelectSchema, jsonSchema } from '../src';
48-
import { expectSchemaShape } from './utils';
48+
import { expectSchemaShape } from './utils.ts';
4949

5050
const customInt = customType<{ data: number }>({
5151
dataType() {

‎drizzle-valibot/tests/pg.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {
1616
string,
1717
} from 'valibot';
1818
import { createInsertSchema, createSelectSchema } from '../src';
19-
import { expectSchemaShape } from './utils';
19+
import { expectSchemaShape } from './utils.ts';
2020

2121
export const roleEnum = pgEnum('role', ['admin', 'user']);
2222

‎drizzle-valibot/tests/sqlite.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
string,
1616
} from 'valibot';
1717
import { createInsertSchema, createSelectSchema, jsonSchema } from '../src';
18-
import { expectSchemaShape } from './utils';
18+
import { expectSchemaShape } from './utils.ts';
1919

2020
const blobJsonSchema = object({
2121
foo: string(),

‎drizzle-zod/tests/mysql.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import {
3131
} from 'drizzle-orm/mysql-core';
3232
import { z } from 'zod';
3333
import { createInsertSchema, createSelectSchema, jsonSchema } from '~/index';
34-
import { expectSchemaShape } from './utils';
34+
import { expectSchemaShape } from './utils.ts';
3535

3636
const customInt = customType<{ data: number }>({
3737
dataType() {

‎drizzle-zod/tests/pg.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import test from 'ava';
22
import { char, date, integer, pgEnum, pgTable, serial, text, timestamp, varchar } from 'drizzle-orm/pg-core';
33
import { z } from 'zod';
44
import { createInsertSchema, createSelectSchema } from '../src';
5-
import { expectSchemaShape } from './utils';
5+
import { expectSchemaShape } from './utils.ts';
66

77
export const roleEnum = pgEnum('role', ['admin', 'user']);
88

‎drizzle-zod/tests/sqlite.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import test from 'ava';
22
import { blob, integer, numeric, real, sqliteTable, text } from 'drizzle-orm/sqlite-core';
33
import { z } from 'zod';
44
import { createInsertSchema, createSelectSchema, jsonSchema } from '../src';
5-
import { expectSchemaShape } from './utils';
5+
import { expectSchemaShape } from './utils.ts';
66

77
const blobJsonSchema = z.object({
88
foo: z.string(),

‎integration-tests/package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"scripts": {
77
"test:types": "tsc",
88
"test": "pnpm test:ava && pnpm test:esm && pnpm test:rqb",
9-
"test:ava": "NODE_OPTIONS='--loader=tsx --no-warnings --max-old-space-size=8192' ava tests --timeout=60s --serial",
9+
"test:ava": "cross-env NODE_OPTIONS='--loader=ts-node/esm --no-warnings' ava tests --timeout=60s --serial",
1010
"test:rqb": "vitest run --poolOptions.threads.singleThread",
1111
"test:esm": "node tests/imports.test.mjs && node tests/imports.test.cjs",
1212
"test:data-api": "sst shell vitest run tests/awsdatapi.test.ts"
@@ -34,19 +34,16 @@
3434
],
3535
"extensions": {
3636
"ts": "module"
37-
},
38-
"nodeArguments": [
39-
"--loader=tsx"
40-
]
37+
}
4138
},
4239
"keywords": [],
4340
"author": "Drizzle Team",
4441
"license": "Apache-2.0",
4542
"private": true,
4643
"devDependencies": {
44+
"@ava/typescript": "^5.0.0",
4745
"@neondatabase/serverless": "0.9.0",
4846
"@originjs/vite-plugin-commonjs": "^1.0.3",
49-
"@types/axios": "^0.14.0",
5047
"@types/better-sqlite3": "^7.6.4",
5148
"@types/dockerode": "^3.3.18",
5249
"@types/express": "^4.17.16",
@@ -57,6 +54,8 @@
5754
"@vitest/ui": "^1.6.0",
5855
"ava": "^5.3.0",
5956
"axios": "^1.4.0",
57+
"cross-env": "^7.0.3",
58+
"ts-node": "^10.9.2",
6059
"vite": "^4.3.9",
6160
"vite-tsconfig-paths": "^4.2.0",
6261
"zx": "^7.2.2"
@@ -83,6 +82,7 @@
8382
"mysql2": "^3.3.3",
8483
"pg": "^8.11.0",
8584
"postgres": "^3.3.5",
85+
"segfault-handler": "^1.3.0",
8686
"source-map-support": "^0.5.21",
8787
"sql.js": "^1.8.0",
8888
"sqlite3": "^5.1.4",

‎integration-tests/segfault.js

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
import SegfaultHandler from 'segfault-handler';
2+
SegfaultHandler.registerHandler();

‎integration-tests/tests/awsdatapi.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import {
2222
import { Resource } from 'sst';
2323
import { afterAll, beforeAll, beforeEach, expect, expectTypeOf, test } from 'vitest';
2424

25-
import type { Equal } from './utils';
26-
import { Expect, randomString } from './utils';
25+
import type { Equal } from './utils.ts';
26+
import { Expect, randomString } from './utils.ts';
2727

2828
dotenv.config();
2929

‎integration-tests/tests/mysql-schema.test.ts

+5-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import 'dotenv/config';
33
import type { TestFn } from 'ava';
44
import anyTest from 'ava';
55
import Docker from 'dockerode';
6-
import { asc, eq, Name, placeholder, sql } from 'drizzle-orm';
6+
import { asc, eq, Name, sql } from 'drizzle-orm';
77
import {
88
alias,
99
boolean,
@@ -27,7 +27,8 @@ import { drizzle } from 'drizzle-orm/mysql2';
2727
import getPort from 'get-port';
2828
import * as mysql from 'mysql2/promise';
2929
import { v4 as uuid } from 'uuid';
30-
import { toLocalDate } from './utils';
30+
31+
import { toLocalDate } from './utils.ts';
3132

3233
const mySchema = mysqlSchema('mySchema');
3334

@@ -660,7 +661,7 @@ test.serial('prepared statement reuse', async (t) => {
660661

661662
const stmt = db.insert(usersTable).values({
662663
verified: true,
663-
name: placeholder('name'),
664+
name: sql.placeholder('name'),
664665
}).prepare();
665666

666667
for (let i = 0; i < 10; i++) {
@@ -695,7 +696,7 @@ test.serial('prepared statement with placeholder in .where', async (t) => {
695696
id: usersTable.id,
696697
name: usersTable.name,
697698
}).from(usersTable)
698-
.where(eq(usersTable.id, placeholder('id')))
699+
.where(eq(usersTable.id, sql.placeholder('id')))
699700
.prepare();
700701
const result = await stmt.execute({ id: 1 });
701702

‎integration-tests/tests/mysql.custom.test.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ import { migrate } from 'drizzle-orm/mysql2/migrator';
2525
import getPort from 'get-port';
2626
import * as mysql from 'mysql2/promise';
2727
import { v4 as uuid } from 'uuid';
28-
import { toLocalDate } from './utils';
28+
29+
import { toLocalDate } from './utils.ts';
2930

3031
const customSerial = customType<{ data: number; notNull: true; default: true }>({
3132
dataType() {

‎integration-tests/tests/pg.custom.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { alias, customType, pgTable, pgTableCreator, serial, text } from 'drizzl
1111
import getPort from 'get-port';
1212
import pg from 'pg';
1313
import { v4 as uuid } from 'uuid';
14-
import { randomString } from './utils';
14+
import { randomString } from './utils.ts';
1515

1616
const { Client } = pg;
1717

‎integration-tests/tests/pg.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ import { type Equal, Expect, randomString } from './utils.ts';
8383

8484
const { Client } = pg;
8585

86-
const ENABLE_LOGGING = true;
86+
const ENABLE_LOGGING = false;
8787

8888
const usersTable = pgTable('users', {
8989
id: serial('id' as string).primaryKey(),

‎integration-tests/tsconfig.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"extends": "../tsconfig.json",
33
"compilerOptions": {
4+
"checkJs": false,
45
"noEmit": true,
56
"paths": {
67
"~/*": ["./tests/*"]

0 commit comments

Comments
 (0)