drizzle-kit 1.0.0-beta.2-e689d82 → 1.0.0-beta.2-0f918b0

package/bin.cjs

@@ -164496,7 +164496,7 @@ var init_connections = __esm({
           }
           return results;
         };
-        const benchmarkQuery = async (sql, params) => {
+        const benchmarkQuery = async (client, sql, params) => {
           const explainResult = await pool.query({
             text: `EXPLAIN ANALYZE ${sql}`,
             values: params ?? [],
@@ -164507,24 +164507,10 @@ var init_connections = __esm({
           const executionMatch = stringifiedResult.match(/Execution Time:\s*([\d.]+)\s*ms/i);
           const planningTime = Number(planningMatch[1]);
           const executionTime = Number(executionMatch[1]);
-          let startAt = 0n;
-          let tcpConnectedAt = 0n;
-          let tlsConnectedAt = null;
-          let dbReadyAt = 0n;
           let querySentAt = 0n;
           let firstDataAt = 0n;
           let lastDataAt = 0n;
           let bytesReceived = 0;
-          const client = "url" in credentials2 ? new pg.Client({ connectionString: credentials2.url }) : new pg.Client({ ...credentials2, ssl });
-          client.connection.once("connect", () => {
-            tcpConnectedAt = process.hrtime.bigint();
-          });
-          client.connection.prependOnceListener("sslconnect", () => {
-            tlsConnectedAt = process.hrtime.bigint();
-          });
-          client.connection.prependOnceListener("readyForQuery", () => {
-            dbReadyAt = process.hrtime.bigint();
-          });
           client.connection.addListener("rowDescription", (data2) => {
             if (firstDataAt === 0n) {
               firstDataAt = process.hrtime.bigint();
@@ -164537,29 +164523,48 @@ var init_connections = __esm({
           client.connection.addListener("commandComplete", () => {
             lastDataAt = process.hrtime.bigint();
           });
-          startAt = process.hrtime.bigint();
-          await client.connect();
           querySentAt = process.hrtime.bigint();
           await client.query(sql, params);
-          await client.end();
+          client.connection.removeAllListeners("rowDescription");
+          client.connection.removeAllListeners("dataRow");
+          client.connection.removeAllListeners("commandComplete");
           return {
-            tcpHandshake: ms(startAt, tcpConnectedAt),
-            tlsHandshake: tlsConnectedAt ? ms(tcpConnectedAt, tlsConnectedAt) : null,
-            dbHandshake: ms(tlsConnectedAt ?? tcpConnectedAt, dbReadyAt),
             planning: planningTime,
             execution: executionTime,
             dataDownload: ms(firstDataAt, lastDataAt) + ms(querySentAt, firstDataAt) - executionTime - planningTime,
-            total: ms(startAt, lastDataAt),
+            total: ms(querySentAt, lastDataAt),
             dataSize: bytesReceived
           };
         };
         const benchmarkProxy = async ({ sql, params }, repeats) => {
+          let startAt = 0n;
+          let tcpConnectedAt = 0n;
+          let tlsConnectedAt = null;
+          let dbReadyAt = 0n;
+          const client = "url" in credentials2 ? new pg.Client({ connectionString: credentials2.url }) : new pg.Client({ ...credentials2, ssl });
+          client.connection.once("connect", () => {
+            tcpConnectedAt = process.hrtime.bigint();
+          });
+          client.connection.prependOnceListener("sslconnect", () => {
+            tlsConnectedAt = process.hrtime.bigint();
+          });
+          client.connection.prependOnceListener("readyForQuery", () => {
+            dbReadyAt = process.hrtime.bigint();
+          });
+          startAt = process.hrtime.bigint();
+          await client.connect();
           const results = [];
           for (let i6 = 0; i6 < repeats; i6++) {
-            const r6 = await benchmarkQuery(sql, params);
+            const r6 = await benchmarkQuery(client, sql, params);
             results.push(r6);
           }
-          return results;
+          await client.end();
+          return {
+            tcpHandshake: ms(startAt, tcpConnectedAt),
+            tlsHandshake: tlsConnectedAt ? ms(tcpConnectedAt, tlsConnectedAt) : null,
+            dbHandshake: ms(tlsConnectedAt ?? tcpConnectedAt, dbReadyAt),
+            queries: results
+          };
         };
         return { packageName: "pg", query, proxy, transactionProxy, benchmarkProxy, migrate: migrateFn };
       }
@@ -165095,8 +165100,7 @@ To link your project, please refer https://docs.geldata.com/reference/cli/gel_in
           }
           return results;
         };
-        const benchmarkQuery = async (sql, params) => {
-          const { createConnection: createConnection2 } = await import("mysql2");
+        const benchmarkQuery = async (newConnection, sql, params) => {
           const explainResult = await connection.query({
             sql: `EXPLAIN ANALYZE ${sql}`,
             values: params ?? [],
@@ -165108,13 +165112,45 @@ To link your project, please refer https://docs.geldata.com/reference/cli/gel_in
           );
           const lastRowTime = Number(timeMatch[2]);
           const executionTime = lastRowTime;
-          let startAt = 0n;
-          let tcpConnectedAt = 0n;
-          let tlsConnectedAt = null;
           let querySentAt = 0n;
           let firstDataAt = 0n;
           let lastDataAt = 0n;
           let bytesReceived = 0;
+          querySentAt = process.hrtime.bigint();
+          await new Promise((resolve3, reject) => {
+            const query2 = newConnection.query({
+              sql,
+              values: params ?? [],
+              typeCast
+              // rowsAsArray: true,
+            });
+            query2.on("error", (err2) => {
+              reject(err2);
+            });
+            query2.on("fields", (fields) => {
+              if (firstDataAt === 0n) {
+                firstDataAt = process.hrtime.bigint();
+              }
+              bytesReceived += fields[0]._buf.length;
+            });
+            query2.on("end", () => {
+              lastDataAt = process.hrtime.bigint();
+              resolve3();
+            });
+          });
+          return {
+            planning: null,
+            execution: executionTime,
+            dataDownload: ms(firstDataAt, lastDataAt) + ms(querySentAt, firstDataAt) - executionTime,
+            total: ms(querySentAt, lastDataAt),
+            dataSize: bytesReceived
+          };
+        };
+        const benchmarkProxy = async ({ sql, params }, repeats) => {
+          const { createConnection: createConnection2 } = await import("mysql2");
+          let startAt = 0n;
+          let tcpConnectedAt = 0n;
+          let tlsConnectedAt = null;
           const createStream = ({ config }) => {
             let stream;
             if (config.socketPath) {
@@ -165134,8 +165170,7 @@ To link your project, please refer https://docs.geldata.com/reference/cli/gel_in
             return stream;
           };
           startAt = process.hrtime.bigint();
-          const newConnection = result2.url ? createConnection2({
-            // debug: true,
+          const connection2 = result2.url ? createConnection2({
             uri: result2.url,
             stream: createStream
           }) : createConnection2({
@@ -165143,7 +165178,7 @@ To link your project, please refer https://docs.geldata.com/reference/cli/gel_in
             stream: createStream
           });
           await new Promise((resolve3, reject) => {
-            newConnection.connect((err2) => {
+            connection2.connect((err2) => {
               tlsConnectedAt = process.hrtime.bigint();
               if (err2) {
                 reject(err2);
@@ -165152,48 +165187,19 @@ To link your project, please refer https://docs.geldata.com/reference/cli/gel_in
               }
             });
           });
-          querySentAt = process.hrtime.bigint();
-          await new Promise((resolve3, reject) => {
-            const query2 = newConnection.query({
-              sql,
-              values: params ?? [],
-              typeCast
-              // rowsAsArray: true,
-            });
-            query2.on("error", (err2) => {
-              reject(err2);
-            });
-            query2.on("fields", (fields) => {
-              if (firstDataAt === 0n) {
-                firstDataAt = process.hrtime.bigint();
-              }
-              bytesReceived += fields[0]._buf.length;
-            });
-            query2.on("end", () => {
-              lastDataAt = process.hrtime.bigint();
-              resolve3();
-              newConnection.end();
-            });
-          });
+          const results = [];
+          for (let i6 = 0; i6 < repeats; i6++) {
+            const r6 = await benchmarkQuery(connection2, sql, params);
+            results.push(r6);
+          }
+          connection2.end();
           return {
             tcpHandshake: ms(startAt, tcpConnectedAt),
             tlsHandshake: tlsConnectedAt ? ms(tcpConnectedAt, tlsConnectedAt) : null,
             dbHandshake: null,
-            planning: null,
-            execution: executionTime,
-            dataDownload: ms(firstDataAt, lastDataAt) + ms(querySentAt, firstDataAt) - executionTime,
-            total: ms(startAt, lastDataAt),
-            dataSize: bytesReceived
+            queries: results
           };
         };
-        const benchmarkProxy = async ({ sql, params }, repeats) => {
-          const results = [];
-          for (let i6 = 0; i6 < repeats; i6++) {
-            const r6 = await benchmarkQuery(sql, params);
-            results.push(r6);
-          }
-          return results;
-        };
         return {
           db: { query },
           packageName: "mysql2",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "1.0.0-beta.2-e689d82",
+  "version": "1.0.0-beta.2-0f918b0",
   "homepage": "https://orm.drizzle.team",
   "keywords": [
     "drizzle",