Add Drizzle Select benchmark

.gitignore

@@ -6,6 +6,6 @@ results
 data*
 test.ts
 src/prisma/client-mysql
-src/prisma/client-postgresql
+src/prisma/client-pg
 backup
 */migrations

prisma-mysql/schema.prisma

@@ -1,11 +1,11 @@
 generator client {
   provider = "prisma-client-js"
-  output = "../src/prisma/client-mysql"
+  output   = "../src/prisma/client-mysql"
 }
 
 datasource db {
-  provider          = "mysql"
-  url               = env("DATABASE_URL")
+  provider = "mysql"
+  url      = env("DATABASE_URL")
   // shadowDatabaseUrl = env("SHADOW_DATABASE_URL")
 }
 
@@ -28,6 +28,8 @@ model Address {
   country    String?
   customerId Int      @unique
   customer   Customer @relation(fields: [customerId], references: [id], onDelete: Cascade)
+
+  @@index([customerId], name: "Address_customerId_idx")
 }
 
 model Order {
@@ -37,6 +39,8 @@ model Order {
   customerId  Int
   customer    Customer  @relation(fields: [customerId], references: [id], onDelete: Cascade)
   products    Product[] @relation("OrderProducts")
+
+  @@index([customerId], name: "Order_customerId_idx")
 }
 
 model Product {

prisma-pg/schema.prisma

@@ -1,6 +1,6 @@
 generator client {
   provider = "prisma-client-js"
-  output = "../src/prisma/client-pg"
+  output   = "../src/prisma/client-pg"
 }
 
 datasource db {
@@ -9,40 +9,44 @@ datasource db {
 }
 
 model Customer {
-  id          Int       @id @default(autoincrement())
-  createdAt   DateTime  @default(now())
-  name        String?
-  email       String    // @unique
-  address     Address?
-  isActive    Boolean   @default(false)
+  id        Int      @id @default(autoincrement())
+  createdAt DateTime @default(now())
+  name      String?
+  email     String // @unique
+  address   Address?
+  isActive  Boolean  @default(false)
   // extraInfo   Json?
-  orders      Order[]
+  orders    Order[]
 }
 
 model Address {
-  id          Int       @id @default(autoincrement())
-  street      String?
-  city        String?
-  postalCode  String?
-  country     String?
-  customerId  Int       @unique
-  customer    Customer  @relation(fields: [customerId], references: [id], onDelete: Cascade)
+  id         Int      @id @default(autoincrement())
+  street     String?
+  city       String?
+  postalCode String?
+  country    String?
+  customerId Int      @unique
+  customer   Customer @relation(fields: [customerId], references: [id], onDelete: Cascade)
+
+  @@index([customerId], name: "Address_customerId_idx")
 }
 
 model Order {
   id          Int       @id @default(autoincrement())
-  date        DateTime  
+  date        DateTime
   totalAmount Float
   customerId  Int
   customer    Customer  @relation(fields: [customerId], references: [id], onDelete: Cascade)
   products    Product[] @relation("OrderProducts")
+
+  @@index([customerId], name: "Order_customerId_idx")
 }
 
 model Product {
-  id          Int       @id @default(autoincrement())
+  id          Int     @id @default(autoincrement())
   name        String
   price       Float
   quantity    Int
   description String?
-  orders      Order[]   @relation("OrderProducts")
-}
+  orders      Order[] @relation("OrderProducts")
+}

src/drizzle/drizzle-mysql.ts

@@ -1,7 +1,7 @@
 import { drizzle } from "drizzle-orm/mysql2";
 import * as schema from "./schema/schema-mysql";
 import * as relations from "./schema/relations-mysql";
-import { eq, desc } from "drizzle-orm";
+import { eq, desc, sql } from "drizzle-orm";
 import measure from "../lib/measure";
 import mysql from "mysql2/promise";
 import { QueryResult } from "../lib/types";
@@ -18,6 +18,8 @@ export async function drizzleMySQL(databaseUrl: string): Promise<QueryResult[]>
     schema: { ...schema, ...relations },
     mode: "default",
   });
+   // connect
+   await db.execute(sql`select 1`);
 
   console.log(`run drizzle benchmarks: `, databaseUrl);
 
@@ -167,15 +169,17 @@ export async function drizzleMySQL(databaseUrl: string): Promise<QueryResult[]>
       "drizzle-nested-update",
       db.transaction(async (trx) => {
         // Update customer name
-        await trx.update(schema.Customer).set({ name: "John Doe Updated" }).where(eq(schema.Customer.id, 1));
+        const customerUpdate = trx.update(schema.Customer).set({ name: "John Doe Updated" }).where(eq(schema.Customer.id, 1));
 
         // Update address
-        await trx
+        const addressUpdate = trx
           .update(schema.Address)
           .set({
             street: "456 New St",
           })
           .where(eq(schema.Address.customerId, 1));
+
+        await Promise.all([customerUpdate, addressUpdate]);
       })
     )
   );

src/drizzle/drizzle-pg.ts

@@ -3,7 +3,7 @@ import { drizzle } from "drizzle-orm/postgres-js";
 // import { Customer, Order, Address } from "./schema/schema-postgres";
 import * as schema from "./schema/schema-postgres";
 import * as relations from "./schema/relations-postgres";
-import { eq, desc } from "drizzle-orm";
+import { eq, desc, sql } from "drizzle-orm";
 import measure from "../lib/measure";
 import postgres from "postgres";
 import { QueryResult } from "../lib/types";
@@ -13,6 +13,8 @@ export async function drizzlePg(databaseUrl: string): Promise<QueryResult[]> {
     ssl: databaseUrl.includes("localhost") ? undefined : { rejectUnauthorized: false }
   });
   const db = drizzle(client, { schema: { ...schema, ...relations } });
+  // connect
+  await db.execute(sql`select 1`);
   console.log(`Run drizzle benchmarks: `, databaseUrl);
 
   const results: QueryResult[] = [];
@@ -115,7 +117,7 @@ export async function drizzlePg(databaseUrl: string): Promise<QueryResult[]> {
         email: "john.doe@example.com",
         isActive: false,
       })
-      .returning();
+      .returning({id: schema.Customer.id});
 
     const customerId = customer[0].id;
 
@@ -127,7 +129,7 @@ export async function drizzlePg(databaseUrl: string): Promise<QueryResult[]> {
         date: `${new Date().toISOString()}`,
         totalAmount: "100.5",
       })
-      .returning();
+      .returning({id: schema.Order.id});
 
     const orderId = insertedOrder[0].id;
 
@@ -163,18 +165,20 @@ export async function drizzlePg(databaseUrl: string): Promise<QueryResult[]> {
       "drizzle-nested-update",
       db.transaction(async (trx) => {
         // Update customer name
-        await trx
+        const customerUpdate = trx
         .update(schema.Customer)
         .set({ name: "John Doe Updated" })
         .where(eq(schema.Customer.id, 1));
 
         // Update address
-        await trx
+        const addressUpdate = trx
           .update(schema.Address)
           .set({
             street: "456 New St",
           })
           .where(eq(schema.Address.customerId, 1));
+
+        await Promise.all([customerUpdate, addressUpdate]);
       })
     )
   );
@@ -214,7 +218,7 @@ export async function drizzlePg(databaseUrl: string): Promise<QueryResult[]> {
         target: schema.Customer.id,
         set: { name: "John Doe Upserted" },
       })
-      .returning();
+      .returning({id: schema.Customer.id});
     const customerId = customer[0].id;
 
     // Update address