Drop views in Redshift to allow for changes to the view's columns (an…

…d their types). (#270)

api/api.package.json

@@ -4,8 +4,8 @@
   "main": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "@dataform/core": "1.0.0-alpha.2",
-    "@dataform/protos": "1.0.0-alpha.2",
+    "@dataform/core": "1.0.0-alpha.3",
+    "@dataform/protos": "1.0.0-alpha.3",
     "@google-cloud/bigquery": "^1.3.0",
     "@types/glob": "^7.1.1",
     "bluebird": "^3.5.3",

cli/cli.package.json

@@ -8,9 +8,9 @@
     "dtfm": "index.js"
   },
   "dependencies": {
-    "@dataform/api": "1.0.0-alpha.2",
-    "@dataform/core": "1.0.0-alpha.2",
-    "@dataform/protos": "1.0.0-alpha.2",
+    "@dataform/api": "1.0.0-alpha.3",
+    "@dataform/core": "1.0.0-alpha.3",
+    "@dataform/protos": "1.0.0-alpha.3",
     "@types/readline-sync": "^1.4.3",
     "@types/yargs": "^11.1.1",
     "chokidar": "^2.0.4",

common.package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0-alpha.3",
   "homepage": "https://github.com/dataform-co/dataform",
   "license": "MIT",
   "keywords": [

core/adapters/redshift.ts

@@ -22,13 +22,13 @@ export class RedshiftAdapter extends Adapter implements IAdapter {
   ): Tasks {
     const tasks = Tasks.create();
     // Drop the existing view or table if we are changing it's type.
-    if (tableMetadata && tableMetadata.type != this.baseTableType(table.type)) {
+    if (tableMetadata && tableMetadata.type !== this.baseTableType(table.type)) {
       tasks.add(
         Task.statement(this.dropIfExists(table.target, this.oppositeTableType(table.type)))
       );
     }
-    if (table.type == "incremental") {
-      if (runConfig.fullRefresh || !tableMetadata || tableMetadata.type == "view") {
+    if (table.type === "incremental") {
+      if (runConfig.fullRefresh || !tableMetadata || tableMetadata.type === "view") {
         tasks.addAll(this.createOrReplace(table));
       } else {
         // The table exists, insert new rows.
@@ -52,16 +52,15 @@ export class RedshiftAdapter extends Adapter implements IAdapter {
     assertion: dataform.IAssertion,
     projectConfig: dataform.IProjectConfig
   ): Tasks {
-    const tasks = Tasks.create();
     const target =
       assertion.target ||
       dataform.Target.create({
         schema: projectConfig.assertionSchema,
         name: assertion.name
       });
-    tasks.add(Task.statement(this.createOrReplaceView(target, assertion.query)));
-    tasks.add(Task.assertion(`select sum(1) as row_count from ${this.resolveTarget(target)}`));
-    return tasks;
+    return Tasks.create()
+      .add(Task.statement(this.createOrReplaceView(target, assertion.query)))
+      .add(Task.assertion(`select sum(1) as row_count from ${this.resolveTarget(target)}`));
   }
 
   public createOrReplaceView(target: dataform.ITarget, query: string) {
@@ -70,39 +69,40 @@ export class RedshiftAdapter extends Adapter implements IAdapter {
   }
 
   public createOrReplace(table: dataform.ITable) {
-    if (table.type == "view") {
-      return Tasks.create().add(
-        Task.statement(`
+    if (table.type === "view") {
+      return (
+        Tasks.create()
+          // Drop the view in case we are changing the number of column(s) (or their types).
+          .add(Task.statement(this.dropIfExists(table.target, this.baseTableType(table.type))))
+          .add(
+            Task.statement(`
         create or replace view ${this.resolveTarget(table.target)}
         as ${table.query}`)
+          )
       );
-    } else {
-      const tempTableTarget = dataform.Target.create({
-        schema: table.target.schema,
-        name: table.target.name + "_temp"
-      });
+    }
+    const tempTableTarget = dataform.Target.create({
+      schema: table.target.schema,
+      name: table.target.name + "_temp"
+    });
 
-      const tasks = Tasks.create();
-      tasks.add(Task.statement(this.dropIfExists(tempTableTarget, this.baseTableType(table.type))));
-      tasks.add(Task.statement(this.createTable(table, tempTableTarget)));
-      tasks.add(Task.statement(this.dropIfExists(table.target, "table")));
-      tasks.add(
+    return Tasks.create()
+      .add(Task.statement(this.dropIfExists(tempTableTarget, this.baseTableType(table.type))))
+      .add(Task.statement(this.createTable(table, tempTableTarget)))
+      .add(Task.statement(this.dropIfExists(table.target, "table")))
+      .add(
         Task.statement(
           `alter table ${this.resolveTarget(tempTableTarget)} rename to "${table.target.name}"`
         )
       );
-      return tasks;
-    }
   }
 
   public createTable(table: dataform.ITable, target: dataform.ITarget) {
     if (table.redshift) {
       let query = `create table ${this.resolveTarget(target)}`;
 
       if (table.redshift.distStyle && table.redshift.distKey) {
-        query = `${query} diststyle ${table.redshift.distStyle} distkey (${
-          table.redshift.distKey
-        })`;
+        query = `${query} diststyle ${table.redshift.distStyle} distkey (${table.redshift.distKey})`;
       }
       if (table.redshift.sortStyle && table.redshift.sortKeys) {
         query = `${query} ${table.redshift.sortStyle} sortkey (${table.redshift.sortKeys.join(

core/core.package.json

@@ -4,7 +4,7 @@
   "main": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "@dataform/protos": "1.0.0-alpha.2",
+    "@dataform/protos": "1.0.0-alpha.3",
     "moo": "^0.5.0",
     "protobufjs": "^6.8.8"
   }

crossdb/crossdb.package.json

@@ -2,7 +2,7 @@
   "name": "@dataform/crossdb",
   "description": "Cross database utilities for dataform.",
   "dependencies": {
-    "@dataform/core": "1.0.0-alpha.2"
+    "@dataform/core": "1.0.0-alpha.3"
   },
   "main": "index.js",
   "types": "index.d.ts",