Skip to content

Commit

Permalink
Merge branch 'development' into dev/isaac-asimov
Browse files Browse the repository at this point in the history
  • Loading branch information
@jwerderits
jwerderits committed Jul 17, 2018
2 parents b5a5003 + 111142b commit 568c82e
Show file tree
Hide file tree
Showing 34 changed files with 276 additions and 132 deletions.
47 changes: 31 additions & 16 deletions test/integration/001_simple_copy_test/test_simple_copy.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,20 @@ def test__postgres__simple_copy(self):
self.use_profile("postgres")
self.use_default_project({"data-paths": [self.dir("seed-initial")]})

self.run_dbt(["seed"])
self.run_dbt()
results = self.run_dbt(["seed"])
self.assertEqual(len(results), 1)
results = self.run_dbt()
self.assertEqual(len(results), 6)

self.assertTablesEqual("seed","view_model")
self.assertTablesEqual("seed","incremental")
self.assertTablesEqual("seed","materialized")

self.use_default_project({"data-paths": [self.dir("seed-update")]})
self.run_dbt(["seed"])
self.run_dbt()
results = self.run_dbt(["seed"])
self.assertEqual(len(results), 1)
results = self.run_dbt()
self.assertEqual(len(results), 6)

self.assertTablesEqual("seed","view_model")
self.assertTablesEqual("seed","incremental")
Expand All @@ -44,8 +48,10 @@ def test__postgres__dbt_doesnt_run_empty_models(self):
self.use_profile("postgres")
self.use_default_project({"data-paths": [self.dir("seed-initial")]})

self.run_dbt(["seed"])
self.run_dbt()
results = self.run_dbt(["seed"])
self.assertEqual(len(results), 1)
results = self.run_dbt()
self.assertEqual(len(results), 6)

models = self.get_models_in_schema()

Expand Down Expand Up @@ -80,8 +86,10 @@ def test__snowflake__simple_copy__quoting_on(self):
"quoting": {"identifier": True},
})

self.run_dbt(["seed"])
self.run_dbt()
results = self.run_dbt(["seed"])
self.assertEqual(len(results), 1)
results = self.run_dbt()
self.assertEqual(len(results), 6)

self.assertTablesEqual("seed", "view_model")
self.assertTablesEqual("seed", "incremental")
Expand All @@ -91,8 +99,10 @@ def test__snowflake__simple_copy__quoting_on(self):
"data-paths": [self.dir("seed-update")],
"quoting": {"identifier": True},
})
self.run_dbt(["seed"])
self.run_dbt()
results = self.run_dbt(["seed"])
self.assertEqual(len(results), 1)
results = self.run_dbt()
self.assertEqual(len(results), 6)

self.assertTablesEqual("seed", "view_model")
self.assertTablesEqual("seed", "incremental")
Expand All @@ -106,8 +116,10 @@ def test__snowflake__simple_copy__quoting_off(self):
"quoting": {"identifier": False},
})

self.run_dbt(["seed"])
self.run_dbt()
results = self.run_dbt(["seed"])
self.assertEqual(len(results), 1)
results = self.run_dbt()
self.assertEqual(len(results), 6)

self.assertTablesEqual("SEED", "VIEW_MODEL")
self.assertTablesEqual("SEED", "INCREMENTAL")
Expand All @@ -117,8 +129,10 @@ def test__snowflake__simple_copy__quoting_off(self):
"data-paths": [self.dir("seed-update")],
"quoting": {"identifier": False},
})
self.run_dbt(["seed"])
self.run_dbt()
results = self.run_dbt(["seed"])
self.assertEqual(len(results), 1)
results = self.run_dbt()
self.assertEqual(len(results), 6)

self.assertTablesEqual("SEED", "VIEW_MODEL")
self.assertTablesEqual("SEED", "INCREMENTAL")
Expand All @@ -132,10 +146,11 @@ def test__snowflake__seed__quoting_switch(self):
"quoting": {"identifier": False},
})

self.run_dbt(["seed"])
results = self.run_dbt(["seed"])
self.assertEqual(len(results), 1)

self.use_default_project({
"data-paths": [self.dir("seed-update")],
"quoting": {"identifier": True},
})
self.run_dbt(["seed"], expect_pass=False)
results = self.run_dbt(["seed"], expect_pass=False)
12 changes: 8 additions & 4 deletions test/integration/002_varchar_widening_test/test_varchar_widening.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,16 @@ def test__postgres__varchar_widening(self):
self.use_default_project()
self.run_sql_file("test/integration/002_varchar_widening_test/seed.sql")

self.run_dbt()
results = self.run_dbt()
self.assertEqual(len(results), 2)

self.assertTablesEqual("seed","incremental")
self.assertTablesEqual("seed","materialized")

self.run_sql_file("test/integration/002_varchar_widening_test/update.sql")

self.run_dbt()
results = self.run_dbt()
self.assertEqual(len(results), 2)

self.assertTablesEqual("seed","incremental")
self.assertTablesEqual("seed","materialized")
Expand All @@ -38,14 +40,16 @@ def test__snowflake__varchar_widening(self):
self.use_default_project()
self.run_sql_file("test/integration/002_varchar_widening_test/seed.sql")

self.run_dbt()
results = self.run_dbt()
self.assertEqual(len(results), 2)

self.assertTablesEqual("SEED", "incremental")
self.assertTablesEqual("SEED", "materialized")

self.run_sql_file("test/integration/002_varchar_widening_test/update.sql")

self.run_dbt()
results = self.run_dbt()
self.assertEqual(len(results), 2)

self.assertTablesEqual("SEED", "incremental")
self.assertTablesEqual("SEED", "materialized")
33 changes: 25 additions & 8 deletions test/integration/003_simple_reference_test/test_simple_reference.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ def test__postgres__simple_reference(self):
self.run_sql_file(
"test/integration/003_simple_reference_test/seed.sql")

self.run_dbt()
results = self.run_dbt()
# ephemeral_copy doesn't show up in results
self.assertEqual(len(results), 7)

# Copies should match
self.assertTablesEqual("seed","incremental_copy")
Expand All @@ -36,7 +38,8 @@ def test__postgres__simple_reference(self):

self.run_sql_file("test/integration/003_simple_reference_test/update.sql")

self.run_dbt()
results = self.run_dbt()
self.assertEqual(len(results), 7)

# Copies should match
self.assertTablesEqual("seed","incremental_copy")
Expand All @@ -55,7 +58,8 @@ def test__snowflake__simple_reference(self):
self.use_default_project()
self.run_sql_file("test/integration/003_simple_reference_test/seed.sql")

self.run_dbt()
results = self.run_dbt()
self.assertEqual(len(results), 7)

# Copies should match
self.assertTablesEqual("SEED", "incremental_copy")
Expand All @@ -71,7 +75,8 @@ def test__snowflake__simple_reference(self):
self.run_sql_file(
"test/integration/003_simple_reference_test/update.sql")

self.run_dbt()
results = self.run_dbt()
self.assertEqual(len(results), 7)

# Copies should match
self.assertTablesEqual("SEED", "incremental_copy")
Expand All @@ -92,7 +97,10 @@ def test__postgres__simple_reference_with_models(self):

# Run materialized_copy, ephemeral_copy, and their dependents
# ephemeral_copy should not actually be materialized b/c it is ephemeral
self.run_dbt(['run', '--models', 'materialized_copy', 'ephemeral_copy'])
results = self.run_dbt(
['run', '--models', 'materialized_copy', 'ephemeral_copy']
)
self.assertEqual(len(results), 1)

# Copies should match
self.assertTablesEqual("seed","materialized_copy")
Expand All @@ -109,7 +117,10 @@ def test__postgres__simple_reference_with_models_and_children(self):
# Run materialized_copy, ephemeral_copy, and their dependents
# ephemeral_copy should not actually be materialized b/c it is ephemeral
# the dependent ephemeral_summary, however, should be materialized as a table
self.run_dbt(['run', '--models', 'materialized_copy+', 'ephemeral_copy+'])
results = self.run_dbt(
['run', '--models', 'materialized_copy+', 'ephemeral_copy+']
)
self.assertEqual(len(results), 3)

# Copies should match
self.assertTablesEqual("seed","materialized_copy")
Expand Down Expand Up @@ -144,7 +155,10 @@ def test__snowflake__simple_reference_with_models(self):

# Run materialized_copy & ephemeral_copy
# ephemeral_copy should not actually be materialized b/c it is ephemeral
self.run_dbt(['run', '--models', 'materialized_copy', 'ephemeral_copy'])
results = self.run_dbt(
['run', '--models', 'materialized_copy', 'ephemeral_copy']
)
self.assertEqual(len(results), 1)

# Copies should match
self.assertTablesEqual("SEED", "materialized_copy")
Expand All @@ -161,7 +175,10 @@ def test__snowflake__simple_reference_with_models_and_children(self):
# Run materialized_copy, ephemeral_copy, and their dependents
# ephemeral_copy should not actually be materialized b/c it is ephemeral
# the dependent ephemeral_summary, however, should be materialized as a table
self.run_dbt(['run', '--models', 'materialized_copy+', 'ephemeral_copy+'])
results = self.run_dbt(
['run', '--models', 'materialized_copy+', 'ephemeral_copy+']
)
self.assertEqual(len(results), 3)

# Copies should match
self.assertTablesEqual("SEED", "materialized_copy")
Expand Down
12 changes: 8 additions & 4 deletions test/integration/004_simple_archive_test/test_simple_archive.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,16 @@ def test__postgres__simple_archive(self):
self.use_default_project()
self.run_sql_file("test/integration/004_simple_archive_test/seed.sql")

self.run_dbt(["archive"])
results = self.run_dbt(["archive"])
self.assertEqual(len(results), 1)

self.assertTablesEqual("archive_expected","archive_actual")

self.run_sql_file("test/integration/004_simple_archive_test/invalidate_postgres.sql")
self.run_sql_file("test/integration/004_simple_archive_test/update.sql")

self.run_dbt(["archive"])
results = self.run_dbt(["archive"])
self.assertEqual(len(results), 1)

self.assertTablesEqual("archive_expected","archive_actual")

Expand All @@ -61,13 +63,15 @@ def test__snowflake__simple_archive(self):
self.use_default_project()
self.run_sql_file("test/integration/004_simple_archive_test/seed.sql")

self.run_dbt(["archive"])
results = self.run_dbt(["archive"])
self.assertEqual(len(results), 1)

self.assertTablesEqual("ARCHIVE_EXPECTED", "archive_actual")

self.run_sql_file("test/integration/004_simple_archive_test/invalidate_snowflake.sql")
self.run_sql_file("test/integration/004_simple_archive_test/update.sql")

self.run_dbt(["archive"])
results = self.run_dbt(["archive"])
self.assertEqual(len(results), 1)

self.assertTablesEqual("ARCHIVE_EXPECTED", "archive_actual")
20 changes: 13 additions & 7 deletions test/integration/005_simple_seed_test/test_seed_type_override.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,11 @@ def seed_types(self):
}

@attr(type='postgres')
def test_simple_seed_with_column_override_snowflake(self):
self.run_dbt(["seed"])
self.run_dbt(["test"])
def test_simple_seed_with_column_override_postgres(self):
results = self.run_dbt(["seed"])
self.assertEqual(len(results), 1)
results = self.run_dbt(["test"])
self.assertEqual(len(results), 2)


class TestSimpleSeedColumnOverrideSnowflake(TestSimpleSeedColumnOverride):
Expand All @@ -63,8 +65,10 @@ def profile_config(self):

@attr(type='snowflake')
def test_simple_seed_with_column_override_snowflake(self):
self.run_dbt(["seed"])
self.run_dbt(["test"])
results = self.run_dbt(["seed"])
self.assertEqual(len(results), 1)
results = self.run_dbt(["test"])
self.assertEqual(len(results), 2)

class TestSimpleSeedColumnOverrideBQ(TestSimpleSeedColumnOverride):
@property
Expand All @@ -83,5 +87,7 @@ def profile_config(self):

@attr(type='bigquery')
def test_simple_seed_with_column_override_bq(self):
self.run_dbt(["seed"])
self.run_dbt(["test"])
results = self.run_dbt(["seed"])
self.assertEqual(len(results), 1)
results = self.run_dbt(["test"])
self.assertEqual(len(results), 2)
27 changes: 18 additions & 9 deletions test/integration/005_simple_seed_test/test_simple_seed.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,25 @@ def project_config(self):

@attr(type='postgres')
def test_simple_seed(self):
self.run_dbt(["seed"])
results = self.run_dbt(["seed"])
self.assertEqual(len(results), 1)
self.assertTablesEqual("seed_actual","seed_expected")

# this should truncate the seed_actual table, then re-insert
self.run_dbt(["seed"])
results = self.run_dbt(["seed"])
self.assertEqual(len(results), 1)
self.assertTablesEqual("seed_actual","seed_expected")


@attr(type='postgres')
def test_simple_seed_with_drop(self):
self.run_dbt(["seed"])
results = self.run_dbt(["seed"])
self.assertEqual(len(results), 1)
self.assertTablesEqual("seed_actual","seed_expected")

# this should drop the seed table, then re-create
self.run_dbt(["seed", "--drop-existing"])
results = self.run_dbt(["seed", "--drop-existing"])
self.assertEqual(len(results), 1)
self.assertTablesEqual("seed_actual","seed_expected")


Expand Down Expand Up @@ -69,23 +73,27 @@ def project_config(self):
def test_simple_seed_with_schema(self):
schema_name = "{}_{}".format(self.unique_schema(), 'custom_schema')

self.run_dbt(["seed"])
results = self.run_dbt(["seed"])
self.assertEqual(len(results), 1)
self.assertTablesEqual("seed_actual","seed_expected", table_a_schema=schema_name)

# this should truncate the seed_actual table, then re-insert
self.run_dbt(["seed"])
results = self.run_dbt(["seed"])
self.assertEqual(len(results), 1)
self.assertTablesEqual("seed_actual","seed_expected", table_a_schema=schema_name)


@attr(type='postgres')
def test_simple_seed_with_drop_and_schema(self):
schema_name = "{}_{}".format(self.unique_schema(), 'custom_schema')

self.run_dbt(["seed"])
results = self.run_dbt(["seed"])
self.assertEqual(len(results), 1)
self.assertTablesEqual("seed_actual","seed_expected", table_a_schema=schema_name)

# this should drop the seed table, then re-create
self.run_dbt(["seed", "--full-refresh"])
results = self.run_dbt(["seed", "--full-refresh"])
self.assertEqual(len(results), 1)
self.assertTablesEqual("seed_actual","seed_expected", table_a_schema=schema_name)


Expand Down Expand Up @@ -117,6 +125,7 @@ def project_config(self):

@attr(type='postgres')
def test_simple_seed_with_disabled(self):
self.run_dbt(["seed"])
results = self.run_dbt(["seed"])
self.assertEqual(len(results), 1)
self.assertTableDoesExist('seed_enabled')
self.assertTableDoesNotExist('seed_disabled')
Loading

0 comments on commit 568c82e

Please sign in to comment.