rake-db 2.10.1 → 2.10.2

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { columnTypes, quote, EnumColumn, getColumnTypes, getTableData, ColumnType, resetTableData, UnknownColumn, raw, TransactionAdapter, logParamToLogObject, createDb as createDb$1, Adapter, simplifyColumnDefault, columnsByType, instantiateColumn, DomainColumn, CustomTypeColumn, ArrayColumn, getConstraintKind, primaryKeyToCode, indexToCode, constraintToCode, referencesArgsToCode, constraintPropsToCode, TimestampTZColumn } from 'pqb';
-import { getCallerFilePath, singleQuote, toSnakeCase, isRawSQL, toArray, snakeCaseKey, emptyObject, consumeColumnName, deepCompare, pathToLog, emptyArray, getImportPath, toCamelCase, codeToString, addCode, quoteObjectKey, backtickQuote } from 'orchid-core';
+import { getCallerFilePath, singleQuote, toSnakeCase, isRawSQL, toArray, snakeCaseKey, emptyObject, consumeColumnName, setDefaultLanguage, deepCompare, pathToLog, emptyArray, getImportPath, toCamelCase, codeToString, addCode, quoteObjectKey, backtickQuote } from 'orchid-core';
 import path, { join } from 'path';
 import { readdir, mkdir, writeFile, stat, readFile } from 'fs/promises';
 import prompts from 'prompts';
@@ -79,6 +79,8 @@ const processRakeDbConfig = (config) => {
     result.columnTypes = proto.columnTypes || columnTypes;
     if (proto.snakeCase)
       result.snakeCase = true;
+    if (proto.language)
+      result.language = proto.language;
   } else {
     result.columnTypes = "columnTypes" in config && (typeof config.columnTypes === "function" ? config.columnTypes(columnTypes) : config.columnTypes) || columnTypes;
   }
@@ -298,6 +300,10 @@ const columnToSql = (name, item, values, hasMultiplePrimaryKeys, snakeCase) => {
   }
   if (item.data.identity) {
     line.push(identityToSql(item.data.identity));
+  } else if (item.data.generated) {
+    line.push(
+      `GENERATED ALWAYS AS (${item.data.generated.toSQL({ values })}) STORED`
+    );
   }
   if (item.data.isPrimaryKey && !hasMultiplePrimaryKeys) {
     line.push("PRIMARY KEY");
@@ -441,7 +447,7 @@ const getIndexName = (table, columns) => {
     }
   ).join("_")}_idx`;
 };
-const indexesToQuery = (up, { schema, name }, indexes) => {
+const indexesToQuery = (up, { schema, name }, indexes, language) => {
   return indexes.map(({ columns, options }) => {
     const indexName = options.name || getIndexName(name, columns);
     if (!up) {
@@ -456,11 +462,14 @@ const indexesToQuery = (up, { schema, name }, indexes) => {
       sql.push("UNIQUE");
     }
     sql.push(`INDEX "${indexName}" ON ${quoteWithSchema({ schema, name })}`);
-    if (options.using) {
-      sql.push(`USING ${options.using}`);
+    const using = options.using || options.tsVector && "GIN";
+    if (using) {
+      sql.push(`USING ${using}`);
     }
     const columnsSql = [];
-    columns.forEach((column) => {
+    const lang = options.tsVector && options.languageColumn ? `"${options.languageColumn}"` : options.language ? typeof options.language === "string" ? `'${options.language}'` : options.language.toSQL({ values }) : `'${language || "english"}'`;
+    let hasWeight = options.tsVector && columns.some((column) => !!column.weight);
+    for (const column of columns) {
       const columnSql = [
         "column" in column ? `"${column.column}"` : `(${column.expression})`
       ];
@@ -473,9 +482,23 @@ const indexesToQuery = (up, { schema, name }, indexes) => {
       if (column.order) {
         columnSql.push(column.order);
       }
-      columnsSql.push(columnSql.join(" "));
-    });
-    sql.push(`(${columnsSql.join(", ")})`);
+      let sql2 = columnSql.join(" ");
+      if (hasWeight) {
+        sql2 = `to_tsvector(${lang}, coalesce(${sql2}, ''))`;
+        if (column.weight) {
+          hasWeight = true;
+          sql2 = `setweight(${sql2}, '${column.weight}')`;
+        }
+      }
+      columnsSql.push(sql2);
+    }
+    let columnList = columnsSql.join(hasWeight ? " || " : ", ");
+    if (!hasWeight && options.tsVector) {
+      if (columnsSql.length > 1)
+        columnList = `concat_ws(' ', ${columnList})`;
+      columnList = `to_tsvector(${lang}, ${columnList})`;
+    }
+    sql.push(`(${columnList})`);
     if (options.include) {
       sql.push(
         `INCLUDE (${toArray(options.include).map((column) => `"${column}"`).join(", ")})`
@@ -559,12 +582,18 @@ var __objRest$1 = (source, exclude) => {
 const createTable$1 = async (migration, up, tableName, options, fn) => {
   var _a;
   const snakeCase = "snakeCase" in options ? options.snakeCase : migration.options.snakeCase;
+  const language = "language" in options ? options.language : migration.options.language;
   const types = Object.assign(
     Object.create(migration.columnTypes),
     tableMethods
   );
   types[snakeCaseKey] = snakeCase;
-  const shape = getColumnTypes(types, fn, (_a = migration.options.baseTable) == null ? void 0 : _a.nowSQL);
+  const shape = getColumnTypes(
+    types,
+    fn,
+    (_a = migration.options.baseTable) == null ? void 0 : _a.nowSQL,
+    language
+  );
   const tableData = getTableData();
   const ast = makeAst$2(
     up,
@@ -575,7 +604,7 @@ const createTable$1 = async (migration, up, tableName, options, fn) => {
     migration.options.noPrimaryKey
   );
   validatePrimaryKey(ast);
-  const queries = astToQueries$1(ast, snakeCase);
+  const queries = astToQueries$1(ast, snakeCase, language);
   for (const _b of queries) {
     const _c = _b, { then } = _c, query = __objRest$1(_c, ["then"]);
     const result = await migration.adapter.arrays(query);
@@ -643,7 +672,7 @@ You can suppress this error by setting { noPrimaryKey: true } after a table name
     }
   }
 };
-const astToQueries$1 = (ast, snakeCase) => {
+const astToQueries$1 = (ast, snakeCase, language) => {
   var _a, _b;
   const queries = [];
   const { shape } = ast;
@@ -715,7 +744,7 @@ const astToQueries$1 = (ast, snakeCase) => {
 )`,
       values
     },
-    ...indexesToQuery(true, ast, indexes),
+    ...indexesToQuery(true, ast, indexes, language),
     ...commentsToQuery(ast, comments)
   );
   if (ast.comment) {
@@ -895,15 +924,17 @@ const tableChangeMethods = __spreadProps$2(__spreadValues$3({}, tableMethods), {
 });
 const changeTable = async (migration, up, tableName, options, fn) => {
   var _a;
+  const snakeCase = "snakeCase" in options ? options.snakeCase : migration.options.snakeCase;
+  const language = "language" in options ? options.language : migration.options.language;
+  setDefaultLanguage(language);
   resetTableData();
   resetChangeTableData();
   const tableChanger = Object.create(migration.columnTypes);
   Object.assign(tableChanger, tableChangeMethods);
-  const snakeCase = "snakeCase" in options ? options.snakeCase : migration.options.snakeCase;
   tableChanger[snakeCaseKey] = snakeCase;
   const changeData = (fn == null ? void 0 : fn(tableChanger)) || {};
   const ast = makeAst$1(up, tableName, changeData, changeTableData, options);
-  const queries = astToQueries(ast, snakeCase);
+  const queries = astToQueries(ast, snakeCase, language);
   for (const query of queries) {
     const result = await migration.adapter.arrays(query);
     (_a = query.then) == null ? void 0 : _a.call(query, result);
@@ -936,7 +967,7 @@ const makeAst$1 = (up, name, changeData, changeTableData2, options) => {
     shape
   }, up ? changeTableData2 : { add: changeTableData2.drop, drop: changeTableData2.add });
 };
-const astToQueries = (ast, snakeCase) => {
+const astToQueries = (ast, snakeCase, language) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   const queries = [];
   if (ast.comment !== void 0) {
@@ -1181,8 +1212,8 @@ const astToQueries = (ast, snakeCase) => {
       values
     });
   }
-  queries.push(...indexesToQuery(false, ast, dropIndexes));
-  queries.push(...indexesToQuery(true, ast, addIndexes));
+  queries.push(...indexesToQuery(false, ast, dropIndexes, language));
+  queries.push(...indexesToQuery(true, ast, addIndexes, language));
   queries.push(...commentsToQuery(ast, comments));
   return queries;
 };