Merge branch 'beta' into fix-empty-array-generation

drizzle-team · Aug 7, 2024 · 8b0360a · 8b0360a
2 parents ca314f1 + 6234cbf
commit 8b0360a
Show file tree

Hide file tree

Showing 2 changed files with 159 additions and 0 deletions.
diff --git a/drizzle-orm/src/postgres-js/driver.ts b/drizzle-orm/src/postgres-js/driver.ts
@@ -27,6 +27,8 @@ export function drizzle<TSchema extends Record<string, unknown> = Record<string,
 		client.options.parsers[type as any] = transparentParser;
 		client.options.serializers[type as any] = transparentParser;
 	}
+	client.options.serializers['114'] = transparentParser;
+	client.options.serializers['3802'] = transparentParser;
 
 	const dialect = new PgDialect();
 	let logger;

diff --git a/integration-tests/tests/pg/pg-common.ts b/integration-tests/tests/pg/pg-common.ts
@@ -49,6 +49,7 @@ import {
 	intersect,
 	intersectAll,
 	interval,
+	json,
 	jsonb,
 	macaddr,
 	macaddr8,
@@ -199,6 +200,12 @@ const users2MySchemaTable = mySchema.table('users2', {
 	cityId: integer('city_id').references(() => citiesTable.id),
 });
 
+const jsonTestTable = pgTable('jsontest', {
+	id: serial('id').primaryKey(),
+	json: json('json').$type<{ string: string; number: number }>(),
+	jsonb: jsonb('jsonb').$type<{ string: string; number: number }>(),
+});
+
 let pgContainer: Docker.Container;
 
 export async function createDockerDB(): Promise<{ connectionString: string; container: Docker.Container }> {
@@ -358,6 +365,16 @@ export function tests() {
 					)
 				`,
 			);
+
+			await db.execute(
+				sql`
+					create table jsontest (
+						id serial primary key,
+						json json,
+						jsonb jsonb
+					)
+				`,
+			);
 		});
 
 		async function setupSetOperationTest(db: PgDatabase<PgQueryResultHKT>) {
@@ -4481,5 +4498,145 @@ export function tests() {
 
 			expect(users.length).toBeGreaterThan(0);
 		});
+
+		test('proper json and jsonb handling', async (ctx) => {
+			const { db } = ctx.pg;
+
+			const jsonTable = pgTable('json_table', {
+				json: json('json').$type<{ name: string; age: number }>(),
+				jsonb: jsonb('jsonb').$type<{ name: string; age: number }>(),
+			});
+
+			await db.execute(sql`drop table if exists ${jsonTable}`);
+
+			await db.execute(sql`create table ${jsonTable} (json json, jsonb jsonb)`);
+
+			await db.insert(jsonTable).values({ json: { name: 'Tom', age: 75 }, jsonb: { name: 'Pete', age: 23 } });
+
+			const result = await db.select().from(jsonTable);
+
+			const justNames = await db.select({
+				name1: sql<string>`${jsonTable.json}->>'name'`.as('name1'),
+				name2: sql<string>`${jsonTable.jsonb}->>'name'`.as('name2'),
+			}).from(jsonTable);
+
+			expect(result).toStrictEqual([
+				{
+					json: { name: 'Tom', age: 75 },
+					jsonb: { name: 'Pete', age: 23 },
+				},
+			]);
+
+			expect(justNames).toStrictEqual([
+				{
+					name1: 'Tom',
+					name2: 'Pete',
+				},
+			]);
+		});
+
+		test('set json/jsonb fields with objects and retrieve with the ->> operator', async (ctx) => {
+			const { db } = ctx.pg;
+
+			const obj = { string: 'test', number: 123 };
+			const { string: testString, number: testNumber } = obj;
+
+			await db.insert(jsonTestTable).values({
+				json: obj,
+				jsonb: obj,
+			});
+
+			const result = await db.select({
+				jsonStringField: sql<string>`${jsonTestTable.json}->>'string'`,
+				jsonNumberField: sql<string>`${jsonTestTable.json}->>'number'`,
+				jsonbStringField: sql<string>`${jsonTestTable.jsonb}->>'string'`,
+				jsonbNumberField: sql<string>`${jsonTestTable.jsonb}->>'number'`,
+			}).from(jsonTestTable);
+
+			expect(result).toStrictEqual([{
+				jsonStringField: testString,
+				jsonNumberField: String(testNumber),
+				jsonbStringField: testString,
+				jsonbNumberField: String(testNumber),
+			}]);
+		});
+
+		test('set json/jsonb fields with strings and retrieve with the ->> operator', async (ctx) => {
+			const { db } = ctx.pg;
+
+			const obj = { string: 'test', number: 123 };
+			const { string: testString, number: testNumber } = obj;
+
+			await db.insert(jsonTestTable).values({
+				json: sql`${JSON.stringify(obj)}`,
+				jsonb: sql`${JSON.stringify(obj)}`,
+			});
+
+			const result = await db.select({
+				jsonStringField: sql<string>`${jsonTestTable.json}->>'string'`,
+				jsonNumberField: sql<string>`${jsonTestTable.json}->>'number'`,
+				jsonbStringField: sql<string>`${jsonTestTable.jsonb}->>'string'`,
+				jsonbNumberField: sql<string>`${jsonTestTable.jsonb}->>'number'`,
+			}).from(jsonTestTable);
+
+			expect(result).toStrictEqual([{
+				jsonStringField: testString,
+				jsonNumberField: String(testNumber),
+				jsonbStringField: testString,
+				jsonbNumberField: String(testNumber),
+			}]);
+		});
+
+		test('set json/jsonb fields with objects and retrieve with the -> operator', async (ctx) => {
+			const { db } = ctx.pg;
+
+			const obj = { string: 'test', number: 123 };
+			const { string: testString, number: testNumber } = obj;
+
+			await db.insert(jsonTestTable).values({
+				json: obj,
+				jsonb: obj,
+			});
+
+			const result = await db.select({
+				jsonStringField: sql<string>`${jsonTestTable.json}->'string'`,
+				jsonNumberField: sql<number>`${jsonTestTable.json}->'number'`,
+				jsonbStringField: sql<string>`${jsonTestTable.jsonb}->'string'`,
+				jsonbNumberField: sql<number>`${jsonTestTable.jsonb}->'number'`,
+			}).from(jsonTestTable);
+
+			expect(result).toStrictEqual([{
+				jsonStringField: testString,
+				jsonNumberField: testNumber,
+				jsonbStringField: testString,
+				jsonbNumberField: testNumber,
+			}]);
+		});
+
+		test('set json/jsonb fields with strings and retrieve with the -> operator', async (ctx) => {
+			const { db } = ctx.pg;
+
+			const obj = { string: 'test', number: 123 };
+			const { string: testString, number: testNumber } = obj;
+
+			await db.insert(jsonTestTable).values({
+				json: sql`${JSON.stringify(obj)}`,
+				jsonb: sql`${JSON.stringify(obj)}`,
+			});
+
+			const result = await db.select({
+				jsonStringField: sql<string>`${jsonTestTable.json}->'string'`,
+				jsonNumberField: sql<number>`${jsonTestTable.json}->'number'`,
+				jsonbStringField: sql<string>`${jsonTestTable.jsonb}->'string'`,
+				jsonbNumberField: sql<number>`${jsonTestTable.jsonb}->'number'`,
+			}).from(jsonTestTable);
+
+			expect(result).toStrictEqual([{
+				jsonStringField: testString,
+				jsonNumberField: testNumber,
+				jsonbStringField: testString,
+				jsonbNumberField: testNumber,
+			}]);
+		});
 	});
 }