[drizzle-seed] removed docker container creation from pg-postgis data types tests

Author: OleksiiKH0240

compose/dockers.sh

@@ -28,4 +28,5 @@ docker run -d --name singlestoredb-dev \
   -e ROOT_PASSWORD="password" \
   --platform linux/amd64 \
   -p 3306:3306 -p 8080:8080 -p 9000:9000 \
-  ghcr.io/singlestore-labs/singlestoredb-dev:latest
+  ghcr.io/singlestore-labs/singlestoredb-dev:latest
+# if the command above doesn't work for you on mac m1, try using version 0.2.57 of docker image.

drizzle-seed/tests/pg/allDataTypesTest/pgPostgisSchema.ts

@@ -1,11 +1,9 @@
-import { geometry, pgSchema } from 'drizzle-orm/pg-core';
+import { geometry, pgTable } from 'drizzle-orm/pg-core';
 
-export const schema = pgSchema('seeder_lib_pg');
-
-export const allDataTypes = schema.table('postgis_data_types', {
+export const allDataTypes = pgTable('postgis_data_types', {
 	geometry: geometry('geometry', { type: 'point', mode: 'tuple', srid: 0 }),
 });
 
-export const allArrayDataTypes = schema.table('postgis_array_data_types', {
+export const allArrayDataTypes = pgTable('postgis_array_data_types', {
 	geometryArray: geometry('geometry_array', { type: 'point', mode: 'tuple', srid: 0 }).array(1),
 });

drizzle-seed/tests/pg/allDataTypesTest/pgSchema.ts

@@ -7,7 +7,6 @@ import {
 	date,
 	decimal,
 	doublePrecision,
-	// geometry,
 	inet,
 	integer,
 	interval,
@@ -16,7 +15,7 @@ import {
 	line,
 	numeric,
 	pgEnum,
-	pgSchema,
+	pgTable,
 	point,
 	real,
 	serial,
@@ -30,11 +29,9 @@ import {
 	vector,
 } from 'drizzle-orm/pg-core';
 
-export const schema = pgSchema('seeder_lib_pg');
-
 export const moodEnum = pgEnum('mood_enum', ['sad', 'ok', 'happy']);
 
-export const allDataTypes = schema.table('all_data_types', {
+export const allDataTypes = pgTable('all_data_types', {
 	integer: integer('integer'),
 	smallint: smallint('smallint'),
 	biginteger: bigint('bigint', { mode: 'bigint' }),
@@ -71,7 +68,7 @@ export const allDataTypes = schema.table('all_data_types', {
 	vector: vector('vector', { dimensions: 3 }),
 });
 
-export const allArrayDataTypes = schema.table('all_array_data_types', {
+export const allArrayDataTypes = pgTable('all_array_data_types', {
 	integerArray: integer('integer_array').array(),
 	smallintArray: smallint('smallint_array').array(),
 	bigintegerArray: bigint('bigint_array', { mode: 'bigint' }).array(),
@@ -103,14 +100,14 @@ export const allArrayDataTypes = schema.table('all_array_data_types', {
 	// geometryArray: geometry('geometry_array', { type: 'point', mode: 'tuple', srid: 0 }).array(1),
 });
 
-export const ndArrays = schema.table('nd_arrays', {
+export const ndArrays = pgTable('nd_arrays', {
 	integer1DArray: integer('integer_1d_array').array(3),
 	integer2DArray: integer('integer_2d_array').array(3).array(4),
 	integer3DArray: integer('integer_3d_array').array(3).array(4).array(5),
 	integer4DArray: integer('integer_4d_array').array(3).array(4).array(5).array(6),
 });
 
-export const intervals = schema.table('intervals', {
+export const intervals = pgTable('intervals', {
 	intervalYear: interval({ fields: 'year' }),
 	intervalYearToMonth: interval({ fields: 'year to month' }),
 	intervalMonth: interval({ fields: 'month' }),

drizzle-seed/tests/pg/allDataTypesTest/pg_all_data_types.test.ts

@@ -19,12 +19,10 @@ beforeAll(async () => {
 
 	db = drizzle({ client });
 
-	await db.execute(sql`CREATE SCHEMA if not exists "seeder_lib_pg";`);
-
 	await db.execute(
 		sql`
 			    DO $$ BEGIN
-			 CREATE TYPE "seeder_lib_pg"."mood_enum" AS ENUM('sad', 'ok', 'happy');
+			 CREATE TYPE "mood_enum" AS ENUM('sad', 'ok', 'happy');
 			EXCEPTION
 			 WHEN duplicate_object THEN null;
 			END $$;
@@ -33,7 +31,7 @@ beforeAll(async () => {
 
 	await db.execute(
 		sql`
-			    CREATE TABLE IF NOT EXISTS "seeder_lib_pg"."all_data_types" (
+			    CREATE TABLE IF NOT EXISTS "all_data_types" (
 				"integer" integer,
 				"smallint" smallint,
 				"bigint" bigint,
@@ -63,7 +61,7 @@ beforeAll(async () => {
 				"point_tuple" "point",
 				"line" "line",
 				"line_tuple" "line",
-				"mood_enum" "seeder_lib_pg"."mood_enum",
+				"mood_enum" "mood_enum",
 				"uuid" "uuid",
 				"inet" inet,
 				"vector" vector(3)
@@ -73,7 +71,7 @@ beforeAll(async () => {
 
 	await db.execute(
 		sql`
-			    CREATE TABLE IF NOT EXISTS "seeder_lib_pg"."all_array_data_types" (
+			    CREATE TABLE IF NOT EXISTS "all_array_data_types" (
 				"integer_array" integer[],
 				"smallint_array" smallint[],
 				"bigint_array" bigint[],
@@ -99,7 +97,7 @@ beforeAll(async () => {
 				"point_tuple_array" "point"[],
 				"line_array" "line"[],
 				"line_tuple_array" "line"[],
-				"mood_enum_array" "seeder_lib_pg"."mood_enum"[],
+				"mood_enum_array" "mood_enum"[],
 				"uuid_array" uuid[],
 				"inet_array" inet[]
 			);
@@ -108,7 +106,7 @@ beforeAll(async () => {
 
 	await db.execute(
 		sql`
-			    CREATE TABLE IF NOT EXISTS "seeder_lib_pg"."nd_arrays" (
+			    CREATE TABLE IF NOT EXISTS "nd_arrays" (
 				"integer_1d_array" integer[3],
 				"integer_2d_array" integer[3][4],
 				"integer_3d_array" integer[3][4][5],
@@ -119,7 +117,7 @@ beforeAll(async () => {
 
 	await db.execute(
 		sql`
-			    CREATE TABLE IF NOT EXISTS "seeder_lib_pg"."intervals" (
+			    CREATE TABLE IF NOT EXISTS "intervals" (
 				"intervalYear" interval year,
 				"intervalYearToMonth" interval year to month,
 				"intervalMonth" interval month,

drizzle-seed/tests/pg/allDataTypesTest/postgis_data_types.test.ts

@@ -1,76 +1,42 @@
-import type { Container } from 'dockerode';
 import { sql } from 'drizzle-orm';
-import type { NodePgDatabase } from 'drizzle-orm/node-postgres';
-import { drizzle } from 'drizzle-orm/node-postgres';
-import type { Client as ClientT } from 'pg';
-import pg from 'pg';
-import { afterAll, beforeAll, expect, test } from 'vitest';
+import { expect } from 'vitest';
 import { seed } from '../../../src/index.ts';
-import { createDockerPostgis } from '../utils.ts';
+import { pgPostgisTest as test } from '../instrumentation.ts';
 import * as schema from './pgPostgisSchema.ts';
 
-const { Client } = pg;
-
-let pgContainer: Container;
-let pgClient: ClientT;
-let db: NodePgDatabase;
-
-beforeAll(async () => {
-	const { url, container } = await createDockerPostgis();
-	pgContainer = container;
-	const sleep = 1000;
-	let timeLeft = 40000;
-	let connected = false;
-	let lastError;
-
-	do {
-		try {
-			pgClient = new Client({ connectionString: url });
-			await pgClient.connect();
-			connected = true;
-			break;
-		} catch (e) {
-			lastError = e;
-			await new Promise((resolve) => setTimeout(resolve, sleep));
-			timeLeft -= sleep;
-		}
-	} while (timeLeft > 0);
-	if (!connected) {
-		console.error('Cannot connect to Postgres');
-		await pgClient!.end().catch(console.error);
-		await pgContainer?.stop().catch(console.error);
-		throw lastError;
-	}
-
-	await pgClient.query(`CREATE EXTENSION IF NOT EXISTS postgis;`);
-
-	db = drizzle({ client: pgClient });
+let firstTime = true;
+let resolveFunc: (val: any) => void;
+const promise = new Promise((resolve) => {
+	resolveFunc = resolve;
+});
+test.beforeEach(async ({ db }) => {
+	if (firstTime) {
+		firstTime = false;
 
-	await db.execute(sql`CREATE SCHEMA if not exists "seeder_lib_pg";`);
+		await db.execute(sql`CREATE EXTENSION IF NOT EXISTS postgis;`);
 
-	await db.execute(
-		sql`
-			    CREATE TABLE IF NOT EXISTS "seeder_lib_pg"."postgis_data_types" (
+		await db.execute(
+			sql`
+			    CREATE TABLE IF NOT EXISTS "postgis_data_types" (
 				"geometry" geometry(point, 0)
 			);
 		`,
-	);
+		);
 
-	await db.execute(
-		sql`
-			    CREATE TABLE IF NOT EXISTS "seeder_lib_pg"."postgis_array_data_types" (
+		await db.execute(
+			sql`
+			    CREATE TABLE IF NOT EXISTS "postgis_array_data_types" (
 				"geometry_array" geometry(point, 0)[]
 			);
 		`,
-	);
-});
+		);
 
-afterAll(async () => {
-	await pgClient.end().catch(console.error);
-	await pgContainer.stop().catch(console.error);
+		resolveFunc('');
+	}
+	await promise;
 });
 
-test('postgis data types test', async () => {
+test('postgis data types test', async ({ db }) => {
 	await seed(db, { allDataTypes: schema.allDataTypes }, { count: 10000 });
 
 	const allDataTypes = await db.select().from(schema.allDataTypes);