spectacles 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93b01de9ec07bd98a69b60b3c1b15ae85a8e3b12
-  data.tar.gz: d25a236871d3d35208e157419b69f25f935a1437
+  metadata.gz: e28478c01f62ccd9e9d3fc441caa9cd3883192b1
+  data.tar.gz: 329001b8c26885deb34289446cb53d955428ddcc
 SHA512:
-  metadata.gz: 315b5606b2b1fb645b81846c4e3a49e8a018b9cfef29593094272636e7a31667e6a45121bc970952acbbd3c1f28197a05ab49dfebc166c3492cff2502b5a8401
-  data.tar.gz: aef7db4bcfdd525337c5744f1d45962eff3edd691cd281157ddc87e432f03adffcc420a61a585732b776aa79f5053a13fb2b007a8b681bf56f872882803ec1e4
+  metadata.gz: ba3efd56888624a60ad098238ef8c3cedcf78bec42f1405e97ffd2a02ae014a4a84888face0cb7c3ef1a547c8cd995ae5bc16dec31e1b0ea159113b327b43a6d
+  data.tar.gz: daec41fa930df8b7686b66d6125aca194d6e4c0139b65d3dd2f6761438e5933b2a64f1448cab8775e45fb17fa6cbf33453cf3df12d0a83e83a09da4ddb8b1595

data/lib/spectacles.rb

@@ -6,6 +6,7 @@ require 'spectacles/view'
 require 'spectacles/materialized_view'
 require 'spectacles/version'
 require 'spectacles/configuration'
+require 'spectacles/abstract_adapter_override'
 
 require 'spectacles/railtie' if defined?(Rails)
 
@@ -23,21 +24,12 @@ module Spectacles
   end
 end
 
-ActiveRecord::ConnectionAdapters::AbstractAdapter.class_eval do
-  alias_method(:_spectacles_original_inherited, :inherited) if method_defined?(:inherited)
-
-  def self.inherited(klass)
-    ::Spectacles::load_adapters
-    _spectacles_orig_inherited if method_defined?(:_spectacles_original_inherited)
-  end
-end
-
 ActiveRecord::SchemaDumper.class_eval do
   alias_method(:_spectacles_orig_trailer, :trailer)
 
   def trailer(stream)
     ::Spectacles::SchemaDumper.dump_views(stream, @connection)
-    ::Spectacles::SchemaDumper.dump_materialized_views(stream, @connection)
+    ::Spectacles::SchemaDumper.dump_materialized_views(self, stream, @connection)
     _spectacles_orig_trailer(stream)
   end
 end

data/lib/spectacles/abstract_adapter_override.rb

@@ -0,0 +1,10 @@
+ActiveRecord::ConnectionAdapters::AbstractAdapter.class_eval do
+  class << self
+    alias_method(:_spectacles_orig_inherited, :inherited) if method_defined?(:inherited)
+
+    def inherited(_subclass)
+      ::Spectacles::load_adapters
+      _spectacles_orig_inherited(_subclass) if methods.include?(:_spectacles_orig_inherited)
+    end
+  end
+end

data/lib/spectacles/schema_dumper.rb

@@ -8,11 +8,12 @@ module Spectacles
       end
     end
 
-    def self.dump_materialized_views(stream, connection)
+    def self.dump_materialized_views(dumper, stream, connection)
       unless (Spectacles.config.enable_schema_dump == false)
         if connection.supports_materialized_views?
           connection.materialized_views.sort.each do |view|
             dump_materialized_view(stream, connection, view)
+            dumper.send(:indexes, view, stream)
           end
         end
       end

data/lib/spectacles/schema_statements/postgresql_adapter.rb

@@ -7,10 +7,12 @@ module Spectacles
 
       def views(name = nil) #:nodoc:
         q = <<-SQL
-        SELECT table_name, table_type
-          FROM information_schema.tables
-         WHERE table_schema = ANY(current_schemas(false))
-           AND table_type = 'VIEW'
+              SELECT t.table_name, t.table_type
+                FROM information_schema.tables AS t
+          INNER JOIN pg_class AS c ON c.relname = t.table_name
+               WHERE t.table_schema = ANY(current_schemas(false))
+                 AND t.table_type = 'VIEW'
+                 AND pg_catalog.pg_get_userbyid(c.relowner) = #{quote(database_username)}
         SQL
 
         execute(q, name).map { |row| row['table_name'] }
@@ -145,6 +147,10 @@ module Spectacles
           hash
         end
       end
+
+      def database_username
+        @config[:username]
+      end
     end
   end
 end

data/lib/spectacles/version.rb

@@ -1,3 +1,3 @@
 module Spectacles
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/specs/spectacles/abstract_adapter_override_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe "loading an adapter" do
+  it "calls the original AR::CA::AbstractAdapter.inherited method" do
+    ActiveRecord::ConnectionAdapters::AbstractAdapter.class_eval do
+      def self.inherited(subclass)
+        @_spectacles_inherited_called = true
+      end
+    end
+    load File.join(__dir__, '../../lib/spectacles/abstract_adapter_override.rb')
+    Class.new(ActiveRecord::ConnectionAdapters::AbstractAdapter)
+    ActiveRecord::ConnectionAdapters::AbstractAdapter.instance_variable_get("@_spectacles_inherited_called").must_equal true
+  end
+end

data/specs/support/schema_statement_examples.rb

@@ -23,6 +23,8 @@ shared_examples_for "an adapter" do |adapter|
           products JOIN users ON users.id = products.user_id"
         end
 
+        ActiveRecord::Base.connection.add_index :materialized_product_users, :product_name
+
         ActiveRecord::Base.connection.create_materialized_view(:empty_materialized_product_users, storage: { fillfactor: 50 }, data: false, force: true) do 
           "SELECT name AS product_name, first_name AS username FROM
           products JOIN users ON users.id = products.user_id"
@@ -43,6 +45,12 @@ shared_examples_for "an adapter" do |adapter|
         stream.string.must_match(/create_materialized_view/)
       end
 
+      it 'should return add_index in dump stream' do
+        stream = StringIO.new
+        ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
+        stream.string.must_match(/add_index/)
+      end
+
       it "should include options for create_materialized_view" do
         stream = StringIO.new
         ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spectacles
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Adam Hutchison, Brandon Dewitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-29 00:00:00.000000000 Z
+date: 2016-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -80,6 +80,7 @@ files:
 - Rakefile
 - Readme.rdoc
 - lib/spectacles.rb
+- lib/spectacles/abstract_adapter_override.rb
 - lib/spectacles/configuration.rb
 - lib/spectacles/materialized_view.rb
 - lib/spectacles/railtie.rb
@@ -99,6 +100,7 @@ files:
 - specs/adapters/postgresql_adapter_spec.rb
 - specs/adapters/sqlite3_adapter_spec.rb
 - specs/spec_helper.rb
+- specs/spectacles/abstract_adapter_override_spec.rb
 - specs/spectacles/schema_statements/abstract_adapter_spec.rb
 - specs/spectacles/view_spec.rb
 - specs/support/minitest_matchers.rb
@@ -126,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Spectacles (derived from RailsSQLViews) adds database view functionality