drizzle-orm 0.29.4 → 0.29.5-859260e

package/pg-core/dialect.cjs

@@ -28,37 +28,39 @@ var import_errors = require("../errors.cjs");
 var import_columns = require("./columns/index.cjs");
 var import_table = require("./table.cjs");
 var import_relations = require("../relations.cjs");
-var import_sql = require("../sql/sql.cjs");
+var import_sql = require("../sql/index.cjs");
+var import_sql2 = require("../sql/sql.cjs");
 var import_subquery = require("../subquery.cjs");
 var import_table2 = require("../table.cjs");
 var import_utils = require("../utils.cjs");
 var import_view_common = require("../view-common.cjs");
-var import_sql2 = require("../sql/index.cjs");
 var import_view_base = require("./view-base.cjs");
 class PgDialect {
   static [import_entity.entityKind] = "PgDialect";
-  async migrate(migrations, session) {
-    const migrationTableCreate = import_sql.sql`
-			CREATE TABLE IF NOT EXISTS "drizzle"."__drizzle_migrations" (
+  async migrate(migrations, session, config) {
+    const migrationsTable = typeof config === "string" ? "__drizzle_migrations" : config.migrationsTable ?? "__drizzle_migrations";
+    const migrationsSchema = typeof config === "string" ? "drizzle" : config.migrationsSchema ?? "drizzle";
+    const migrationTableCreate = import_sql2.sql`
+			CREATE TABLE IF NOT EXISTS ${import_sql2.sql.identifier(migrationsSchema)}.${import_sql2.sql.identifier(migrationsTable)} (
 				id SERIAL PRIMARY KEY,
 				hash text NOT NULL,
 				created_at bigint
 			)
 		`;
-    await session.execute(import_sql.sql`CREATE SCHEMA IF NOT EXISTS "drizzle"`);
+    await session.execute(import_sql2.sql`CREATE SCHEMA IF NOT EXISTS ${import_sql2.sql.identifier(migrationsSchema)}`);
     await session.execute(migrationTableCreate);
     const dbMigrations = await session.all(
-      import_sql.sql`select id, hash, created_at from "drizzle"."__drizzle_migrations" order by created_at desc limit 1`
+      import_sql2.sql`select id, hash, created_at from ${import_sql2.sql.identifier(migrationsSchema)}.${import_sql2.sql.identifier(migrationsTable)} order by created_at desc limit 1`
     );
     const lastDbMigration = dbMigrations[0];
     await session.transaction(async (tx) => {
       for await (const migration of migrations) {
         if (!lastDbMigration || Number(lastDbMigration.created_at) < migration.folderMillis) {
           for (const stmt of migration.sql) {
-            await tx.execute(import_sql.sql.raw(stmt));
+            await tx.execute(import_sql2.sql.raw(stmt));
           }
           await tx.execute(
-            import_sql.sql`insert into "drizzle"."__drizzle_migrations" ("hash", "created_at") values(${migration.hash}, ${migration.folderMillis})`
+            import_sql2.sql`insert into ${import_sql2.sql.identifier(migrationsSchema)}.${import_sql2.sql.identifier(migrationsTable)} ("hash", "created_at") values(${migration.hash}, ${migration.folderMillis})`
           );
         }
       }
@@ -73,30 +75,45 @@ class PgDialect {
   escapeString(str) {
     return `'${str.replace(/'/g, "''")}'`;
   }
-  buildDeleteQuery({ table, where, returning }) {
-    const returningSql = returning ? import_sql.sql` returning ${this.buildSelection(returning, { isSingleTable: true })}` : void 0;
-    const whereSql = where ? import_sql.sql` where ${where}` : void 0;
-    return import_sql.sql`delete from ${table}${whereSql}${returningSql}`;
+  buildWithCTE(queries) {
+    if (!queries?.length)
+      return void 0;
+    const withSqlChunks = [import_sql2.sql`with `];
+    for (const [i, w] of queries.entries()) {
+      withSqlChunks.push(import_sql2.sql`${import_sql2.sql.identifier(w[import_subquery.SubqueryConfig].alias)} as (${w[import_subquery.SubqueryConfig].sql})`);
+      if (i < queries.length - 1) {
+        withSqlChunks.push(import_sql2.sql`, `);
+      }
+    }
+    withSqlChunks.push(import_sql2.sql` `);
+    return import_sql2.sql.join(withSqlChunks);
+  }
+  buildDeleteQuery({ table, where, returning, withList }) {
+    const withSql = this.buildWithCTE(withList);
+    const returningSql = returning ? import_sql2.sql` returning ${this.buildSelection(returning, { isSingleTable: true })}` : void 0;
+    const whereSql = where ? import_sql2.sql` where ${where}` : void 0;
+    return import_sql2.sql`${withSql}delete from ${table}${whereSql}${returningSql}`;
   }
   buildUpdateSet(table, set) {
     const setEntries = Object.entries(set);
     const setSize = setEntries.length;
-    return import_sql.sql.join(
+    return import_sql2.sql.join(
       setEntries.flatMap(([colName, value], i) => {
         const col = table[import_table2.Table.Symbol.Columns][colName];
-        const res = import_sql.sql`${import_sql.sql.identifier(col.name)} = ${value}`;
+        const res = import_sql2.sql`${import_sql2.sql.identifier(col.name)} = ${value}`;
         if (i < setSize - 1) {
-          return [res, import_sql.sql.raw(", ")];
+          return [res, import_sql2.sql.raw(", ")];
         }
         return [res];
       })
     );
   }
-  buildUpdateQuery({ table, set, where, returning }) {
+  buildUpdateQuery({ table, set, where, returning, withList }) {
+    const withSql = this.buildWithCTE(withList);
     const setSql = this.buildUpdateSet(table, set);
-    const returningSql = returning ? import_sql.sql` returning ${this.buildSelection(returning, { isSingleTable: true })}` : void 0;
-    const whereSql = where ? import_sql.sql` where ${where}` : void 0;
-    return import_sql.sql`update ${table} set ${setSql}${whereSql}${returningSql}`;
+    const returningSql = returning ? import_sql2.sql` returning ${this.buildSelection(returning, { isSingleTable: true })}` : void 0;
+    const whereSql = where ? import_sql2.sql` where ${where}` : void 0;
+    return import_sql2.sql`${withSql}update ${table} set ${setSql}${whereSql}${returningSql}`;
   }
   /**
    * Builds selection SQL with provided fields/expressions
@@ -113,16 +130,16 @@ class PgDialect {
     const columnsLen = fields.length;
     const chunks = fields.flatMap(({ field }, i) => {
       const chunk = [];
-      if ((0, import_entity.is)(field, import_sql.SQL.Aliased) && field.isSelectionField) {
-        chunk.push(import_sql.sql.identifier(field.fieldAlias));
-      } else if ((0, import_entity.is)(field, import_sql.SQL.Aliased) || (0, import_entity.is)(field, import_sql.SQL)) {
-        const query = (0, import_entity.is)(field, import_sql.SQL.Aliased) ? field.sql : field;
+      if ((0, import_entity.is)(field, import_sql2.SQL.Aliased) && field.isSelectionField) {
+        chunk.push(import_sql2.sql.identifier(field.fieldAlias));
+      } else if ((0, import_entity.is)(field, import_sql2.SQL.Aliased) || (0, import_entity.is)(field, import_sql2.SQL)) {
+        const query = (0, import_entity.is)(field, import_sql2.SQL.Aliased) ? field.sql : field;
         if (isSingleTable) {
           chunk.push(
-            new import_sql.SQL(
+            new import_sql2.SQL(
               query.queryChunks.map((c) => {
                 if ((0, import_entity.is)(c, import_columns.PgColumn)) {
-                  return import_sql.sql.identifier(c.name);
+                  return import_sql2.sql.identifier(c.name);
                 }
                 return c;
               })
@@ -131,22 +148,22 @@ class PgDialect {
         } else {
           chunk.push(query);
         }
-        if ((0, import_entity.is)(field, import_sql.SQL.Aliased)) {
-          chunk.push(import_sql.sql` as ${import_sql.sql.identifier(field.fieldAlias)}`);
+        if ((0, import_entity.is)(field, import_sql2.SQL.Aliased)) {
+          chunk.push(import_sql2.sql` as ${import_sql2.sql.identifier(field.fieldAlias)}`);
         }
       } else if ((0, import_entity.is)(field, import_column.Column)) {
         if (isSingleTable) {
-          chunk.push(import_sql.sql.identifier(field.name));
+          chunk.push(import_sql2.sql.identifier(field.name));
         } else {
           chunk.push(field);
         }
       }
       if (i < columnsLen - 1) {
-        chunk.push(import_sql.sql`, `);
+        chunk.push(import_sql2.sql`, `);
       }
       return chunk;
     });
-    return import_sql.sql.join(chunks);
+    return import_sql2.sql.join(chunks);
   }
   buildSelectQuery({
     withList,
@@ -166,7 +183,7 @@ class PgDialect {
   }) {
     const fieldsList = fieldsFlat ?? (0, import_utils.orderSelectedFields)(fields);
     for (const f of fieldsList) {
-      if ((0, import_entity.is)(f.field, import_column.Column) && (0, import_table2.getTableName)(f.field.table) !== ((0, import_entity.is)(table, import_subquery.Subquery) ? table[import_subquery.SubqueryConfig].alias : (0, import_entity.is)(table, import_view_base.PgViewBase) ? table[import_view_common.ViewBaseConfig].name : (0, import_entity.is)(table, import_sql.SQL) ? void 0 : (0, import_table2.getTableName)(table)) && !((table2) => joins?.some(
+      if ((0, import_entity.is)(f.field, import_column.Column) && (0, import_table2.getTableName)(f.field.table) !== ((0, import_entity.is)(table, import_subquery.Subquery) ? table[import_subquery.SubqueryConfig].alias : (0, import_entity.is)(table, import_view_base.PgViewBase) ? table[import_view_common.ViewBaseConfig].name : (0, import_entity.is)(table, import_sql2.SQL) ? void 0 : (0, import_table2.getTableName)(table)) && !((table2) => joins?.some(
         ({ alias }) => alias === (table2[import_table2.Table.Symbol.IsAlias] ? (0, import_table2.getTableName)(table2) : table2[import_table2.Table.Symbol.BaseName])
       ))(f.field.table)) {
         const tableName = (0, import_table2.getTableName)(f.field.table);
@@ -176,30 +193,19 @@ class PgDialect {
       }
     }
     const isSingleTable = !joins || joins.length === 0;
-    let withSql;
-    if (withList?.length) {
-      const withSqlChunks = [import_sql.sql`with `];
-      for (const [i, w] of withList.entries()) {
-        withSqlChunks.push(import_sql.sql`${import_sql.sql.identifier(w[import_subquery.SubqueryConfig].alias)} as (${w[import_subquery.SubqueryConfig].sql})`);
-        if (i < withList.length - 1) {
-          withSqlChunks.push(import_sql.sql`, `);
-        }
-      }
-      withSqlChunks.push(import_sql.sql` `);
-      withSql = import_sql.sql.join(withSqlChunks);
-    }
+    const withSql = this.buildWithCTE(withList);
     let distinctSql;
     if (distinct) {
-      distinctSql = distinct === true ? import_sql.sql` distinct` : import_sql.sql` distinct on (${import_sql.sql.join(distinct.on, import_sql.sql`, `)})`;
+      distinctSql = distinct === true ? import_sql2.sql` distinct` : import_sql2.sql` distinct on (${import_sql2.sql.join(distinct.on, import_sql2.sql`, `)})`;
     }
     const selection = this.buildSelection(fieldsList, { isSingleTable });
     const tableSql = (() => {
       if ((0, import_entity.is)(table, import_table2.Table) && table[import_table2.Table.Symbol.OriginalName] !== table[import_table2.Table.Symbol.Name]) {
-        let fullName = import_sql.sql`${import_sql.sql.identifier(table[import_table2.Table.Symbol.OriginalName])}`;
+        let fullName = import_sql2.sql`${import_sql2.sql.identifier(table[import_table2.Table.Symbol.OriginalName])}`;
         if (table[import_table2.Table.Symbol.Schema]) {
-          fullName = import_sql.sql`${import_sql.sql.identifier(table[import_table2.Table.Symbol.Schema])}.${fullName}`;
+          fullName = import_sql2.sql`${import_sql2.sql.identifier(table[import_table2.Table.Symbol.Schema])}.${fullName}`;
         }
-        return import_sql.sql`${fullName} ${import_sql.sql.identifier(table[import_table2.Table.Symbol.Name])}`;
+        return import_sql2.sql`${fullName} ${import_sql2.sql.identifier(table[import_table2.Table.Symbol.Name])}`;
       }
       return table;
     })();
@@ -207,68 +213,68 @@ class PgDialect {
     if (joins) {
       for (const [index, joinMeta] of joins.entries()) {
         if (index === 0) {
-          joinsArray.push(import_sql.sql` `);
+          joinsArray.push(import_sql2.sql` `);
         }
         const table2 = joinMeta.table;
-        const lateralSql = joinMeta.lateral ? import_sql.sql` lateral` : void 0;
+        const lateralSql = joinMeta.lateral ? import_sql2.sql` lateral` : void 0;
         if ((0, import_entity.is)(table2, import_table.PgTable)) {
           const tableName = table2[import_table.PgTable.Symbol.Name];
           const tableSchema = table2[import_table.PgTable.Symbol.Schema];
           const origTableName = table2[import_table.PgTable.Symbol.OriginalName];
           const alias = tableName === origTableName ? void 0 : joinMeta.alias;
           joinsArray.push(
-            import_sql.sql`${import_sql.sql.raw(joinMeta.joinType)} join${lateralSql} ${tableSchema ? import_sql.sql`${import_sql.sql.identifier(tableSchema)}.` : void 0}${import_sql.sql.identifier(origTableName)}${alias && import_sql.sql` ${import_sql.sql.identifier(alias)}`} on ${joinMeta.on}`
+            import_sql2.sql`${import_sql2.sql.raw(joinMeta.joinType)} join${lateralSql} ${tableSchema ? import_sql2.sql`${import_sql2.sql.identifier(tableSchema)}.` : void 0}${import_sql2.sql.identifier(origTableName)}${alias && import_sql2.sql` ${import_sql2.sql.identifier(alias)}`} on ${joinMeta.on}`
           );
-        } else if ((0, import_entity.is)(table2, import_sql2.View)) {
+        } else if ((0, import_entity.is)(table2, import_sql.View)) {
           const viewName = table2[import_view_common.ViewBaseConfig].name;
           const viewSchema = table2[import_view_common.ViewBaseConfig].schema;
           const origViewName = table2[import_view_common.ViewBaseConfig].originalName;
           const alias = viewName === origViewName ? void 0 : joinMeta.alias;
           joinsArray.push(
-            import_sql.sql`${import_sql.sql.raw(joinMeta.joinType)} join${lateralSql} ${viewSchema ? import_sql.sql`${import_sql.sql.identifier(viewSchema)}.` : void 0}${import_sql.sql.identifier(origViewName)}${alias && import_sql.sql` ${import_sql.sql.identifier(alias)}`} on ${joinMeta.on}`
+            import_sql2.sql`${import_sql2.sql.raw(joinMeta.joinType)} join${lateralSql} ${viewSchema ? import_sql2.sql`${import_sql2.sql.identifier(viewSchema)}.` : void 0}${import_sql2.sql.identifier(origViewName)}${alias && import_sql2.sql` ${import_sql2.sql.identifier(alias)}`} on ${joinMeta.on}`
           );
         } else {
           joinsArray.push(
-            import_sql.sql`${import_sql.sql.raw(joinMeta.joinType)} join${lateralSql} ${table2} on ${joinMeta.on}`
+            import_sql2.sql`${import_sql2.sql.raw(joinMeta.joinType)} join${lateralSql} ${table2} on ${joinMeta.on}`
           );
         }
         if (index < joins.length - 1) {
-          joinsArray.push(import_sql.sql` `);
+          joinsArray.push(import_sql2.sql` `);
         }
       }
     }
-    const joinsSql = import_sql.sql.join(joinsArray);
-    const whereSql = where ? import_sql.sql` where ${where}` : void 0;
-    const havingSql = having ? import_sql.sql` having ${having}` : void 0;
+    const joinsSql = import_sql2.sql.join(joinsArray);
+    const whereSql = where ? import_sql2.sql` where ${where}` : void 0;
+    const havingSql = having ? import_sql2.sql` having ${having}` : void 0;
     let orderBySql;
     if (orderBy && orderBy.length > 0) {
-      orderBySql = import_sql.sql` order by ${import_sql.sql.join(orderBy, import_sql.sql`, `)}`;
+      orderBySql = import_sql2.sql` order by ${import_sql2.sql.join(orderBy, import_sql2.sql`, `)}`;
     }
     let groupBySql;
     if (groupBy && groupBy.length > 0) {
-      groupBySql = import_sql.sql` group by ${import_sql.sql.join(groupBy, import_sql.sql`, `)}`;
+      groupBySql = import_sql2.sql` group by ${import_sql2.sql.join(groupBy, import_sql2.sql`, `)}`;
     }
-    const limitSql = limit ? import_sql.sql` limit ${limit}` : void 0;
-    const offsetSql = offset ? import_sql.sql` offset ${offset}` : void 0;
-    const lockingClauseSql = import_sql.sql.empty();
+    const limitSql = limit ? import_sql2.sql` limit ${limit}` : void 0;
+    const offsetSql = offset ? import_sql2.sql` offset ${offset}` : void 0;
+    const lockingClauseSql = import_sql2.sql.empty();
     if (lockingClause) {
-      const clauseSql = import_sql.sql` for ${import_sql.sql.raw(lockingClause.strength)}`;
+      const clauseSql = import_sql2.sql` for ${import_sql2.sql.raw(lockingClause.strength)}`;
       if (lockingClause.config.of) {
         clauseSql.append(
-          import_sql.sql` of ${import_sql.sql.join(
+          import_sql2.sql` of ${import_sql2.sql.join(
             Array.isArray(lockingClause.config.of) ? lockingClause.config.of : [lockingClause.config.of],
-            import_sql.sql`, `
+            import_sql2.sql`, `
           )}`
         );
       }
       if (lockingClause.config.noWait) {
-        clauseSql.append(import_sql.sql` no wait`);
+        clauseSql.append(import_sql2.sql` no wait`);
       } else if (lockingClause.config.skipLocked) {
-        clauseSql.append(import_sql.sql` skip locked`);
+        clauseSql.append(import_sql2.sql` skip locked`);
       }
       lockingClauseSql.append(clauseSql);
     }
-    const finalQuery = import_sql.sql`${withSql}select${distinctSql} ${selection} from ${tableSql}${joinsSql}${whereSql}${groupBySql}${havingSql}${orderBySql}${limitSql}${offsetSql}${lockingClauseSql}`;
+    const finalQuery = import_sql2.sql`${withSql}select${distinctSql} ${selection} from ${tableSql}${joinsSql}${whereSql}${groupBySql}${havingSql}${orderBySql}${limitSql}${offsetSql}${lockingClauseSql}`;
     if (setOperators.length > 0) {
       return this.buildSetOperations(finalQuery, setOperators);
     }
@@ -291,49 +297,49 @@ class PgDialect {
     leftSelect,
     setOperator: { type, isAll, rightSelect, limit, orderBy, offset }
   }) {
-    const leftChunk = import_sql.sql`(${leftSelect.getSQL()}) `;
-    const rightChunk = import_sql.sql`(${rightSelect.getSQL()})`;
+    const leftChunk = import_sql2.sql`(${leftSelect.getSQL()}) `;
+    const rightChunk = import_sql2.sql`(${rightSelect.getSQL()})`;
     let orderBySql;
     if (orderBy && orderBy.length > 0) {
       const orderByValues = [];
       for (const singleOrderBy of orderBy) {
         if ((0, import_entity.is)(singleOrderBy, import_columns.PgColumn)) {
-          orderByValues.push(import_sql.sql.identifier(singleOrderBy.name));
-        } else if ((0, import_entity.is)(singleOrderBy, import_sql.SQL)) {
+          orderByValues.push(import_sql2.sql.identifier(singleOrderBy.name));
+        } else if ((0, import_entity.is)(singleOrderBy, import_sql2.SQL)) {
           for (let i = 0; i < singleOrderBy.queryChunks.length; i++) {
             const chunk = singleOrderBy.queryChunks[i];
             if ((0, import_entity.is)(chunk, import_columns.PgColumn)) {
-              singleOrderBy.queryChunks[i] = import_sql.sql.identifier(chunk.name);
+              singleOrderBy.queryChunks[i] = import_sql2.sql.identifier(chunk.name);
             }
           }
-          orderByValues.push(import_sql.sql`${singleOrderBy}`);
+          orderByValues.push(import_sql2.sql`${singleOrderBy}`);
         } else {
-          orderByValues.push(import_sql.sql`${singleOrderBy}`);
+          orderByValues.push(import_sql2.sql`${singleOrderBy}`);
         }
       }
-      orderBySql = import_sql.sql` order by ${import_sql.sql.join(orderByValues, import_sql.sql`, `)} `;
+      orderBySql = import_sql2.sql` order by ${import_sql2.sql.join(orderByValues, import_sql2.sql`, `)} `;
     }
-    const limitSql = limit ? import_sql.sql` limit ${limit}` : void 0;
-    const operatorChunk = import_sql.sql.raw(`${type} ${isAll ? "all " : ""}`);
-    const offsetSql = offset ? import_sql.sql` offset ${offset}` : void 0;
-    return import_sql.sql`${leftChunk}${operatorChunk}${rightChunk}${orderBySql}${limitSql}${offsetSql}`;
+    const limitSql = limit ? import_sql2.sql` limit ${limit}` : void 0;
+    const operatorChunk = import_sql2.sql.raw(`${type} ${isAll ? "all " : ""}`);
+    const offsetSql = offset ? import_sql2.sql` offset ${offset}` : void 0;
+    return import_sql2.sql`${leftChunk}${operatorChunk}${rightChunk}${orderBySql}${limitSql}${offsetSql}`;
   }
-  buildInsertQuery({ table, values, onConflict, returning }) {
+  buildInsertQuery({ table, values, onConflict, returning, withList }) {
     const valuesSqlList = [];
     const columns = table[import_table2.Table.Symbol.Columns];
     const colEntries = Object.entries(columns);
-    const insertOrder = colEntries.map(([, column]) => import_sql.sql.identifier(column.name));
+    const insertOrder = colEntries.map(([, column]) => import_sql2.sql.identifier(column.name));
     for (const [valueIndex, value] of values.entries()) {
       const valueList = [];
       for (const [fieldName, col] of colEntries) {
         const colValue = value[fieldName];
-        if (colValue === void 0 || (0, import_entity.is)(colValue, import_sql.Param) && colValue.value === void 0) {
+        if (colValue === void 0 || (0, import_entity.is)(colValue, import_sql2.Param) && colValue.value === void 0) {
           if (col.defaultFn !== void 0) {
             const defaultFnResult = col.defaultFn();
-            const defaultValue = (0, import_entity.is)(defaultFnResult, import_sql.SQL) ? defaultFnResult : import_sql.sql.param(defaultFnResult, col);
+            const defaultValue = (0, import_entity.is)(defaultFnResult, import_sql2.SQL) ? defaultFnResult : import_sql2.sql.param(defaultFnResult, col);
             valueList.push(defaultValue);
           } else {
-            valueList.push(import_sql.sql`default`);
+            valueList.push(import_sql2.sql`default`);
           }
         } else {
           valueList.push(colValue);
@@ -341,18 +347,19 @@ class PgDialect {
       }
       valuesSqlList.push(valueList);
       if (valueIndex < values.length - 1) {
-        valuesSqlList.push(import_sql.sql`, `);
+        valuesSqlList.push(import_sql2.sql`, `);
       }
     }
-    const valuesSql = import_sql.sql.join(valuesSqlList);
-    const returningSql = returning ? import_sql.sql` returning ${this.buildSelection(returning, { isSingleTable: true })}` : void 0;
-    const onConflictSql = onConflict ? import_sql.sql` on conflict ${onConflict}` : void 0;
-    return import_sql.sql`insert into ${table} ${insertOrder} values ${valuesSql}${onConflictSql}${returningSql}`;
+    const withSql = this.buildWithCTE(withList);
+    const valuesSql = import_sql2.sql.join(valuesSqlList);
+    const returningSql = returning ? import_sql2.sql` returning ${this.buildSelection(returning, { isSingleTable: true })}` : void 0;
+    const onConflictSql = onConflict ? import_sql2.sql` on conflict ${onConflict}` : void 0;
+    return import_sql2.sql`${withSql}insert into ${table} ${insertOrder} values ${valuesSql}${onConflictSql}${returningSql}`;
   }
   buildRefreshMaterializedViewQuery({ view, concurrently, withNoData }) {
-    const concurrentlySql = concurrently ? import_sql.sql` concurrently` : void 0;
-    const withNoDataSql = withNoData ? import_sql.sql` with no data` : void 0;
-    return import_sql.sql`refresh materialized view${concurrentlySql} ${view}${withNoDataSql}`;
+    const concurrentlySql = concurrently ? import_sql2.sql` concurrently` : void 0;
+    const withNoDataSql = withNoData ? import_sql2.sql` with no data` : void 0;
+    return import_sql2.sql`refresh materialized view${concurrentlySql} ${view}${withNoDataSql}`;
   }
   prepareTyping(encoder) {
     if ((0, import_entity.is)(encoder, import_columns.PgJsonb) || (0, import_entity.is)(encoder, import_columns.PgJson)) {
@@ -923,7 +930,7 @@ class PgDialect {
       }
       let extras;
       if (config.extras) {
-        extras = typeof config.extras === "function" ? config.extras(aliasedColumns, { sql: import_sql.sql }) : config.extras;
+        extras = typeof config.extras === "function" ? config.extras(aliasedColumns, { sql: import_sql2.sql }) : config.extras;
         for (const [tsKey, value] of Object.entries(extras)) {
           fieldsSelection.push({
             tsKey,
@@ -933,7 +940,7 @@ class PgDialect {
       }
       for (const { tsKey, value } of fieldsSelection) {
         selection.push({
-          dbKey: (0, import_entity.is)(value, import_sql.SQL.Aliased) ? value.fieldAlias : tableConfig.columns[tsKey].name,
+          dbKey: (0, import_entity.is)(value, import_sql2.SQL.Aliased) ? value.fieldAlias : tableConfig.columns[tsKey].name,
           tsKey,
           field: (0, import_entity.is)(value, import_column.Column) ? (0, import_alias.aliasedTableColumn)(value, tableAlias) : value,
           relationTableTsKey: void 0,
@@ -962,9 +969,9 @@ class PgDialect {
         const relationTableName = relation.referencedTable[import_table2.Table.Symbol.Name];
         const relationTableTsName = tableNamesMap[relationTableName];
         const relationTableAlias = `${tableAlias}_${selectedRelationTsKey}`;
-        const joinOn2 = (0, import_sql2.and)(
+        const joinOn2 = (0, import_sql.and)(
           ...normalizedRelation.fields.map(
-            (field2, i) => (0, import_sql2.eq)(
+            (field2, i) => (0, import_sql.eq)(
               (0, import_alias.aliasedTableColumn)(normalizedRelation.references[i], relationTableAlias),
               (0, import_alias.aliasedTableColumn)(field2, tableAlias)
             )
@@ -981,9 +988,9 @@ class PgDialect {
           joinOn: joinOn2,
           nestedQueryRelation: relation
         });
-        const field = import_sql.sql`${import_sql.sql.identifier(relationTableAlias)}.${import_sql.sql.identifier("data")}`.as(selectedRelationTsKey);
+        const field = import_sql2.sql`${import_sql2.sql.identifier(relationTableAlias)}.${import_sql2.sql.identifier("data")}`.as(selectedRelationTsKey);
         joins.push({
-          on: import_sql.sql`true`,
+          on: import_sql2.sql`true`,
           table: new import_subquery.Subquery(builtRelation.sql, {}, relationTableAlias),
           alias: relationTableAlias,
           joinType: "left",
@@ -1003,16 +1010,16 @@ class PgDialect {
       throw new import_errors.DrizzleError({ message: `No fields selected for table "${tableConfig.tsName}" ("${tableAlias}")` });
     }
     let result;
-    where = (0, import_sql2.and)(joinOn, where);
+    where = (0, import_sql.and)(joinOn, where);
     if (nestedQueryRelation) {
-      let field = import_sql.sql`json_build_array(${import_sql.sql.join(
+      let field = import_sql2.sql`json_build_array(${import_sql2.sql.join(
         selection.map(
-          ({ field: field2, tsKey, isJson }) => isJson ? import_sql.sql`${import_sql.sql.identifier(`${tableAlias}_${tsKey}`)}.${import_sql.sql.identifier("data")}` : (0, import_entity.is)(field2, import_sql.SQL.Aliased) ? field2.sql : field2
+          ({ field: field2, tsKey, isJson }) => isJson ? import_sql2.sql`${import_sql2.sql.identifier(`${tableAlias}_${tsKey}`)}.${import_sql2.sql.identifier("data")}` : (0, import_entity.is)(field2, import_sql2.SQL.Aliased) ? field2.sql : field2
         ),
-        import_sql.sql`, `
+        import_sql2.sql`, `
       )})`;
       if ((0, import_entity.is)(nestedQueryRelation, import_relations.Many)) {
-        field = import_sql.sql`coalesce(json_agg(${field}${orderBy.length > 0 ? import_sql.sql` order by ${import_sql.sql.join(orderBy, import_sql.sql`, `)}` : void 0}), '[]'::json)`;
+        field = import_sql2.sql`coalesce(json_agg(${field}${orderBy.length > 0 ? import_sql2.sql` order by ${import_sql2.sql.join(orderBy, import_sql2.sql`, `)}` : void 0}), '[]'::json)`;
       }
       const nestedSelection = [{
         dbKey: "data",
@@ -1029,7 +1036,7 @@ class PgDialect {
           fields: {},
           fieldsFlat: [{
             path: [],
-            field: import_sql.sql.raw("*")
+            field: import_sql2.sql.raw("*")
           }],
           where,
           limit,