Replace tsx with ts-node for integration tests

drizzle-team · May 26, 2024 · 53b9b57 · 53b9b57
1 parent 410f881
commit 53b9b57
Show file tree

Hide file tree

Showing 20 changed files with 184 additions and 49 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,5 @@ dist.new
 .rollup.cache
 dist-dts
 rollup.config-*.mjs
+*.log
+.DS_Store
diff --git a/drizzle-orm/src/pg-core/schema.ts b/drizzle-orm/src/pg-core/schema.ts
@@ -1,6 +1,5 @@
 import { entityKind, is } from '~/entity.ts';
-import type { SQLWrapper } from '~/index.ts';
-import { SQL, sql } from '~/index.ts';
+import { SQL, sql, type SQLWrapper } from '~/sql/sql.ts';
 import type { pgEnum } from './columns/enum.ts';
 import { pgEnumWithSchema } from './columns/enum.ts';
 import { type PgTableFn, pgTableWithSchema } from './table.ts';

diff --git a/drizzle-typebox/tests/mysql.test.ts b/drizzle-typebox/tests/mysql.test.ts
@@ -32,7 +32,7 @@ import {
 	year,
 } from 'drizzle-orm/mysql-core';
 import { createInsertSchema, createSelectSchema, jsonSchema } from '../src';
-import { expectSchemaShape } from './utils';
+import { expectSchemaShape } from './utils.ts';
 
 const customInt = customType<{ data: number }>({
 	dataType() {

diff --git a/drizzle-typebox/tests/pg.test.ts b/drizzle-typebox/tests/pg.test.ts
@@ -3,7 +3,7 @@ import { Value } from '@sinclair/typebox/value';
 import test from 'ava';
 import { char, date, integer, pgEnum, pgTable, serial, text, timestamp, varchar } from 'drizzle-orm/pg-core';
 import { createInsertSchema, createSelectSchema, Nullable } from '../src';
-import { expectSchemaShape } from './utils';
+import { expectSchemaShape } from './utils.ts';
 
 export const roleEnum = pgEnum('role', ['admin', 'user']);
 

diff --git a/drizzle-typebox/tests/sqlite.test.ts b/drizzle-typebox/tests/sqlite.test.ts
@@ -3,7 +3,7 @@ import { Value } from '@sinclair/typebox/value';
 import test from 'ava';
 import { blob, integer, numeric, real, sqliteTable, text } from 'drizzle-orm/sqlite-core';
 import { createInsertSchema, createSelectSchema, jsonSchema, Nullable } from '../src';
-import { expectSchemaShape } from './utils';
+import { expectSchemaShape } from './utils.ts';
 
 const blobJsonSchema = Type.Object({
 	foo: Type.String(),

diff --git a/drizzle-valibot/tests/mysql.test.ts b/drizzle-valibot/tests/mysql.test.ts
@@ -45,7 +45,7 @@ import {
 	string,
 } from 'valibot';
 import { createInsertSchema, createSelectSchema, jsonSchema } from '../src';
-import { expectSchemaShape } from './utils';
+import { expectSchemaShape } from './utils.ts';
 
 const customInt = customType<{ data: number }>({
 	dataType() {

diff --git a/drizzle-valibot/tests/pg.test.ts b/drizzle-valibot/tests/pg.test.ts
@@ -16,7 +16,7 @@ import {
 	string,
 } from 'valibot';
 import { createInsertSchema, createSelectSchema } from '../src';
-import { expectSchemaShape } from './utils';
+import { expectSchemaShape } from './utils.ts';
 
 export const roleEnum = pgEnum('role', ['admin', 'user']);
 

diff --git a/drizzle-valibot/tests/sqlite.test.ts b/drizzle-valibot/tests/sqlite.test.ts
@@ -15,7 +15,7 @@ import {
 	string,
 } from 'valibot';
 import { createInsertSchema, createSelectSchema, jsonSchema } from '../src';
-import { expectSchemaShape } from './utils';
+import { expectSchemaShape } from './utils.ts';
 
 const blobJsonSchema = object({
 	foo: string(),

diff --git a/drizzle-zod/tests/mysql.test.ts b/drizzle-zod/tests/mysql.test.ts
@@ -31,7 +31,7 @@ import {
 } from 'drizzle-orm/mysql-core';
 import { z } from 'zod';
 import { createInsertSchema, createSelectSchema, jsonSchema } from '~/index';
-import { expectSchemaShape } from './utils';
+import { expectSchemaShape } from './utils.ts';
 
 const customInt = customType<{ data: number }>({
 	dataType() {

diff --git a/drizzle-zod/tests/pg.test.ts b/drizzle-zod/tests/pg.test.ts
@@ -2,7 +2,7 @@ import test from 'ava';
 import { char, date, integer, pgEnum, pgTable, serial, text, timestamp, varchar } from 'drizzle-orm/pg-core';
 import { z } from 'zod';
 import { createInsertSchema, createSelectSchema } from '../src';
-import { expectSchemaShape } from './utils';
+import { expectSchemaShape } from './utils.ts';
 
 export const roleEnum = pgEnum('role', ['admin', 'user']);
 

diff --git a/drizzle-zod/tests/sqlite.test.ts b/drizzle-zod/tests/sqlite.test.ts
@@ -2,7 +2,7 @@ import test from 'ava';
 import { blob, integer, numeric, real, sqliteTable, text } from 'drizzle-orm/sqlite-core';
 import { z } from 'zod';
 import { createInsertSchema, createSelectSchema, jsonSchema } from '../src';
-import { expectSchemaShape } from './utils';
+import { expectSchemaShape } from './utils.ts';
 
 const blobJsonSchema = z.object({
 	foo: z.string(),

diff --git a/integration-tests/package.json b/integration-tests/package.json
@@ -6,7 +6,7 @@
 	"scripts": {
 		"test:types": "tsc",
 		"test": "pnpm test:ava && pnpm test:esm && pnpm test:rqb",
-		"test:ava": "NODE_OPTIONS='--loader=tsx --no-warnings --max-old-space-size=8192' ava tests --timeout=60s --serial",
+		"test:ava": "cross-env NODE_OPTIONS='--loader=ts-node/esm --no-warnings' ava tests --timeout=60s --serial",
 		"test:rqb": "vitest run --poolOptions.threads.singleThread",
 		"test:esm": "node tests/imports.test.mjs && node tests/imports.test.cjs",
 		"test:data-api": "sst shell vitest run tests/awsdatapi.test.ts"
@@ -34,19 +34,16 @@
 		],
 		"extensions": {
 			"ts": "module"
-		},
-		"nodeArguments": [
-			"--loader=tsx"
-		]
+		}
 	},
 	"keywords": [],
 	"author": "Drizzle Team",
 	"license": "Apache-2.0",
 	"private": true,
 	"devDependencies": {
+		"@ava/typescript": "^5.0.0",
 		"@neondatabase/serverless": "0.9.0",
 		"@originjs/vite-plugin-commonjs": "^1.0.3",
-		"@types/axios": "^0.14.0",
 		"@types/better-sqlite3": "^7.6.4",
 		"@types/dockerode": "^3.3.18",
 		"@types/express": "^4.17.16",
@@ -57,6 +54,8 @@
 		"@vitest/ui": "^1.6.0",
 		"ava": "^5.3.0",
 		"axios": "^1.4.0",
+		"cross-env": "^7.0.3",
+		"ts-node": "^10.9.2",
 		"vite": "^4.3.9",
 		"vite-tsconfig-paths": "^4.2.0",
 		"zx": "^7.2.2"
@@ -83,6 +82,7 @@
 		"mysql2": "^3.3.3",
 		"pg": "^8.11.0",
 		"postgres": "^3.3.5",
+		"segfault-handler": "^1.3.0",
 		"source-map-support": "^0.5.21",
 		"sql.js": "^1.8.0",
 		"sqlite3": "^5.1.4",

diff --git a/integration-tests/segfault.js b/integration-tests/segfault.js
@@ -0,0 +1,2 @@
+import SegfaultHandler from 'segfault-handler';
+SegfaultHandler.registerHandler();
diff --git a/integration-tests/tests/awsdatapi.test.ts b/integration-tests/tests/awsdatapi.test.ts
@@ -22,8 +22,8 @@ import {
 import { Resource } from 'sst';
 import { afterAll, beforeAll, beforeEach, expect, expectTypeOf, test } from 'vitest';
 
-import type { Equal } from './utils';
-import { Expect, randomString } from './utils';
+import type { Equal } from './utils.ts';
+import { Expect, randomString } from './utils.ts';
 
 dotenv.config();
 

diff --git a/integration-tests/tests/mysql-schema.test.ts b/integration-tests/tests/mysql-schema.test.ts
@@ -3,7 +3,7 @@ import 'dotenv/config';
 import type { TestFn } from 'ava';
 import anyTest from 'ava';
 import Docker from 'dockerode';
-import { asc, eq, Name, placeholder, sql } from 'drizzle-orm';
+import { asc, eq, Name, sql } from 'drizzle-orm';
 import {
 	alias,
 	boolean,
@@ -27,7 +27,8 @@ import { drizzle } from 'drizzle-orm/mysql2';
 import getPort from 'get-port';
 import * as mysql from 'mysql2/promise';
 import { v4 as uuid } from 'uuid';
-import { toLocalDate } from './utils';
+
+import { toLocalDate } from './utils.ts';
 
 const mySchema = mysqlSchema('mySchema');
 
@@ -660,7 +661,7 @@ test.serial('prepared statement reuse', async (t) => {
 
 	const stmt = db.insert(usersTable).values({
 		verified: true,
-		name: placeholder('name'),
+		name: sql.placeholder('name'),
 	}).prepare();
 
 	for (let i = 0; i < 10; i++) {
@@ -695,7 +696,7 @@ test.serial('prepared statement with placeholder in .where', async (t) => {
 		id: usersTable.id,
 		name: usersTable.name,
 	}).from(usersTable)
-		.where(eq(usersTable.id, placeholder('id')))
+		.where(eq(usersTable.id, sql.placeholder('id')))
 		.prepare();
 	const result = await stmt.execute({ id: 1 });
 

diff --git a/integration-tests/tests/mysql.custom.test.ts b/integration-tests/tests/mysql.custom.test.ts
@@ -25,7 +25,8 @@ import { migrate } from 'drizzle-orm/mysql2/migrator';
 import getPort from 'get-port';
 import * as mysql from 'mysql2/promise';
 import { v4 as uuid } from 'uuid';
-import { toLocalDate } from './utils';
+
+import { toLocalDate } from './utils.ts';
 
 const customSerial = customType<{ data: number; notNull: true; default: true }>({
 	dataType() {

diff --git a/integration-tests/tests/pg.custom.test.ts b/integration-tests/tests/pg.custom.test.ts
@@ -11,7 +11,7 @@ import { alias, customType, pgTable, pgTableCreator, serial, text } from 'drizzl
 import getPort from 'get-port';
 import pg from 'pg';
 import { v4 as uuid } from 'uuid';
-import { randomString } from './utils';
+import { randomString } from './utils.ts';
 
 const { Client } = pg;
 

diff --git a/integration-tests/tests/pg.test.ts b/integration-tests/tests/pg.test.ts
@@ -83,7 +83,7 @@ import { type Equal, Expect, randomString } from './utils.ts';
 
 const { Client } = pg;
 
-const ENABLE_LOGGING = true;
+const ENABLE_LOGGING = false;
 
 const usersTable = pgTable('users', {
 	id: serial('id' as string).primaryKey(),

diff --git a/integration-tests/tsconfig.json b/integration-tests/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../tsconfig.json",
 	"compilerOptions": {
+		"checkJs": false,
 		"noEmit": true,
 		"paths": {
 			"~/*": ["./tests/*"]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		import SegfaultHandler from 'segfault-handler';
		SegfaultHandler.registerHandler();