posgra 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 518a434dc5bec68e17e348b1786b914ae4ff0e35
-  data.tar.gz: 27dfbd44d5c896b6684f0442fd35889e1b2a3dc0
+  metadata.gz: 45874f5aa54ff585d53004c99222773b4964f885
+  data.tar.gz: 654038906c2981a3f03b6a250221381a1ba6949d
 SHA512:
-  metadata.gz: 7cf81139a91b2069a1ebd77f11443ecbfb5d4c4ce8d132dc04820986d9da0cd3a633bfca0ed66755bed67a40f1c62d6e0b00f4e1b985a706b44e5b861f8bfdf1
-  data.tar.gz: c0fbd3b0684e78b7e4b67adeb5c0a0394681c320f9ccdff8330e50a6f4e83eca53a298da926e6ecfb160db3e3418b3ada4012156d7fa37d7e5d4b9a0a9e85c91
+  metadata.gz: 0356ed811f29833fbf7dc36daf5e0496f78473b557ed8c519a4495396291d77d9f7c8f45775cd72dfa1a2ea63b6ec702fdb725575e79c3f568badc2fdb1d6672
+  data.tar.gz: 1ed24ddf548cf6a852089ee8571ea03890154710453f114e257ba8a7fff4cc3509d57cf4615381398754a09ec0fe5f42b06a3645c5612036127a675b3d46d866

data/lib/posgra/driver.rb

@@ -42,7 +42,7 @@ class Posgra::Driver
     log(:info, sql, :color => :cyan)
 
     unless @options[:dry_run]
-      @client.query(sql)
+      exec(sql)
       updated = true
     end
 
@@ -56,7 +56,7 @@ class Posgra::Driver
     log(:info, sql, :color => :red)
 
     unless @options[:dry_run]
-      @client.query(sql)
+      exec(sql)
       updated = true
     end
 
@@ -70,7 +70,7 @@ class Posgra::Driver
     log(:info, sql, :color => :cyan)
 
     unless @options[:dry_run]
-      @client.query(sql)
+      exec(sql)
       updated = true
     end
 
@@ -84,7 +84,7 @@ class Posgra::Driver
     log(:info, sql, :color => :green)
 
     unless @options[:dry_run]
-      @client.query(sql)
+      exec(sql)
       updated = true
     end
 
@@ -98,7 +98,7 @@ class Posgra::Driver
     log(:info, sql, :color => :cyan)
 
     unless @options[:dry_run]
-      @client.query(sql)
+      exec(sql)
       updated = true
     end
 
@@ -112,7 +112,7 @@ class Posgra::Driver
     log(:info, sql, :color => :red)
 
     unless @options[:dry_run]
-      @client.query(sql)
+      exec(sql)
       updated = true
     end
 
@@ -122,12 +122,8 @@ class Posgra::Driver
   def revoke_all_on_schema(role, schema)
     updated = false
 
-    sql = "REVOKE ALL ON ALL TABLES IN SCHEMA #{@client.escape_identifier(schema)} FROM #{@client.escape_identifier(role)}"
-    log(:info, sql, :color => :green)
-
-    unless @options[:dry_run]
-      @client.query(sql)
-      updated = true
+    describe_objects(schema).each do |object|
+      updated = revoke_all_on_object(role, schema, object) || updated
     end
 
     updated
@@ -140,7 +136,7 @@ class Posgra::Driver
     log(:info, sql, :color => :green)
 
     unless @options[:dry_run]
-      @client.query(sql)
+      exec(sql)
       updated = true
     end
 
@@ -159,7 +155,7 @@ class Posgra::Driver
     log(:info, sql, :color => :green)
 
     unless @options[:dry_run]
-      @client.query(sql)
+      exec(sql)
       updated = true
     end
 
@@ -185,7 +181,7 @@ class Posgra::Driver
     log(:info, sql, :color => :green)
 
     unless @options[:dry_run]
-      @client.query(sql)
+      exec(sql)
       updated = true
     end
 
@@ -199,7 +195,7 @@ class Posgra::Driver
     log(:info, sql, :color => :green)
 
     unless @options[:dry_run]
-      @client.query(sql)
+      exec(sql)
       updated = true
     end
 
@@ -213,7 +209,7 @@ class Posgra::Driver
     log(:info, sql, :color => :green)
 
     unless @options[:dry_run]
-      @client.query(sql)
+      exec(sql)
       updated = true
     end
 
@@ -221,7 +217,7 @@ class Posgra::Driver
   end
 
   def describe_objects(schema)
-    rs = @client.exec <<-SQL
+    rs = exec <<-SQL
       SELECT
         pg_class.relname,
         pg_namespace.nspname
@@ -245,7 +241,7 @@ class Posgra::Driver
   end
 
   def describe_users
-    rs = @client.exec('SELECT * FROM pg_user')
+    rs = exec('SELECT * FROM pg_user')
 
     options_by_user = {}
 
@@ -259,7 +255,7 @@ class Posgra::Driver
   end
 
   def describe_groups
-    rs = @client.exec <<-SQL
+    rs = exec <<-SQL
       SELECT
         pg_group.groname,
         pg_user.usename
@@ -282,7 +278,7 @@ class Posgra::Driver
   end
 
   def describe_grants
-    rs = @client.exec <<-SQL
+    rs = exec <<-SQL
       SELECT
         pg_class.relname,
         pg_namespace.nspname,
@@ -329,8 +325,11 @@ class Posgra::Driver
     aclitems = aclitems[1..-2].split(',')
 
     aclitems.map do |aclitem|
+      aclitem = unquote_aclitem(aclitem)
       grantee, privileges_grantor = aclitem.split('=', 2)
       privileges, grantor = privileges_grantor.split('/', 2)
+      grantee = unescape_aclname(grantee)
+      grantor = unescape_aclname(grantor)
 
       {
         'grantee' => grantee,
@@ -358,4 +357,17 @@ class Posgra::Driver
 
     options_by_privilege
   end
+
+  def exec(sql)
+    log(:debug, sql)
+    @client.exec(sql)
+  end
+
+  def unquote_aclitem(str)
+    str.sub(/\A"/, '').sub(/"\z/, '').gsub('\\', '')
+  end
+
+  def unescape_aclname(str)
+    str.sub(/\A"/, '').sub(/"\z/, '').gsub('""', '"')
+  end
 end

data/lib/posgra/version.rb

@@ -1,3 +1,3 @@
 module Posgra
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: posgra
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-04 00:00:00.000000000 Z
+date: 2016-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg