activerecord_views 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 373526856a79d7a2d2c97de39373d0a9a791e70c
-  data.tar.gz: 942cecdc3e31f8417166778362f19567ce16774f
+  metadata.gz: d730fc5ba86879e6e1a74f23f1e3320809d37e8d
+  data.tar.gz: dc5a5b0e4453124be60b9ed57178fd81f763617d
 SHA512:
-  metadata.gz: 18d20a0204d37764802b32ef58fd532f8c39cd6ad82b786eb55c4b2d3bd298fa67a84afac9bedb3cb6ca58fd45e280bac0d3852f11d3f92f53625a5f4f4fe653
-  data.tar.gz: 68d3db12c7ea7c8cdaafb1391efab4a9f5a59ad579069ca8246ed47abf1c028b48ffa41b16a2eadfbfacfbe7194e10a9cc9222f5c01def2576c39830e708e69f
+  metadata.gz: 5281382c91bde1d07a1784d781d6c618c14e059201c3d252e1d1490bd47bd2fc52890134b715430f5a29f8ae6bbbb5ac9916d9d2d6e7f3ffc7f452cf94442a53
+  data.tar.gz: 1286c8ea11028e69b5c4e850600d1b8899672e80ee5618648e98c37fc7ec9864ddc2476e3d2dd926f0a77dfc7f65f37c2c59a486fca008e0b09c2a4fb507a7bb

data/lib/active_record_views/checksum_cache.rb

@@ -45,7 +45,7 @@ module ActiveRecordViews
         end
         options_json = JSON.dump(options)
 
-        rows_updated = @connection.update(<<-SQL)
+        rows_updated = @connection.update(<<-SQL.squish)
           UPDATE active_record_views
           SET
             class_name = #{@connection.quote data[:class_name]},
@@ -57,7 +57,7 @@ module ActiveRecordViews
         SQL
 
         if rows_updated == 0
-          @connection.insert <<-SQL
+          @connection.insert <<-SQL.squish
             INSERT INTO active_record_views (
               name,
               class_name,

data/lib/active_record_views/extension.rb

@@ -52,7 +52,7 @@ module ActiveRecordViews
       end
 
       def view_populated?
-        value = connection.select_value(<<-SQL)
+        value = connection.select_value(<<-SQL.squish)
           SELECT ispopulated
           FROM pg_matviews
           WHERE schemaname = 'public' AND matviewname = #{connection.quote self.table_name};

data/lib/active_record_views/railtie.rb

@@ -14,5 +14,9 @@ module ActiveRecordViews
         end
       end
     end
+
+    rake_tasks do
+      load 'tasks/active_record_views.rake'
+    end
   end
 end

data/lib/active_record_views/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordViews
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

data/lib/active_record_views.rb

@@ -96,7 +96,7 @@ module ActiveRecordViews
 
   def self.execute_create_view(connection, name, sql, options)
     options.assert_valid_keys :materialized, :unique_columns
-    sql = sql.sub(/;\s*/, '')
+    sql = sql.sub(/;\s*\z/, '')
 
     if options[:materialized]
       connection.execute "CREATE MATERIALIZED VIEW #{connection.quote_table_name name} AS #{sql} WITH NO DATA;"
@@ -105,7 +105,7 @@ module ActiveRecordViews
     end
 
     if options[:unique_columns]
-      connection.execute <<-SQL
+      connection.execute <<-SQL.squish
         CREATE UNIQUE INDEX #{connection.quote_table_name "#{name}_pkey"}
         ON #{connection.quote_table_name name}(
           #{options[:unique_columns].map { |column_name| connection.quote_table_name(column_name) }.join(', ')}
@@ -123,7 +123,7 @@ module ActiveRecordViews
   end
 
   def self.view_exists?(connection, name)
-    connection.select_value(<<-SQL).present?
+    connection.select_value(<<-SQL.squish).present?
       SELECT 1
       FROM information_schema.views
       WHERE table_schema = 'public' AND table_name = #{connection.quote name}
@@ -135,7 +135,7 @@ module ActiveRecordViews
   end
 
   def self.materialized_view?(connection, name)
-    connection.select_value(<<-SQL).present?
+    connection.select_value(<<-SQL.squish).present?
       SELECT 1
       FROM pg_matviews
       WHERE schemaname = 'public' AND matviewname = #{connection.quote name};
@@ -147,7 +147,7 @@ module ActiveRecordViews
   end
 
   def self.get_view_dependencies(connection, name)
-    connection.select_rows <<-SQL
+    connection.select_rows <<-SQL.squish
       WITH RECURSIVE dependants AS (
         SELECT
           #{connection.quote name}::regclass::oid,
@@ -197,13 +197,22 @@ module ActiveRecordViews
     yield
 
     dependencies.each do |dependency_name, class_name, definition, options_json|
+      create_view_exception = begin
+        connection.transaction :requires_new => true do
+          options = JSON.load(options_json).symbolize_keys
+          execute_create_view connection, dependency_name, definition, options
+          cache.set dependency_name, dependency_metadata[dependency_name]
+        end
+        nil
+      rescue StandardError => e
+        e
+      end
+
       begin
         class_name.constantize
       rescue NameError => e
         raise unless e.missing_name?(class_name)
-        options = JSON.load(options_json).symbolize_keys
-        execute_create_view connection, dependency_name, definition, options
-        cache.set dependency_name, dependency_metadata[dependency_name]
+        raise create_view_exception unless create_view_exception.nil?
       end
     end
   end

data/lib/tasks/active_record_views.rake

@@ -0,0 +1,9 @@
+Rake::Task['db:structure:dump'].enhance do
+  if ActiveRecord::Base.connection.table_exists?('active_record_views')
+    filename = ENV['DB_STRUCTURE'] || File.join(Rails.root, "db", "structure.sql")
+    config = current_config
+    set_psql_env(config)
+    system("pg_dump --data-only --table=active_record_views #{Shellwords.escape config['database']} >> #{Shellwords.escape filename}")
+    raise 'active_record_views metadata dump failed' unless $?.success?
+  end
+end

data/spec/active_record_views_extension_spec.rb

@@ -99,12 +99,20 @@ describe ActiveRecordViews::Extension do
 
     it 'successfully restores dependant view when temporarily dropping dependency' do
       ActiveRecordViews.create_view ActiveRecord::Base.connection, 'dependency_as', 'DependencyA', 'SELECT 42 AS foo, 1 AS id;'
-      ActiveRecordViews.create_view ActiveRecord::Base.connection, 'dependency_bs', 'DependencyB', 'SELECT * FROM dependency_as;'
+      ActiveRecordViews.create_view ActiveRecord::Base.connection, 'dependency_bs', 'DependencyB', 'SELECT id FROM dependency_as;'
 
       expect(DependencyA.first.id).to eq 2
       expect(DependencyB.first.id).to eq 2
     end
 
+    it 'sucessfully restore dependant view and dependency when loading from middle outwards' do
+      ActiveRecordViews.create_view ActiveRecord::Base.connection, 'dependency_as', 'DependencyA', 'SELECT 42 AS foo, 1 AS id;'
+      ActiveRecordViews.create_view ActiveRecord::Base.connection, 'dependency_bs', 'DependencyB', 'SELECT id FROM dependency_as;'
+      ActiveRecordViews.create_view ActiveRecord::Base.connection, 'dependency_cs', 'DependencyC', 'SELECT id FROM dependency_bs;'
+
+      expect(DependencyB.first.id).to eq 2
+    end
+
     it 'errors if more than one argument is specified' do
       expect {
         class TooManyArguments < ActiveRecord::Base

data/spec/active_record_views_spec.rb

@@ -13,7 +13,7 @@ describe ActiveRecordViews do
     end
 
     def test_view_sql
-      connection.select_value(<<-SQL).try(&:squish)
+      connection.select_value(<<-SQL.squish).try(&:squish)
         SELECT view_definition
         FROM information_schema.views
         WHERE table_schema = 'public' AND table_name = 'test'
@@ -21,7 +21,7 @@ describe ActiveRecordViews do
     end
 
     def view_names
-      connection.select_values <<-SQL
+      connection.select_values(<<-SQL.squish)
         SELECT table_name
         FROM information_schema.views
         WHERE table_schema = 'public'
@@ -29,7 +29,7 @@ describe ActiveRecordViews do
     end
 
     def test_materialized_view_sql
-      connection.select_value(<<-SQL).try(&:squish)
+      connection.select_value(<<-SQL.squish).try(&:squish)
         SELECT definition
         FROM pg_matviews
         WHERE schemaname = 'public' AND matviewname = 'test'
@@ -37,7 +37,7 @@ describe ActiveRecordViews do
     end
 
     def materialized_view_names
-      connection.select_values <<-SQL
+      connection.select_values(<<-SQL.squish)
         SELECT matviewname
         FROM pg_matviews
         WHERE schemaname = 'public'

data/spec/internal/app/models/dependency_b.rb

@@ -1,3 +1,3 @@
 class DependencyB < ActiveRecord::Base
-  is_view 'SELECT * FROM dependency_as;'
+  is_view "SELECT id FROM #{DependencyA.table_name};"
 end

data/spec/internal/app/models/dependency_c.rb

@@ -0,0 +1,3 @@
+class DependencyC < ActiveRecord::Base
+  is_view "SELECT id FROM #{DependencyB.table_name};"
+end

data/spec/spec_helper.rb

@@ -16,11 +16,14 @@ RSpec.configure do |config|
   config.use_transactional_fixtures = false
 
   config.before do
+    ActionDispatch::Reloader.cleanup!
+    ActionDispatch::Reloader.prepare!
+
     connection = ActiveRecord::Base.connection
 
     connection.execute 'DROP TABLE IF EXISTS active_record_views'
 
-    view_names = connection.select_values <<-SQL
+    view_names = connection.select_values(<<-SQL.squish)
       SELECT table_name
       FROM information_schema.views
       WHERE table_schema = 'public';
@@ -29,7 +32,7 @@ RSpec.configure do |config|
       connection.execute "DROP VIEW IF EXISTS #{connection.quote_table_name view_name} CASCADE"
     end
 
-    materialized_view_names = connection.select_values <<-SQL
+    materialized_view_names = connection.select_values(<<-SQL.squish)
       SELECT matviewname
       FROM pg_matviews
       WHERE schemaname = 'public'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_views
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Jason Weathered
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-18 00:00:00.000000000 Z
+date: 2015-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -112,11 +112,13 @@ files:
 - lib/active_record_views/registered_view.rb
 - lib/active_record_views/version.rb
 - lib/activerecord_views.rb
+- lib/tasks/active_record_views.rake
 - spec/active_record_views_checksum_cache_spec.rb
 - spec/active_record_views_extension_spec.rb
 - spec/active_record_views_spec.rb
 - spec/internal/app/models/dependency_a.rb
 - spec/internal/app/models/dependency_b.rb
+- spec/internal/app/models/dependency_c.rb
 - spec/internal/app/models/erb_test_model.rb
 - spec/internal/app/models/erb_test_model.sql.erb
 - spec/internal/app/models/external_file_test_model.rb
@@ -160,6 +162,7 @@ test_files:
 - spec/active_record_views_spec.rb
 - spec/internal/app/models/dependency_a.rb
 - spec/internal/app/models/dependency_b.rb
+- spec/internal/app/models/dependency_c.rb
 - spec/internal/app/models/erb_test_model.rb
 - spec/internal/app/models/erb_test_model.sql.erb
 - spec/internal/app/models/external_file_test_model.rb