@sqlanvil/cli 1.1.2 → 1.3.0

package/bundle.js

@@ -12722,6 +12722,7 @@ const sqlanvil = $root.sqlanvil = (() => {
                  * @interface IBound
                  * @property {string|null} [name] Bound name
                  * @property {string|null} [values] Bound values
+                 * @property {sqlanvil.PostgresOptions.IPartition|null} [subPartition] Bound subPartition
                  */
 
                 /**
@@ -12755,6 +12756,14 @@ const sqlanvil = $root.sqlanvil = (() => {
                  */
                 Bound.prototype.values = "";
 
+                /**
+                 * Bound subPartition.
+                 * @member {sqlanvil.PostgresOptions.IPartition|null|undefined} subPartition
+                 * @memberof sqlanvil.PostgresOptions.Partition.Bound
+                 * @instance
+                 */
+                Bound.prototype.subPartition = null;
+
                 /**
                  * Creates a new Bound instance using the specified properties.
                  * @function create
@@ -12783,6 +12792,8 @@ const sqlanvil = $root.sqlanvil = (() => {
                         writer.uint32(/* id 1, wireType 2 =*/10).string(message.name);
                     if (message.values != null && Object.hasOwnProperty.call(message, "values"))
                         writer.uint32(/* id 2, wireType 2 =*/18).string(message.values);
+                    if (message.subPartition != null && Object.hasOwnProperty.call(message, "subPartition"))
+                        $root.sqlanvil.PostgresOptions.Partition.encode(message.subPartition, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim();
                     return writer;
                 };
 
@@ -12827,6 +12838,10 @@ const sqlanvil = $root.sqlanvil = (() => {
                                 message.values = reader.string();
                                 break;
                             }
+                        case 3: {
+                                message.subPartition = $root.sqlanvil.PostgresOptions.Partition.decode(reader, reader.uint32());
+                                break;
+                            }
                         default:
                             reader.skipType(tag & 7);
                             break;
@@ -12868,6 +12883,11 @@ const sqlanvil = $root.sqlanvil = (() => {
                     if (message.values != null && message.hasOwnProperty("values"))
                         if (!$util.isString(message.values))
                             return "values: string expected";
+                    if (message.subPartition != null && message.hasOwnProperty("subPartition")) {
+                        let error = $root.sqlanvil.PostgresOptions.Partition.verify(message.subPartition);
+                        if (error)
+                            return "subPartition." + error;
+                    }
                     return null;
                 };
 
@@ -12887,6 +12907,11 @@ const sqlanvil = $root.sqlanvil = (() => {
                         message.name = String(object.name);
                     if (object.values != null)
                         message.values = String(object.values);
+                    if (object.subPartition != null) {
+                        if (typeof object.subPartition !== "object")
+                            throw TypeError(".sqlanvil.PostgresOptions.Partition.Bound.subPartition: object expected");
+                        message.subPartition = $root.sqlanvil.PostgresOptions.Partition.fromObject(object.subPartition);
+                    }
                     return message;
                 };
 
@@ -12906,11 +12931,14 @@ const sqlanvil = $root.sqlanvil = (() => {
                     if (options.defaults) {
                         object.name = "";
                         object.values = "";
+                        object.subPartition = null;
                     }
                     if (message.name != null && message.hasOwnProperty("name"))
                         object.name = message.name;
                     if (message.values != null && message.hasOwnProperty("values"))
                         object.values = message.values;
+                    if (message.subPartition != null && message.hasOwnProperty("subPartition"))
+                        object.subPartition = $root.sqlanvil.PostgresOptions.Partition.toObject(message.subPartition, options);
                     return object;
                 };
 
@@ -38415,27 +38443,44 @@ class PostgresExecutionSql {
         }
     }
     createPartitionedTableTasks(table) {
+        var _a;
         const partition = table.postgres.partition;
         const target = this.resolveTarget(table.target);
         const stage = this.resolveTarget(Object.assign(Object.assign({}, table.target), { name: `${table.target.name}__sa_stage` }));
         const kind = this.partitionKindAsSql(partition.kind);
         const columns = (partition.columns || []).map(c => `"${c}"`).join(", ");
+        const tablespace = ((_a = table.postgres) === null || _a === void 0 ? void 0 : _a.tablespace) ? ` tablespace "${table.postgres.tablespace}"` : "";
         const statements = [
             `drop table if exists ${stage} cascade`,
             `create unlogged table ${stage} as ${table.query} with no data`,
             `drop table if exists ${target} cascade`,
-            `create table ${target} (like ${stage} including defaults) partition by ${kind} (${columns})`
+            `create table ${target} (like ${stage} including defaults) partition by ${kind} (${columns})${tablespace}`
         ];
+        statements.push(...this.createChildPartitions(table.target, table.target.name, target, partition));
+        statements.push(`insert into ${target} select * from (${table.query}) as q`);
+        statements.push(`drop table if exists ${stage} cascade`);
+        return statements;
+    }
+    createChildPartitions(baseTarget, parentName, parentSql, partition) {
+        const statements = [];
         for (const bound of partition.partitions || []) {
-            const child = this.resolveTarget(Object.assign(Object.assign({}, table.target), { name: `${table.target.name}__${bound.name}` }));
-            statements.push(`create table ${child} partition of ${target} for values ${bound.values}`);
+            const childName = `${parentName}__${bound.name}`;
+            const childSql = this.resolveTarget(Object.assign(Object.assign({}, baseTarget), { name: childName }));
+            const sub = bound.subPartition;
+            if (sub && (sub.columns || []).length > 0) {
+                const subKind = this.partitionKindAsSql(sub.kind);
+                const subColumns = (sub.columns || []).map(c => `"${c}"`).join(", ");
+                statements.push(`create table ${childSql} partition of ${parentSql} for values ${bound.values} partition by ${subKind} (${subColumns})`);
+                statements.push(...this.createChildPartitions(baseTarget, childName, childSql, sub));
+            }
+            else {
+                statements.push(`create table ${childSql} partition of ${parentSql} for values ${bound.values}`);
+            }
         }
         if (partition.includeDefault) {
-            const def = this.resolveTarget(Object.assign(Object.assign({}, table.target), { name: `${table.target.name}__default` }));
-            statements.push(`create table ${def} partition of ${target} default`);
+            const def = this.resolveTarget(Object.assign(Object.assign({}, baseTarget), { name: `${parentName}__default` }));
+            statements.push(`create table ${def} partition of ${parentSql} default`);
         }
-        statements.push(`insert into ${target} select * from (${table.query}) as q`);
-        statements.push(`drop table if exists ${stage} cascade`);
         return statements;
     }
     partitionKindAsSql(kind) {
@@ -38608,7 +38653,7 @@ function collectEvaluationQueries(queryOrAction, concatenate, queryModifier = (q
         .filter(validationQuery => !!validationQuery.query);
 }
 
-const version = "1.1.2";
+const version = "1.3.0";
 const dataformVersion = "3.0.59";
 
 async function build(compiledGraph, runConfig, dbadapter) {
@@ -38885,6 +38930,19 @@ function read(credentialsPath, warehouse = "bigquery") {
         return credentials;
     }
 }
+function readConnections(credentialsPath) {
+    if (!fs__namespace$1.existsSync(credentialsPath)) {
+        return {};
+    }
+    let credentialsAsJson;
+    try {
+        credentialsAsJson = JSON.parse(fs__namespace$1.readFileSync(credentialsPath, "utf8"));
+    }
+    catch (e) {
+        throw new Error(`Error reading credentials file: ${e.message}`);
+    }
+    return credentialsAsJson.connections || {};
+}
 var TestResultStatus;
 (function (TestResultStatus) {
     TestResultStatus[TestResultStatus["SUCCESSFUL"] = 0] = "SUCCESSFUL";
@@ -39195,6 +39253,31 @@ function introspectToSqlx(projectDir, connectionName, tableRef, options) {
     });
 }
 
+const CONNECTION_TOKEN = /\$\{SA_CONN:([^:}]+):([^}]+)\}/g;
+function substituteConnectionCredentials(statement, connections) {
+    return statement.replace(CONNECTION_TOKEN, (_match, connectionName, field) => {
+        const entry = connections[connectionName];
+        if (!entry) {
+            throw new Error(`Connection "${connectionName}" is referenced by an FDW bridge but has no entry under ` +
+                `"connections" in .df-credentials.json. Add connections.${connectionName} with the ` +
+                `source user/password.`);
+        }
+        const value = entry[field];
+        if (value === undefined || value === null || value === "") {
+            throw new Error(`Connection "${connectionName}" is missing "${field}" under "connections.${connectionName}" ` +
+                `in .df-credentials.json.`);
+        }
+        return String(value).replace(/'/g, "''");
+    });
+}
+function assertConnectionCredentialsAvailable(graph, connections) {
+    (graph.actions || []).forEach(action => (action.tasks || []).forEach(task => {
+        if (task.statement) {
+            substituteConnectionCredentials(task.statement, connections);
+        }
+    }));
+}
+
 function parseArgvFlags(argv) {
     const parsedArgv = {};
     const splitArgv = [];
@@ -39595,7 +39678,10 @@ class Runner {
         }
         else {
             try {
-                const { rows, metadata } = await retry(() => client.execute(task.statement, {
+                const statement = this.executionOptions.connectionCredentials
+                    ? substituteConnectionCredentials(task.statement, this.executionOptions.connectionCredentials)
+                    : task.statement;
+                const { rows, metadata } = await retry(() => client.execute(statement, {
                     onCancel: handleCancel => this.eEmitter.on(CANCEL_EVENT, handleCancel),
                     rowLimit: 1,
                     bigquery: options.bigquery
@@ -39652,12 +39738,13 @@ async function test(dbadapter, tests) {
     return await Promise.all(tests.map(testCase => runTest(dbadapter, testCase)));
 }
 async function runTest(dbadapter, testCase) {
+    const noLimit = {};
     let actualResults;
     let expectedResults;
     try {
         [actualResults, expectedResults] = await Promise.all([
-            dbadapter.execute(testCase.testQuery, { byteLimit: 1024 * 1024 }),
-            dbadapter.execute(testCase.expectedOutputQuery, { byteLimit: 1024 * 1024 })
+            dbadapter.execute(testCase.testQuery, noLimit),
+            dbadapter.execute(testCase.expectedOutputQuery, noLimit)
         ]);
     }
     catch (e) {
@@ -42456,13 +42543,18 @@ function runCli() {
                         print("No actions to run.\n");
                         return 0;
                     }
+                    const connectionCredentials = readConnections(getCredentialsPath(argv[projectDirOption.name], argv[credentialsOption.name]));
+                    assertConnectionCredentialsAvailable(executionGraph, connectionCredentials);
                     if (argv[dryRunOptionName]) {
                         print("Dry running (no changes to the warehouse will be applied)...");
                     }
                     else {
                         print("Running...\n");
                     }
-                    const runner = run(dbadapter, executionGraph, { bigquery: bigqueryOptions });
+                    const runner = run(dbadapter, executionGraph, {
+                        bigquery: bigqueryOptions,
+                        connectionCredentials
+                    });
                     process.on("SIGINT", () => {
                         runner.cancel();
                     });

package/package.json

@@ -61,7 +61,7 @@
     "bin": {
         "sqlanvil": "bundle.js"
     },
-    "version": "1.1.2",
+    "version": "1.3.0",
     "name": "@sqlanvil/cli",
     "description": "sqlanvil command line interface.",
     "main": "bundle.js"

package/worker_bundle.js

@@ -12665,6 +12665,7 @@ const sqlanvil = $root.sqlanvil = (() => {
                  * @interface IBound
                  * @property {string|null} [name] Bound name
                  * @property {string|null} [values] Bound values
+                 * @property {sqlanvil.PostgresOptions.IPartition|null} [subPartition] Bound subPartition
                  */
 
                 /**
@@ -12698,6 +12699,14 @@ const sqlanvil = $root.sqlanvil = (() => {
                  */
                 Bound.prototype.values = "";
 
+                /**
+                 * Bound subPartition.
+                 * @member {sqlanvil.PostgresOptions.IPartition|null|undefined} subPartition
+                 * @memberof sqlanvil.PostgresOptions.Partition.Bound
+                 * @instance
+                 */
+                Bound.prototype.subPartition = null;
+
                 /**
                  * Creates a new Bound instance using the specified properties.
                  * @function create
@@ -12726,6 +12735,8 @@ const sqlanvil = $root.sqlanvil = (() => {
                         writer.uint32(/* id 1, wireType 2 =*/10).string(message.name);
                     if (message.values != null && Object.hasOwnProperty.call(message, "values"))
                         writer.uint32(/* id 2, wireType 2 =*/18).string(message.values);
+                    if (message.subPartition != null && Object.hasOwnProperty.call(message, "subPartition"))
+                        $root.sqlanvil.PostgresOptions.Partition.encode(message.subPartition, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim();
                     return writer;
                 };
 
@@ -12770,6 +12781,10 @@ const sqlanvil = $root.sqlanvil = (() => {
                                 message.values = reader.string();
                                 break;
                             }
+                        case 3: {
+                                message.subPartition = $root.sqlanvil.PostgresOptions.Partition.decode(reader, reader.uint32());
+                                break;
+                            }
                         default:
                             reader.skipType(tag & 7);
                             break;
@@ -12811,6 +12826,11 @@ const sqlanvil = $root.sqlanvil = (() => {
                     if (message.values != null && message.hasOwnProperty("values"))
                         if (!$util.isString(message.values))
                             return "values: string expected";
+                    if (message.subPartition != null && message.hasOwnProperty("subPartition")) {
+                        let error = $root.sqlanvil.PostgresOptions.Partition.verify(message.subPartition);
+                        if (error)
+                            return "subPartition." + error;
+                    }
                     return null;
                 };
 
@@ -12830,6 +12850,11 @@ const sqlanvil = $root.sqlanvil = (() => {
                         message.name = String(object.name);
                     if (object.values != null)
                         message.values = String(object.values);
+                    if (object.subPartition != null) {
+                        if (typeof object.subPartition !== "object")
+                            throw TypeError(".sqlanvil.PostgresOptions.Partition.Bound.subPartition: object expected");
+                        message.subPartition = $root.sqlanvil.PostgresOptions.Partition.fromObject(object.subPartition);
+                    }
                     return message;
                 };
 
@@ -12849,11 +12874,14 @@ const sqlanvil = $root.sqlanvil = (() => {
                     if (options.defaults) {
                         object.name = "";
                         object.values = "";
+                        object.subPartition = null;
                     }
                     if (message.name != null && message.hasOwnProperty("name"))
                         object.name = message.name;
                     if (message.values != null && message.hasOwnProperty("values"))
                         object.values = message.values;
+                    if (message.subPartition != null && message.hasOwnProperty("subPartition"))
+                        object.subPartition = $root.sqlanvil.PostgresOptions.Partition.toObject(message.subPartition, options);
                     return object;
                 };