drizzle-kit 0.24.2-dab63b8 → 0.24.2-efd821d

package/api.js

@@ -28896,6 +28896,7 @@ var init_count = __esm({
         __publicField(this, _a136, "PgCountBuilder");
         __publicField(this, "session");
         this.params = params;
+        this.mapWith(Number);
         this.session = params.session;
         this.sql = _PgCountBuilder.buildCount(
           params.source,
@@ -28903,15 +28904,13 @@ var init_count = __esm({
         );
       }
       static buildEmbeddedCount(source, filters) {
-        return sql`(select count(*)::int from ${source}${sql.raw(" where ").if(filters)}${filters})`;
+        return sql`(select count(*) from ${source}${sql.raw(" where ").if(filters)}${filters})`;
       }
       static buildCount(source, filters) {
-        return sql`select count(*)::int from ${source}${sql.raw(" where ").if(filters)}${filters};`;
+        return sql`select count(*) as count from ${source}${sql.raw(" where ").if(filters)}${filters};`;
       }
       then(onfulfilled, onrejected) {
-        return Promise.resolve(this.session.all(this.sql)).then((it) => {
-          return it[0]["count"];
-        }).then(
+        return Promise.resolve(this.session.count(this.sql)).then(
           onfulfilled,
           onrejected
         );
@@ -29183,7 +29182,7 @@ var init_db = __esm({
         };
       }
       $count(source, filters) {
-        return new PgCountBuilder({ source, filters, dialect: this.dialect, session: this.session });
+        return new PgCountBuilder({ source, filters, session: this.session });
       }
       /**
        * Incorporates a previously defined CTE (using `$with`) into the main query.
@@ -29903,6 +29902,12 @@ var init_session = __esm({
           false
         ).all();
       }
+      async count(sql22) {
+        const res = await this.execute(sql22);
+        return Number(
+          res[0]["count"]
+        );
+      }
     };
     __publicField(PgSession, _a157, "PgSession");
     PgTransaction = class extends (_b113 = PgDatabase, _a158 = entityKind, _b113) {
@@ -30150,6 +30155,12 @@ var init_session2 = __esm({
           }
         }
       }
+      async count(sql22) {
+        const res = await this.execute(sql22);
+        return Number(
+          res["rows"][0]["count"]
+        );
+      }
     };
     __publicField(_NodePgSession, _a160, "NodePgSession");
     NodePgSession = _NodePgSession;
@@ -51875,7 +51886,7 @@ var init_count2 = __esm({
         return sql`select count(*) from ${source}${sql.raw(" where ").if(filters)}${filters}`;
       }
       then(onfulfilled, onrejected) {
-        return Promise.resolve(this.session.values(this.sql)).then((it) => it[0][0]).then(
+        return Promise.resolve(this.session.count(this.sql)).then(
           onfulfilled,
           onrejected
         );
@@ -52182,7 +52193,7 @@ var init_db2 = __esm({
         };
       }
       $count(source, filters) {
-        return new SQLiteCountBuilder({ source, filters, dialect: this.dialect, session: this.session });
+        return new SQLiteCountBuilder({ source, filters, session: this.session });
       }
       /**
        * Incorporates a previously defined CTE (using `$with`) into the main query.
@@ -52621,6 +52632,10 @@ var init_session4 = __esm({
       values(query) {
         return this.prepareOneTimeQuery(this.dialect.sqlToQuery(query), void 0, "run", false).values();
       }
+      async count(sql3) {
+        const result = await this.values(sql3);
+        return result[0][0];
+      }
       /** @internal */
       extractRawValuesValueFromBatchResult(_result) {
         throw new Error("Not implemented");
@@ -82939,6 +82954,7 @@ var init_count3 = __esm({
         __publicField(this, _a252, "MySqlCountBuilder");
         __publicField(this, "session");
         this.params = params;
+        this.mapWith(Number);
         this.session = params.session;
         this.sql = _MySqlCountBuilder.buildCount(
           params.source,
@@ -82946,15 +82962,13 @@ var init_count3 = __esm({
         );
       }
       static buildEmbeddedCount(source, filters) {
-        return sql`(select cast(count(*) as UNSIGNED) from ${source}${sql.raw(" where ").if(filters)}${filters})`;
+        return sql`(select count(*) from ${source}${sql.raw(" where ").if(filters)}${filters})`;
       }
       static buildCount(source, filters) {
-        return sql`select cast(count(*) as UNSIGNED) as count from ${source}${sql.raw(" where ").if(filters)}${filters}`;
+        return sql`select count(*) as count from ${source}${sql.raw(" where ").if(filters)}${filters}`;
       }
       then(onfulfilled, onrejected) {
-        return Promise.resolve(this.session.execute(this.sql)).then((it) => {
-          return it[0]["count"];
-        }).then(
+        return Promise.resolve(this.session.count(this.sql)).then(
           onfulfilled,
           onrejected
         );
@@ -85373,7 +85387,7 @@ var init_db3 = __esm({
         };
       }
       $count(source, filters) {
-        return new MySqlCountBuilder({ source, filters, dialect: this.dialect, session: this.session });
+        return new MySqlCountBuilder({ source, filters, session: this.session });
       }
       /**
        * Incorporates a previously defined CTE (using `$with`) into the main query.
@@ -85539,6 +85553,12 @@ var init_session9 = __esm({
           void 0
         ).execute();
       }
+      async count(sql22) {
+        const res = await this.execute(sql22);
+        return Number(
+          res[0][0]["count"]
+        );
+      }
       getSetTransactionSQL(config) {
         const parts = [];
         if (config.isolationLevel) {
@@ -91370,6 +91390,12 @@ var init_session11 = __esm({
       async queryObjects(query, params) {
         return this.client(query, params, { arrayMode: false, fullResults: true });
       }
+      async count(sql3) {
+        const res = await this.execute(sql3);
+        return Number(
+          res["rows"][0]["count"]
+        );
+      }
       async transaction(_transaction, _config = {}) {
         throw new Error("No transactions support in neon-http driver");
       }
@@ -92168,6 +92194,12 @@ var init_session13 = __esm({
         this.logger.logQuery(querySql.sql, querySql.params);
         return this.client.execute(querySql.sql, querySql.params, { as: "object" }).then((eQuery) => eQuery.rows);
       }
+      async count(sql22) {
+        const res = await this.execute(sql22);
+        return Number(
+          res["rows"][0]["count"]
+        );
+      }
       transaction(transaction) {
         return this.baseClient.transaction((pstx) => {
           const session = new _PlanetscaleSession(this.baseClient, this.dialect, pstx, this.schema, this.options);
@@ -95117,6 +95149,12 @@ var init_session15 = __esm({
         this.logger.logQuery(querySql.sql, querySql.params);
         return this.client.execute(querySql.sql, querySql.params);
       }
+      async count(sql22) {
+        const res = await this.execute(sql22);
+        return Number(
+          res["rows"][0]["count"]
+        );
+      }
       async transaction(transaction) {
         const nativeTx = await this.baseClient.begin();
         try {

package/api.mjs

@@ -28901,6 +28901,7 @@ var init_count = __esm({
         __publicField(this, _a136, "PgCountBuilder");
         __publicField(this, "session");
         this.params = params;
+        this.mapWith(Number);
         this.session = params.session;
         this.sql = _PgCountBuilder.buildCount(
           params.source,
@@ -28908,15 +28909,13 @@ var init_count = __esm({
         );
       }
       static buildEmbeddedCount(source, filters) {
-        return sql`(select count(*)::int from ${source}${sql.raw(" where ").if(filters)}${filters})`;
+        return sql`(select count(*) from ${source}${sql.raw(" where ").if(filters)}${filters})`;
       }
       static buildCount(source, filters) {
-        return sql`select count(*)::int from ${source}${sql.raw(" where ").if(filters)}${filters};`;
+        return sql`select count(*) as count from ${source}${sql.raw(" where ").if(filters)}${filters};`;
       }
       then(onfulfilled, onrejected) {
-        return Promise.resolve(this.session.all(this.sql)).then((it) => {
-          return it[0]["count"];
-        }).then(
+        return Promise.resolve(this.session.count(this.sql)).then(
           onfulfilled,
           onrejected
         );
@@ -29188,7 +29187,7 @@ var init_db = __esm({
         };
       }
       $count(source, filters) {
-        return new PgCountBuilder({ source, filters, dialect: this.dialect, session: this.session });
+        return new PgCountBuilder({ source, filters, session: this.session });
       }
       /**
        * Incorporates a previously defined CTE (using `$with`) into the main query.
@@ -29908,6 +29907,12 @@ var init_session = __esm({
           false
         ).all();
       }
+      async count(sql22) {
+        const res = await this.execute(sql22);
+        return Number(
+          res[0]["count"]
+        );
+      }
     };
     __publicField(PgSession, _a157, "PgSession");
     PgTransaction = class extends (_b113 = PgDatabase, _a158 = entityKind, _b113) {
@@ -30155,6 +30160,12 @@ var init_session2 = __esm({
           }
         }
       }
+      async count(sql22) {
+        const res = await this.execute(sql22);
+        return Number(
+          res["rows"][0]["count"]
+        );
+      }
     };
     __publicField(_NodePgSession, _a160, "NodePgSession");
     NodePgSession = _NodePgSession;
@@ -51879,7 +51890,7 @@ var init_count2 = __esm({
         return sql`select count(*) from ${source}${sql.raw(" where ").if(filters)}${filters}`;
       }
       then(onfulfilled, onrejected) {
-        return Promise.resolve(this.session.values(this.sql)).then((it) => it[0][0]).then(
+        return Promise.resolve(this.session.count(this.sql)).then(
           onfulfilled,
           onrejected
         );
@@ -52186,7 +52197,7 @@ var init_db2 = __esm({
         };
       }
       $count(source, filters) {
-        return new SQLiteCountBuilder({ source, filters, dialect: this.dialect, session: this.session });
+        return new SQLiteCountBuilder({ source, filters, session: this.session });
       }
       /**
        * Incorporates a previously defined CTE (using `$with`) into the main query.
@@ -52625,6 +52636,10 @@ var init_session4 = __esm({
       values(query) {
         return this.prepareOneTimeQuery(this.dialect.sqlToQuery(query), void 0, "run", false).values();
       }
+      async count(sql3) {
+        const result = await this.values(sql3);
+        return result[0][0];
+      }
       /** @internal */
       extractRawValuesValueFromBatchResult(_result) {
         throw new Error("Not implemented");
@@ -82943,6 +82958,7 @@ var init_count3 = __esm({
         __publicField(this, _a252, "MySqlCountBuilder");
         __publicField(this, "session");
         this.params = params;
+        this.mapWith(Number);
         this.session = params.session;
         this.sql = _MySqlCountBuilder.buildCount(
           params.source,
@@ -82950,15 +82966,13 @@ var init_count3 = __esm({
         );
       }
       static buildEmbeddedCount(source, filters) {
-        return sql`(select cast(count(*) as UNSIGNED) from ${source}${sql.raw(" where ").if(filters)}${filters})`;
+        return sql`(select count(*) from ${source}${sql.raw(" where ").if(filters)}${filters})`;
       }
       static buildCount(source, filters) {
-        return sql`select cast(count(*) as UNSIGNED) as count from ${source}${sql.raw(" where ").if(filters)}${filters}`;
+        return sql`select count(*) as count from ${source}${sql.raw(" where ").if(filters)}${filters}`;
       }
       then(onfulfilled, onrejected) {
-        return Promise.resolve(this.session.execute(this.sql)).then((it) => {
-          return it[0]["count"];
-        }).then(
+        return Promise.resolve(this.session.count(this.sql)).then(
           onfulfilled,
           onrejected
         );
@@ -85377,7 +85391,7 @@ var init_db3 = __esm({
         };
       }
       $count(source, filters) {
-        return new MySqlCountBuilder({ source, filters, dialect: this.dialect, session: this.session });
+        return new MySqlCountBuilder({ source, filters, session: this.session });
       }
       /**
        * Incorporates a previously defined CTE (using `$with`) into the main query.
@@ -85543,6 +85557,12 @@ var init_session9 = __esm({
           void 0
         ).execute();
       }
+      async count(sql22) {
+        const res = await this.execute(sql22);
+        return Number(
+          res[0][0]["count"]
+        );
+      }
       getSetTransactionSQL(config) {
         const parts = [];
         if (config.isolationLevel) {
@@ -91374,6 +91394,12 @@ var init_session11 = __esm({
       async queryObjects(query, params) {
         return this.client(query, params, { arrayMode: false, fullResults: true });
       }
+      async count(sql3) {
+        const res = await this.execute(sql3);
+        return Number(
+          res["rows"][0]["count"]
+        );
+      }
       async transaction(_transaction, _config = {}) {
         throw new Error("No transactions support in neon-http driver");
       }
@@ -92172,6 +92198,12 @@ var init_session13 = __esm({
         this.logger.logQuery(querySql.sql, querySql.params);
         return this.client.execute(querySql.sql, querySql.params, { as: "object" }).then((eQuery) => eQuery.rows);
       }
+      async count(sql22) {
+        const res = await this.execute(sql22);
+        return Number(
+          res["rows"][0]["count"]
+        );
+      }
       transaction(transaction) {
         return this.baseClient.transaction((pstx) => {
           const session = new _PlanetscaleSession(this.baseClient, this.dialect, pstx, this.schema, this.options);
@@ -95120,6 +95152,12 @@ var init_session15 = __esm({
         this.logger.logQuery(querySql.sql, querySql.params);
         return this.client.execute(querySql.sql, querySql.params);
       }
+      async count(sql22) {
+        const res = await this.execute(sql22);
+        return Number(
+          res["rows"][0]["count"]
+        );
+      }
       async transaction(transaction) {
         const nativeTx = await this.baseClient.begin();
         try {

package/bin.cjs

@@ -85221,7 +85221,7 @@ init_utils2();
 var version2 = async () => {
   const { npmVersion } = await ormCoreVersions();
   const ormVersion = npmVersion ? `drizzle-orm: v${npmVersion}` : "";
-  const envVersion = "0.24.2-dab63b8";
+  const envVersion = "0.24.2-efd821d";
   const kitVersion = envVersion ? `v${envVersion}` : "--";
   const versions = `drizzle-kit: ${kitVersion}
 ${ormVersion}`;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "drizzle-kit",
-	"version": "0.24.2-dab63b8",
+	"version": "0.24.2-efd821d",
 	"homepage": "https://orm.drizzle.team",
 	"keywords": [
 		"drizzle",