Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
jwerderits authored and Jacob Beck committed Jul 24, 2018
1 parent bf67477 commit 526a449
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 17 deletions.
9 changes: 0 additions & 9 deletions dbt/adapters/default/impl.py
Original file line number Diff line number Diff line change
Expand Up @@ -660,15 +660,6 @@ def clear_transaction(cls, profile, conn_name='master'):
cls.commit(profile, conn)
return conn_name

@classmethod
def clear_all_transactions(cls, profile):
for conn_name, transaction in connections_in_use.items():
if transaction.get('transaction_open'):
print('found open transaction {}, rolling it back'.format(conn_name))
cls.rollback(transaction)
print('clearing transaction')
cls.clear_transaction(profile, conn_name)

@classmethod
def execute_one(cls, profile, sql, model_name=None, auto_begin=False):
cls.get_connection(profile, model_name)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -483,6 +483,7 @@ def test__bigquery__nested_models(self):
},
}
self.verify_manifest(expected_manifest)

@use_profile('redshift')
def test__redshift__run_and_generate(self):
self.run_and_generate()
Expand Down Expand Up @@ -540,7 +541,7 @@ def test__redshift__run_and_generate(self):
},
}
self.verify_catalog(expected_catalog)
self.verify_manifest(self.expected_manifest())
self.verify_manifest(self.expected_seeded_manifest())

@use_profile('redshift')
def test__redshift__incremental_view(self):
Expand Down
7 changes: 0 additions & 7 deletions test/integration/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -289,13 +289,6 @@ def use_profile(self, adapter_type):
self.run_sql('DROP SCHEMA IF EXISTS {} CASCADE'.format(schema))
self.run_sql('CREATE SCHEMA {}'.format(schema))

def _reconnect(self):
"""Disconnect and then reconnect. setUp() must be complete!"""
self.handle.close()
self.adapter.cleanup_connections()
connection = self.adapter.acquire_connection(self._profile, '__test')
self.handle = connection.get('handle')

def tearDown(self):
os.remove(DBT_PROFILES)
os.remove("dbt_project.yml")
Expand Down

0 comments on commit 526a449

Please sign in to comment.