@dbsp/adapter-pgsql 1.9.0 → 1.10.0

package/dist/index.js

@@ -11885,13 +11885,14 @@ function upCreateIndex(change, schemaName) {
   ];
   const cols = colParts.join(", ");
   const include = idx.include && idx.include.length > 0 ? ` INCLUDE (${idx.include.map((n) => quoteIdent2(n, "alias")).join(", ")})` : "";
+  const nullsNotDistinct = idx.unique && idx.nullsNotDistinct ? " NULLS NOT DISTINCT" : "";
   const withParams = idx.with && Object.keys(idx.with).length > 0 ? ` WITH (${Object.entries(idx.with).map(([k, v]) => {
     validateIdentifier(k, "alias");
     return `${k} = ${v}`;
   }).join(", ")})` : "";
   if (idx.where) validateSqlExpression(idx.where, "index WHERE predicate");
   const where = idx.where ? ` WHERE ${idx.where}` : "";
-  return `CREATE ${unique}INDEX IF NOT EXISTS ${indexName} ON ${qualifyTable(change.table, schemaName)}${method} (${cols})${include}${withParams}${where};`;
+  return `CREATE ${unique}INDEX IF NOT EXISTS ${indexName} ON ${qualifyTable(change.table, schemaName)}${method} (${cols})${include}${nullsNotDistinct}${withParams}${where};`;
 }
 function upDropIndex(change, schemaName) {
   const idx = change.meta?.index;
@@ -12761,13 +12762,14 @@ function generateCreateIndex(tableName, idx, schemaName, naming) {
   }
   const cols = colParts.join(", ");
   const include = idx.include && idx.include.length > 0 ? ` INCLUDE (${idx.include.map((c) => quoteIdentifier(naming.toDatabase(c))).join(", ")})` : "";
+  const nullsNotDistinct = idx.unique && idx.nullsNotDistinct ? " NULLS NOT DISTINCT" : "";
   const withParams = idx.with && Object.keys(idx.with).length > 0 ? ` WITH (${Object.entries(idx.with).map(([k, v]) => {
     validateIdentifier(k, "alias");
     return `${k} = ${v}`;
   }).join(", ")})` : "";
   if (idx.where) validateSqlExpression(idx.where, "index WHERE predicate");
   const where = idx.where ? ` WHERE ${idx.where}` : "";
-  return `CREATE ${unique}INDEX ${indexName} ON ${qualifiedTable}${method} (${cols})${include}${withParams}${where};`;
+  return `CREATE ${unique}INDEX ${indexName} ON ${qualifiedTable}${method} (${cols})${include}${nullsNotDistinct}${withParams}${where};`;
 }
 function generateCreatePolicy(tableName, policy, schemaName, naming) {
   const qualifiedTable = qualifyTable2(tableName, schemaName, naming);
@@ -12999,6 +13001,11 @@ function compareSchemata(schema, db, options) {
   const plugin = options?.dbCasing !== void 0 ? getNamingPluginForDbCasing(options.dbCasing) : void 0;
   const schemaTables = plugin ? normalizeTableMap(schema.tables, plugin) : new Map(schema.tables);
   const dbTables = new Map(db.tables);
+  const externalTables = new Set(
+    [...schema.externalTables ?? []].map(
+      (name) => plugin ? plugin.toDatabase(name) : name
+    )
+  );
   const caps = options?.dialectCapabilities;
   const sup2 = (flag) => !caps || flag === true;
   if (sup2(caps?.supportsDDLEnumTypes)) {
@@ -13088,7 +13095,7 @@ function compareSchemata(schema, db, options) {
     }
   }
   for (const [name] of dbTables) {
-    if (!schemaTables.has(name)) {
+    if (!schemaTables.has(name) && !externalTables.has(name)) {
       changes.push({
         kind: "drop_table",
         table: name,
@@ -13429,6 +13436,7 @@ function indexKey(idx) {
   const parts = [
     idx.columns.join(","),
     idx.unique ? "unique" : "nonunique",
+    idx.unique && idx.nullsNotDistinct ? "nulls-not-distinct" : "",
     idx.method ?? "btree",
     idx.where ?? "",
     (idx.expressions ?? []).join(","),
@@ -14123,6 +14131,7 @@ async function queryAllCatalogs(pool, schema) {
 			     FILTER (WHERE k.n <= ix.indnkeyatts AND k.attnum != 0
 			             AND NOT oc.opcdefault) AS opclass_cols,
 			   ix.indisunique AS is_unique,
+			   bool_or(COALESCE((to_jsonb(ix) ->> 'indnullsnotdistinct')::boolean, false)) AS nulls_not_distinct,
 			   am.amname AS method,
 			   pg_get_expr(ix.indpred, ix.indrelid, false) AS predicate,
 			   i.reloptions AS reloptions
@@ -14317,6 +14326,7 @@ function buildIndexMap(rows) {
       name: idx.index_name,
       columns,
       ...idx.is_unique ? { unique: true } : {},
+      ...idx.is_unique && idx.nulls_not_distinct ? { nullsNotDistinct: true } : {},
       // Only store method when it's not the default 'btree'
       ...idx.method && idx.method !== "btree" ? { method: idx.method } : {},
       ...idx.predicate ? { where: idx.predicate } : {},
@@ -18132,6 +18142,9 @@ function generateCreateIndexSQL(table, options, schema) {
     const includeCols = options.include.map((c) => quoteIdentifier2(c)).join(", ");
     parts.push(`INCLUDE (${includeCols})`);
   }
+  if (options.unique && options.nullsNotDistinct) {
+    parts.push("NULLS NOT DISTINCT");
+  }
   if (options.with && Object.keys(options.with).length > 0) {
     const withParams = Object.entries(options.with).map(([k, v]) => {
       validateIdentifier(k, "alias");