ar-monocle 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4605eab43d5ef90c70e7c242c8e76a740cd77a0
-  data.tar.gz: 42cf6093efbda0ee8833413c481f512f99739dbf
+  metadata.gz: 10fbc61e93890eef2c1b59798b325d5dd3e28ad0
+  data.tar.gz: 702017a18200d523e8828274983186f973fb31f1
 SHA512:
-  metadata.gz: 9c5d66e5a7be45c7765d9b49389428da9f67cb6bfcd9b1d37986a22662321ff911715cff84fbfc937d549efba321c3dea457f3afb3a24280ed89de65d5cc8ed3
-  data.tar.gz: 1ad0d0d5d0c79bedbe5d8a477a0ef7dac5f9b34290cc4aba44e4418e1588ecc5c6305843bde1271c1eb147d41d6f3706e115d58d4fb892491008409b49c9a5f9
+  metadata.gz: 653872e33fe7b8867b62eab9ad70344713e444ec6725ebbede4aec3ac0405a45750c64e38f677d172c5267c0a343f3103ece4df74be9650e57f6272dec415110
+  data.tar.gz: d1547660d5da98962fe7f9d4196290936a40859d5ee2e8cd7d9bd6147e3a40295d7b4aca6a8fd2c984930c2d459d0d57cc4fa1df72b6f9d98b480d2674a3beab

data/lib/monocle/version.rb

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

data/lib/monocle/view.rb

@@ -18,20 +18,9 @@ module Monocle
 
     def drop
       debug "Dropping #{name}..."
+      get_dependants_from_pg.each(&:drop) # drop any existing dependants
       execute drop_command
       true
-    rescue ActiveRecord::StatementInvalid => e
-      # We have dependants, can't drop this directly.
-      if e.message =~ /PG::DependentObjectsStillExist/
-        # Find the views in the main list, drop them
-        self.dependants = get_dependants_from_error e
-        debug "Can't drop #{name}, it has dependants: #{dependants.map(&:name).join(', ')}"
-        dependants.each &:drop
-        # And try this again
-        retry
-      else
-        fail e
-      end
     end
 
     def create
@@ -103,11 +92,50 @@ module Monocle
       @path_for_sql ||= File.join views_path, "#{name}.sql"
     end
 
+    def exists?
+      execute(check_if_view_exists_sql).entries.map(&:values).flatten.first
+    end
+
     protected
 
+    def check_if_view_exists_sql
+      <<-SQL
+        SELECT count(*) > 0
+        FROM pg_catalog.pg_class c
+        JOIN pg_namespace n ON n.oid = c.relnamespace
+        WHERE c.relkind in ('m','v')
+        AND n.nspname = 'public'
+        AND c.relname = '#{name}';
+      SQL
+    end
+
+    def get_dependants_from_pg
+      map_dependants(execute(find_dependants_sql).entries.map(&:values).flatten - [name])
+    end
+
+    def map_dependants(deps)
+      deps.map { |d| list[d.to_sym] }.compact
+    end
+
+    def find_dependants_sql
+      <<-SQL
+      WITH RECURSIVE vlist AS (
+          SELECT c.oid::REGCLASS AS view_name
+            FROM pg_class c
+           WHERE c.relname = '#{name}'
+           UNION ALL
+          SELECT DISTINCT r.ev_class::REGCLASS AS view_name
+            FROM pg_depend d
+            JOIN pg_rewrite r ON (r.oid = d.objid)
+            JOIN vlist ON (vlist.view_name = d.refobjid)
+           WHERE d.refobjsubid != 0
+      )
+      SELECT * FROM vlist;
+      SQL
+    end
+
     def get_dependants_from_error(e)
-      e.message.scan(/(\w+) depends on.+view #{name}/).
-      flatten.map { |s| list.fetch s.to_sym }
+      map_dependants e.message.scan(/(\w+) depends on.+view #{name}/).flatten
     end
 
     def execute(sql)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar-monocle
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Leonardo Bighetti
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-10 00:00:00.000000000 Z
+date: 2017-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler