Merge 5dfa7fc into 2139bf8

pgbedrock/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '0.3.1'
+__version__ = '0.3.2'
 LOG_FORMAT = '%(levelname)s:%(filename)s:%(funcName)s:%(lineno)s - %(message)s'

pgbedrock/privileges.py

@@ -20,12 +20,12 @@
 Q_REVOKE_NONDEFAULT = 'REVOKE {} ON {} {} FROM "{}";'
 Q_GRANT_DEFAULT = """
     SET ROLE "{}";
-    ALTER DEFAULT PRIVILEGES IN SCHEMA {} GRANT {} ON {} TO "{}";
+    ALTER DEFAULT PRIVILEGES IN SCHEMA "{}" GRANT {} ON {} TO "{}";
     RESET ROLE;
     """
 Q_REVOKE_DEFAULT = """
     SET ROLE "{}";
-    ALTER DEFAULT PRIVILEGES IN SCHEMA {} REVOKE {} ON {} FROM "{}";
+    ALTER DEFAULT PRIVILEGES IN SCHEMA "{}" REVOKE {} ON {} FROM "{}";
     RESET ROLE;
     """
 

setup.py

@@ -20,7 +20,7 @@ def get_version():
 
 required = [
     'click==6.7',
-    'psycopg2==2.7.3',
+    'psycopg2==2.7.5',
     'PyYAML==3.12',
     'Jinja2==2.9.6',
     'cerberus==1.1',

tests/test_core_configure.py

@@ -182,7 +182,7 @@ def test_configure_schema_role_has_dash(tmpdir, capsys, db_config, cursor, base_
     spec = copy.copy(base_spec)
     spec += dedent("""
         {}:
-            has_personal_schema: yes
+            has_personal_schema: true
         """.format(role))
 
     spec_path = tmpdir.join('spec.yml')
@@ -198,7 +198,45 @@ def test_configure_schema_role_has_dash(tmpdir, capsys, db_config, cursor, base_
              privileges=True,
              live=False,
              verbose=False
-             )
+        )
+    )
+    core_configure.configure(**params)
+    out, err = capsys.readouterr()
+    assert own.Q_CREATE_SCHEMA.format(role, role) in out
+
+
+def test_configure_schema_role_has_dash_and_default_privs(
+    tmpdir,
+    capsys,
+    db_config,
+    cursor,
+    base_spec
+):
+    spec = copy.deepcopy(base_spec)
+    spec += dedent("""
+    dash-user:
+        has_personal_schema: true
+    otheruser:
+        privileges:
+            schemas:
+                read:
+                    - dash-user
+    """)
+
+    spec_path = tmpdir.join('spec.yml')
+    spec_path.write(spec)
+
+    params = copy.deepcopy(db_config)
+    params.update(
+        dict(spec_path=spec_path.strpath,
+             prompt=False,
+             attributes=True,
+             memberships=True,
+             ownerships=True,
+             privileges=True,
+             live=False,
+             verbose=False
+        )
     )
     core_configure.configure(**params)
     out, err = capsys.readouterr()