schema_plus_views 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f120d0fd9e453a3e35a2ba8b71630edb81a93d96
-  data.tar.gz: 5b84b184193e12d27e883953d787d8f4b45f4743
+  metadata.gz: f2a5ea547ab99bca7ef7d039c784b580065ef142
+  data.tar.gz: b1dc65dab6140a1c68de87da4c2d6eb54620879b
 SHA512:
-  metadata.gz: db00fa4def6a06f90503c86bbbca407e9e61f911c9f7e3f2d99b6ab17d0ae57759f75aa880ce8f032093adf1ff569c2207600e8ff513bc255d5adb7890121b82
-  data.tar.gz: 5a993567b4ba203f891b8dd205640f41bc37aea6f74f90d27bca7caab7b8fa54f2051ce055b253e2f06b84559898ec6f8fedf8154d832fcd23e981ec111a8d8c
+  metadata.gz: f5e60a51b299a09aa1429f1da508a217c9306bb7a126ad0f499849255b1d7942edac5b2b905e3c82abc4cc2aeb3fc261451882f8786b30d5c981004c6e199725
+  data.tar.gz: 01eb9ee07f00334652b549e81bd20a280ba6d9b0b5ac48d806d1eafe7dde63273817078566aa06245775f7a38322355884cb2e5296c1ceae857b09d56b2669fd

data/README.md

@@ -109,6 +109,7 @@ This returns just the body of the definition, i.e. the part after the `CREATE VI
 
 ## History
 
+* 0.2.1 - Fix db:rollback
 * 0.2.0 - Added :allow_replace option (thanks to [@hcarver](https://github.com/hcarver))
 * 0.1.0 - Initial release, extracted from schema_plus 1.x
 

data/lib/schema_plus/views/active_record/migration/command_recorder.rb

@@ -0,0 +1,20 @@
+module SchemaPlus::Views
+  module ActiveRecord
+    module Migration
+      module CommandRecorder
+        def create_view(*args, &block)
+          record(:create_view, args, &block)
+        end
+
+        def drop_view(*args, &block)
+          record(:drop_view, args, &block)
+        end
+
+        def invert_create_view(args)
+          [ :drop_view, [args.first] ]
+        end
+
+      end
+    end
+  end
+end

data/lib/schema_plus/views/version.rb

@@ -1,5 +1,5 @@
 module SchemaPlus
   module Views
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/lib/schema_plus/views.rb

@@ -7,6 +7,7 @@ end
 
 require_relative 'views/version'
 require_relative 'views/active_record/connection_adapters/abstract_adapter'
+require_relative 'views/active_record/migration/command_recorder'
 require_relative 'views/middleware'
 
 module SchemaPlus::Views

data/spec/dumper_spec.rb

@@ -0,0 +1,78 @@
+require 'spec_helper'
+
+class Item < ActiveRecord::Base
+end
+
+describe "Dumper" do
+
+  let(:schema) { ActiveRecord::Schema }
+
+  let(:migration) { ActiveRecord::Migration }
+
+  let(:connection) { ActiveRecord::Base.connection }
+
+  before(:each) do
+    define_schema_and_data
+  end
+
+  it "should include view definitions" do
+    expect(dump).to match(%r{create_view "a_ones", " ?SELECT .*b.*,.*s.* FROM .*items.* WHERE .*a.* = 1.*, :force => true}mi)
+    expect(dump).to match(%r{create_view "ab_ones", " ?SELECT .*s.* FROM .*a_ones.* WHERE .*b.* = 1.*, :force => true}mi)
+  end
+
+  it "should include views in dependency order" do
+    expect(dump).to match(%r{create_table "items".*create_view "a_ones".*create_view "ab_ones"}m)
+  end
+
+  it "should not include views listed in ignore_tables" do
+    dump(ignore_tables: /b_/) do |dump|
+      expect(dump).to match(%r{create_view "a_ones", " ?SELECT .*b.*,.*s.* FROM .*items.* WHERE .*a.* = 1.*, :force => true}mi)
+      expect(dump).not_to match(%r{"ab_ones"})
+    end
+  end
+
+  it "should not reference current database" do
+    # why check this?  mysql default to providing the view definition
+    # with tables explicitly scoped to the current database, which
+    # resulted in the dump being bound to the current database.  this
+    # caused trouble for rails, in which creates the schema dump file
+    # when in the (say) development database, but then uses it to
+    # initialize the test database when testing.  this meant that the
+    # test database had views into the development database.
+    db = connection.respond_to?(:current_database)? connection.current_database : SchemaDev::Rspec.db_configuration[:database]
+    expect(dump).not_to match(%r{#{connection.quote_table_name(db)}[.]})
+  end
+
+  protected
+
+  def define_schema_and_data
+    connection.views.each do |view| connection.drop_view view end
+    connection.tables.each do |table| connection.drop_table table, cascade: true end
+
+    schema.define do
+
+      create_table :items, :force => true do |t|
+        t.integer :a
+        t.integer :b
+        t.string  :s
+      end
+
+      create_view :a_ones, Item.select('b, s').where(:a => 1)
+      create_view :ab_ones, "select s from a_ones where b = 1"
+    end
+    connection.execute "insert into items (a, b, s) values (1, 1, 'one_one')"
+    connection.execute "insert into items (a, b, s) values (1, 2, 'one_two')"
+    connection.execute "insert into items (a, b, s) values (2, 1, 'two_one')"
+    connection.execute "insert into items (a, b, s) values (2, 2, 'two_two')"
+  end
+
+  def dump(opts={})
+    StringIO.open { |stream|
+      ActiveRecord::SchemaDumper.ignore_tables = Array.wrap(opts[:ignore_tables])
+      ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
+      yield stream.string if block_given?
+      stream.string
+    }
+  end
+
+end

data/spec/introspection_spec.rb

@@ -0,0 +1,93 @@
+require 'spec_helper'
+
+class Item < ActiveRecord::Base
+end
+
+describe "Introspection" do
+
+  let(:schema) { ActiveRecord::Schema }
+
+  let(:migration) { ActiveRecord::Migration }
+
+  let(:connection) { ActiveRecord::Base.connection }
+
+  before(:each) do
+    define_schema_and_data
+  end
+
+  it "should list all views" do
+    expect(connection.views.sort).to eq(%W[a_ones ab_ones])
+    expect(connection.view_definition('a_ones')).to match(%r{^ ?SELECT .*b.*,.*s.* FROM .*items.* WHERE .*a.* = 1}mi)
+    expect(connection.view_definition('ab_ones')).to match(%r{^ ?SELECT .*s.* FROM .*a_ones.* WHERE .*b.* = 1}mi)
+  end
+
+  it "should ignore views named pg_*", postgresql: :only do
+    begin
+      migration.create_view :pg_dummy_internal, "select 1"
+      expect(connection.views.sort).to eq(%W[a_ones ab_ones])
+    ensure
+      migration.drop_view :pg_dummy_internal
+    end
+  end
+
+  it "should not be listed as a table" do
+    expect(connection.tables).not_to include('a_ones')
+    expect(connection.tables).not_to include('ab_ones')
+  end
+
+  it "should introspect definition" do
+    expect(connection.view_definition('a_ones')).to match(%r{^ ?SELECT .*b.*,.*s.* FROM .*items.* WHERE .*a.* = 1}mi)
+    expect(connection.view_definition('ab_ones')).to match(%r{^ ?SELECT .*s.* FROM .*a_ones.* WHERE .*b.* = 1}mi)
+  end
+
+  context "in mysql", :mysql => :only do
+
+    around(:each) do |example|
+      begin
+        migration.drop_view :check if connection.views.include? 'check'
+        example.run
+      ensure
+        migration.drop_view :check if connection.views.include? 'check'
+      end
+    end
+
+    it "should introspect WITH CHECK OPTION" do
+      migration.create_view :check, 'SELECT * FROM items WHERE (a=2) WITH CHECK OPTION'
+      expect(connection.view_definition('check')).to match(%r{WITH CASCADED CHECK OPTION$})
+    end
+
+    it "should introspect WITH CASCADED CHECK OPTION" do
+      migration.create_view :check, 'SELECT * FROM items WHERE (a=2) WITH CASCADED CHECK OPTION'
+      expect(connection.view_definition('check')).to match(%r{WITH CASCADED CHECK OPTION$})
+    end
+
+    it "should introspect WITH LOCAL CHECK OPTION" do
+      migration.create_view :check, 'SELECT * FROM items WHERE (a=2) WITH LOCAL CHECK OPTION'
+      expect(connection.view_definition('check')).to match(%r{WITH LOCAL CHECK OPTION$})
+    end
+  end
+
+  protected
+
+  def define_schema_and_data
+    connection.views.each do |view| connection.drop_view view end
+    connection.tables.each do |table| connection.drop_table table, cascade: true end
+
+    schema.define do
+
+      create_table :items, :force => true do |t|
+        t.integer :a
+        t.integer :b
+        t.string  :s
+      end
+
+      create_view :a_ones, Item.select('b, s').where(:a => 1)
+      create_view :ab_ones, "select s from a_ones where b = 1"
+    end
+    connection.execute "insert into items (a, b, s) values (1, 1, 'one_one')"
+    connection.execute "insert into items (a, b, s) values (1, 2, 'one_two')"
+    connection.execute "insert into items (a, b, s) values (2, 1, 'two_one')"
+    connection.execute "insert into items (a, b, s) values (2, 2, 'two_two')"
+  end
+
+end

data/spec/migration_spec.rb

@@ -0,0 +1,116 @@
+require 'spec_helper'
+
+class Item < ActiveRecord::Base
+end
+
+class AOnes < ActiveRecord::Base
+end
+
+class ABOnes < ActiveRecord::Base
+end
+
+describe "Migration" do
+
+  let(:migration) { ActiveRecord::Migration }
+  let(:connection) { ActiveRecord::Base.connection }
+  let(:schema) { ActiveRecord::Schema }
+
+  before(:each) do
+    define_schema_and_data
+  end
+
+  context "creation" do
+    it "should create correct views" do
+      expect(AOnes.all.collect(&:s)).to eq(%W[one_one one_two])
+      expect(ABOnes.all.collect(&:s)).to eq(%W[one_one])
+    end
+  end
+
+  context "duplicate creation" do
+    before(:each) do
+      migration.create_view('dupe_me', 'SELECT * FROM items WHERE (a=1)')
+    end
+
+    it "should raise an error by default" do
+      expect {migration.create_view('dupe_me', 'SELECT * FROM items WHERE (a=2)')}.to raise_error ActiveRecord::StatementInvalid
+    end
+
+    it "should override existing definition if :force true" do
+      migration.create_view('dupe_me', 'SELECT * FROM items WHERE (a=2)', :force => true)
+      expect(connection.view_definition('dupe_me')).to match(%r{WHERE .*a.*=.*2}i)
+    end
+ 
+    context "Postgres and MySQL only", :sqlite3 => :skip do
+      it "should override existing definition if :allow_replace is true" do
+        migration.create_view('dupe_me', 'SELECT * FROM items WHERE (a=2)', :allow_replace => true)
+        expect(connection.view_definition('dupe_me')).to match(%r{WHERE .*a.*=.*2}i)
+      end
+    end
+  end
+
+  context "dropping" do
+    it "should raise an error if the view doesn't exist" do
+      expect { migration.drop_view('doesnt_exist') }.to raise_error ActiveRecord::StatementInvalid
+    end
+
+    it "should fail silently when using if_exists option" do
+      expect { migration.drop_view('doesnt_exist', :if_exists => true) }.not_to raise_error
+    end
+
+    context "with a view that exists" do
+      before { migration.create_view('view_that_exists', 'SELECT * FROM items WHERE (a=1)') }
+
+      it "should succeed" do
+        migration.drop_view('view_that_exists')
+        expect(connection.views).not_to include('view_that_exists')
+      end
+    end
+  end
+
+  describe "rollback" do
+    it "properly rolls back a create_view" do
+      m = Class.new ::ActiveRecord::Migration do
+        define_method(:change) {
+          create_view :copy, "SELECT * FROM items"
+        }
+      end
+      m.migrate(:up)
+      expect(connection.views).to include("copy")
+      m.migrate(:down)
+      expect(connection.views).not_to include("copy")
+    end
+
+    it "raises error for drop_view" do
+      m = Class.new ::ActiveRecord::Migration do
+        define_method(:change) {
+          drop_view :a_ones
+        }
+      end
+      expect { m.migrate(:down) }.to raise_error(::ActiveRecord::IrreversibleMigration)
+    end
+  end
+
+
+  protected
+
+  def define_schema_and_data
+    connection.views.each do |view| connection.drop_view view end
+    connection.tables.each do |table| connection.drop_table table, cascade: true end
+
+    schema.define do
+
+      create_table :items, :force => true do |t|
+        t.integer :a
+        t.integer :b
+        t.string  :s
+      end
+
+      create_view :a_ones, Item.select('b, s').where(:a => 1)
+      create_view :ab_ones, "select s from a_ones where b = 1"
+    end
+    connection.execute "insert into items (a, b, s) values (1, 1, 'one_one')"
+    connection.execute "insert into items (a, b, s) values (1, 2, 'one_two')"
+    connection.execute "insert into items (a, b, s) values (2, 1, 'two_one')"
+    connection.execute "insert into items (a, b, s) values (2, 2, 'two_two')"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus_views
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - ronen barzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-02 00:00:00.000000000 Z
+date: 2015-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -145,15 +145,18 @@ files:
 - lib/schema_plus/views/active_record/connection_adapters/mysql2_adapter.rb
 - lib/schema_plus/views/active_record/connection_adapters/postgresql_adapter.rb
 - lib/schema_plus/views/active_record/connection_adapters/sqlite3_adapter.rb
+- lib/schema_plus/views/active_record/migration/command_recorder.rb
 - lib/schema_plus/views/middleware.rb
 - lib/schema_plus/views/version.rb
 - lib/schema_plus_views.rb
 - schema_dev.yml
 - schema_plus_views.gemspec
+- spec/dumper_spec.rb
+- spec/introspection_spec.rb
+- spec/migration_spec.rb
 - spec/named_schemas_spec.rb
 - spec/sanity_spec.rb
 - spec/spec_helper.rb
-- spec/views_spec.rb
 homepage: https://github.com/SchemaPlus/schema_plus_views
 licenses:
 - MIT
@@ -179,7 +182,9 @@ signing_key:
 specification_version: 4
 summary: Adds support for views to ActiveRecord
 test_files:
+- spec/dumper_spec.rb
+- spec/introspection_spec.rb
+- spec/migration_spec.rb
 - spec/named_schemas_spec.rb
 - spec/sanity_spec.rb
 - spec/spec_helper.rb
-- spec/views_spec.rb

data/spec/views_spec.rb

@@ -1,193 +0,0 @@
-require 'spec_helper'
-
-class Item < ActiveRecord::Base
-end
-
-class AOnes < ActiveRecord::Base
-end
-
-class ABOnes < ActiveRecord::Base
-end
-
-describe "Views" do
-
-  let(:schema) { ActiveRecord::Schema }
-
-  let(:migration) { ActiveRecord::Migration }
-
-  let(:connection) { ActiveRecord::Base.connection }
-
-  before(:each) do
-    define_schema_and_data
-  end
-
-  context "querys" do
-
-    it "should query correctly" do
-      expect(AOnes.all.collect(&:s)).to eq(%W[one_one one_two])
-      expect(ABOnes.all.collect(&:s)).to eq(%W[one_one])
-    end
-
-  end
-
-  context "introspection" do
-
-    it "should list all views" do
-      expect(connection.views.sort).to eq(%W[a_ones ab_ones])
-      expect(connection.view_definition('a_ones')).to match(%r{^ ?SELECT .*b.*,.*s.* FROM .*items.* WHERE .*a.* = 1}mi)
-      expect(connection.view_definition('ab_ones')).to match(%r{^ ?SELECT .*s.* FROM .*a_ones.* WHERE .*b.* = 1}mi)
-    end
-
-    it "should ignore views named pg_*", postgresql: :only do
-      begin
-        migration.create_view :pg_dummy_internal, "select 1"
-        expect(connection.views.sort).to eq(%W[a_ones ab_ones])
-      ensure
-        migration.drop_view :pg_dummy_internal
-      end
-    end
-
-    it "should not be listed as a table" do
-      expect(connection.tables).not_to include('a_ones')
-      expect(connection.tables).not_to include('ab_ones')
-    end
-
-    it "should introspect definition" do
-      expect(connection.view_definition('a_ones')).to match(%r{^ ?SELECT .*b.*,.*s.* FROM .*items.* WHERE .*a.* = 1}mi)
-      expect(connection.view_definition('ab_ones')).to match(%r{^ ?SELECT .*s.* FROM .*a_ones.* WHERE .*b.* = 1}mi)
-    end
-  end
-
-
-  context "dumper" do
-
-    it "should include view definitions" do
-      expect(dump).to match(%r{create_view "a_ones", " ?SELECT .*b.*,.*s.* FROM .*items.* WHERE .*a.* = 1.*, :force => true}mi)
-      expect(dump).to match(%r{create_view "ab_ones", " ?SELECT .*s.* FROM .*a_ones.* WHERE .*b.* = 1.*, :force => true}mi)
-    end
-
-    it "should include views in dependency order" do
-      expect(dump).to match(%r{create_table "items".*create_view "a_ones".*create_view "ab_ones"}m)
-    end
-
-    it "should not include views listed in ignore_tables" do
-      dump(ignore_tables: /b_/) do |dump|
-        expect(dump).to match(%r{create_view "a_ones", " ?SELECT .*b.*,.*s.* FROM .*items.* WHERE .*a.* = 1.*, :force => true}mi)
-        expect(dump).not_to match(%r{"ab_ones"})
-      end
-    end
-
-    it "should not reference current database" do
-      # why check this?  mysql default to providing the view definition
-      # with tables explicitly scoped to the current database, which
-      # resulted in the dump being bound to the current database.  this
-      # caused trouble for rails, in which creates the schema dump file
-      # when in the (say) development database, but then uses it to
-      # initialize the test database when testing.  this meant that the
-      # test database had views into the development database.
-      db = connection.respond_to?(:current_database)? connection.current_database : SchemaDev::Rspec.db_configuration[:database]
-      expect(dump).not_to match(%r{#{connection.quote_table_name(db)}[.]})
-    end
-  end
-
-  context "duplicate creation" do
-    before(:each) do
-      migration.create_view('dupe_me', 'SELECT * FROM items WHERE (a=1)')
-    end
-
-    it "should raise an error by default" do
-      expect {migration.create_view('dupe_me', 'SELECT * FROM items WHERE (a=2)')}.to raise_error ActiveRecord::StatementInvalid
-    end
-
-    it "should override existing definition if :force true" do
-      migration.create_view('dupe_me', 'SELECT * FROM items WHERE (a=2)', :force => true)
-      expect(connection.view_definition('dupe_me')).to match(%r{WHERE .*a.*=.*2}i)
-    end
- 
-    context "Postgres and MySQL only", :sqlite3 => :skip do
-      it "should override existing definition if :allow_replace is true" do
-        migration.create_view('dupe_me', 'SELECT * FROM items WHERE (a=2)', :allow_replace => true)
-        expect(connection.view_definition('dupe_me')).to match(%r{WHERE .*a.*=.*2}i)
-      end
-    end
-  end
-
-  context "dropping" do
-    it "should raise an error if the view doesn't exist" do
-      expect { migration.drop_view('doesnt_exist') }.to raise_error ActiveRecord::StatementInvalid
-    end
-
-    it "should fail silently when using if_exists option" do
-      expect { migration.drop_view('doesnt_exist', :if_exists => true) }.not_to raise_error
-    end
-
-    context "with a view that exists" do
-      before { migration.create_view('view_that_exists', 'SELECT * FROM items WHERE (a=1)') }
-
-      it "should succeed" do
-        migration.drop_view('view_that_exists')
-        expect(connection.views).not_to include('view_that_exists')
-      end
-    end
-  end
-
-  context "in mysql", :mysql => :only do
-
-    around(:each) do |example|
-      begin
-        migration.drop_view :check if connection.views.include? 'check'
-        example.run
-      ensure
-        migration.drop_view :check if connection.views.include? 'check'
-      end
-    end
-
-    it "should introspect WITH CHECK OPTION" do
-      migration.create_view :check, 'SELECT * FROM items WHERE (a=2) WITH CHECK OPTION'
-      expect(connection.view_definition('check')).to match(%r{WITH CASCADED CHECK OPTION$})
-    end
-
-    it "should introspect WITH CASCADED CHECK OPTION" do
-      migration.create_view :check, 'SELECT * FROM items WHERE (a=2) WITH CASCADED CHECK OPTION'
-      expect(connection.view_definition('check')).to match(%r{WITH CASCADED CHECK OPTION$})
-    end
-
-    it "should introspect WITH LOCAL CHECK OPTION" do
-      migration.create_view :check, 'SELECT * FROM items WHERE (a=2) WITH LOCAL CHECK OPTION'
-      expect(connection.view_definition('check')).to match(%r{WITH LOCAL CHECK OPTION$})
-    end
-  end
-
-  protected
-
-  def define_schema_and_data
-    connection.views.each do |view| connection.drop_view view end
-    connection.tables.each do |table| connection.drop_table table, cascade: true end
-
-    schema.define do
-
-      create_table :items, :force => true do |t|
-        t.integer :a
-        t.integer :b
-        t.string  :s
-      end
-
-      create_view :a_ones, Item.select('b, s').where(:a => 1)
-      create_view :ab_ones, "select s from a_ones where b = 1"
-    end
-    connection.execute "insert into items (a, b, s) values (1, 1, 'one_one')"
-    connection.execute "insert into items (a, b, s) values (1, 2, 'one_two')"
-    connection.execute "insert into items (a, b, s) values (2, 1, 'two_one')"
-    connection.execute "insert into items (a, b, s) values (2, 2, 'two_two')"
-  end
-
-  def dump(opts={})
-    StringIO.open { |stream|
-      ActiveRecord::SchemaDumper.ignore_tables = Array.wrap(opts[:ignore_tables])
-      ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
-      yield stream.string if block_given?
-      stream.string
-    }
-  end
-
-end