give root grant, split up test

dbt-labs · Jan 16, 2019 · 1596174 · 1596174
1 parent f4084f0
commit 1596174
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/core/dbt/adapters/base/connections.py b/core/dbt/adapters/base/connections.py
@@ -321,6 +321,9 @@ def close(cls, connection):
         # On windows, sometimes connection handles don't have a close() attr.
         if hasattr(connection.handle, 'close'):
             connection.handle.close()
+        else:
+            logger.debug('On {}: No close available on handle'
+                         .format(connection.name))
 
         connection.state = 'closed'
 

diff --git a/test/integration/010_permission_tests/test_permissions.py b/test/integration/010_permission_tests/test_permissions.py
@@ -5,14 +5,8 @@ class TestPermissions(DBTIntegrationTest):
 
     def setUp(self):
         DBTIntegrationTest.setUp(self)
-
         self.run_sql_file("test/integration/010_permission_tests/seed.sql")
 
-    def tearDown(self):
-        self.run_sql_file("test/integration/010_permission_tests/tearDown.sql")
-
-        DBTIntegrationTest.tearDown(self)
-
     @property
     def schema(self):
         return "permission_tests_010"
@@ -22,9 +16,8 @@ def models(self):
         return "test/integration/010_permission_tests/models"
 
     @attr(type='postgres')
-    def test_create_schema_permissions(self):
+    def test_no_create_schema_permissions(self):
         # the noaccess user does not have permissions to create a schema -- this should fail
-
         failed = False
         self.run_sql('drop schema if exists "{}" cascade'.format(self.unique_schema()))
         try:
@@ -34,10 +27,10 @@ def test_create_schema_permissions(self):
 
         self.assertTrue(failed)
 
-        self.run_sql_file("test/integration/010_permission_tests/seed.sql")
-
+    @attr(type='postgres')
+    def test_create_schema_permissions(self):
         # now it should work!
-        self.run_sql('grant create on database dbt to noaccess'.format(self.unique_schema()))
+        self.run_sql('grant create on database {} to noaccess'.format(self.default_database))
         self.run_sql('grant usage, create on schema "{}" to noaccess'.format(self.unique_schema()))
         self.run_sql('grant select on all tables in schema "{}" to noaccess'.format(self.unique_schema()))
 

diff --git a/test/integration/base.py b/test/integration/base.py
@@ -478,6 +478,7 @@ def run_sql(self, query, fetch='None', kwargs=None, connection_name=None):
 
         conn = self.adapter.acquire_connection(connection_name)
         with conn.handle.cursor() as cursor:
+            logger.debug('test connection "{}" executing: {}'.format(connection_name, sql))
             try:
                 cursor.execute(sql)
                 conn.handle.commit()

diff --git a/test/setup_db.sh b/test/setup_db.sh
@@ -34,7 +34,7 @@ fi
 createdb dbt
 psql -c "CREATE ROLE root WITH PASSWORD 'password';"
 psql -c "ALTER ROLE root WITH LOGIN;"
-psql -c "GRANT CREATE, CONNECT ON DATABASE dbt TO root;"
+psql -c "GRANT CREATE, CONNECT ON DATABASE dbt TO root WITH GRANT OPTION;"
 
 psql -c "CREATE ROLE noaccess WITH PASSWORD 'password' NOSUPERUSER;"
 psql -c "ALTER ROLE noaccess WITH LOGIN;"