schema_plus 1.5.3 → 1.6.0

data/spec/named_schemas_spec.rb

@@ -168,9 +168,9 @@ describe "with multiple schemas" do
       expect(Member.foreign_keys.map(&:references_table_name)).to include "schema_plus_test2.groups"
     end
 
-    it "should reference table in default schema" do
+    it "should reference table in default schema", :mysql => :skip do
       expect(Member.foreign_keys.map(&:references_table_name)).to include "items"
-    end unless SchemaPlusHelpers.mysql?
+    end
 
     it "should include the schema in the constraint name" do
       expected_names = ["fk_schema_plus_test2_members_group_id"]
@@ -179,38 +179,36 @@ describe "with multiple schemas" do
     end
   end
 
-  if SchemaPlusHelpers.postgresql?
-    context "when using PostGIS" do
-      before(:all) do
-        begin
-          connection.execute "CREATE SCHEMA postgis"
-        rescue ActiveRecord::StatementInvalid => e
-          raise unless e.message =~ /already exists/
-        end
+  context "when using PostGIS", :postgresql => :only do
+    before(:all) do
+      begin
+        connection.execute "CREATE SCHEMA postgis"
+      rescue ActiveRecord::StatementInvalid => e
+        raise unless e.message =~ /already exists/
       end
+    end
 
-      around (:each) do |example|
-        begin
-          connection.execute "SET search_path to '$user','public','postgis'"
-          example.run
-        ensure
-          connection.execute "SET search_path to '$user','public'"
-        end
+    around (:each) do |example|
+      begin
+        connection.execute "SET search_path to '$user','public','postgis'"
+        example.run
+      ensure
+        connection.execute "SET search_path to '$user','public'"
       end
+    end
 
-      before(:each) do
-        allow(connection).to receive(:adapter_name).and_return('PostGIS')
-      end
+    before(:each) do
+      allow(connection).to receive(:adapter_name).and_return('PostGIS')
+    end
 
-      it "should hide views in postgis schema" do
-        begin
+    it "should hide views in postgis schema" do
+      begin
         connection.create_view "postgis.hidden", "select 1", :force => true
         connection.create_view :myview, "select 2", :force => true
         expect(connection.views).to eq(["myview"])
-        ensure
-          connection.execute 'DROP VIEW postgis.hidden' rescue nil
-          connection.execute 'DROP VIEW myview' rescue nil
-        end
+      ensure
+        connection.execute 'DROP VIEW postgis.hidden' rescue nil
+        connection.execute 'DROP VIEW myview' rescue nil
       end
     end
   end

data/spec/schema_dumper_spec.rb

@@ -87,47 +87,44 @@ describe "Schema dump" do
 
   end
 
-  context "with date default" do
-    if SchemaPlusHelpers.postgresql?
-      it "should dump the default hash expr as now()" do
-        with_additional_column Post, :posted_at, :datetime, :default => :now do
-          expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default =>)\s*\{\s*(?:expr:|:expr\s*=>)\s*"now\(\)"\s*\}})
-        end
+  context "with date default", :postgresql => :only do
+    it "should dump the default hash expr as now()" do
+      with_additional_column Post, :posted_at, :datetime, :default => :now do
+        expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default =>)\s*\{\s*(?:expr:|:expr\s*=>)\s*"now\(\)"\s*\}})
       end
+    end
 
-      it "should dump the default hash expr as CURRENT_TIMESTAMP" do
-        with_additional_column Post, :posted_at, :datetime, :default => {:expr => 'date \'2001-09-28\''} do
-          expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default =>)\s*'2001-09-28 00:00:00'})
-        end
+    it "should dump the default hash expr as CURRENT_TIMESTAMP" do
+      with_additional_column Post, :posted_at, :datetime, :default => {:expr => 'date \'2001-09-28\''} do
+        expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default =>)\s*'2001-09-28 00:00:00'})
       end
+    end
 
-      it "can dump a complex default expression" do
-        with_additional_column Post, :name, :string, :default => {:expr => 'substring(random()::text from 3 for 6)'} do
-          expect(dump_posts).to match(%r{t\.string\s+"name",\s*(?:default:|:default\s*=>)\s*{\s*(?:expr:|:expr\s*=>)\s*"\\"substring\\"\(\(random\(\)\)::text, 3, 6\)"\s*}})
-        end
+    it "can dump a complex default expression" do
+      with_additional_column Post, :name, :string, :default => {:expr => 'substring(random()::text from 3 for 6)'} do
+        expect(dump_posts).to match(%r{t\.string\s+"name",\s*(?:default:|:default\s*=>)\s*{\s*(?:expr:|:expr\s*=>)\s*"\\"substring\\"\(\(random\(\)\)::text, 3, 6\)"\s*}})
       end
     end
+  end
 
-    if SchemaPlusHelpers.sqlite3?
-      it "should dump the default hash expr as now" do
-        with_additional_column Post, :posted_at, :datetime, :default => :now do
-          expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default =>)\s*\{\s*(?:expr:|:expr =>)\s*"\(DATETIME\('now'\)\)"\s*\}})
-        end
+  context "with date default", :sqlite3 => :only do
+    it "should dump the default hash expr as now" do
+      with_additional_column Post, :posted_at, :datetime, :default => :now do
+        expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default =>)\s*\{\s*(?:expr:|:expr =>)\s*"\(DATETIME\('now'\)\)"\s*\}})
       end
+    end
 
-      it "should dump the default hash expr string as now" do
-        with_additional_column Post, :posted_at, :datetime, :default => { :expr => "(DATETIME('now'))" } do
-          expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default =>)\s*\{\s*(?:expr:|:expr =>)\s*"\(DATETIME\('now'\)\)"\s*\}})
-        end
+    it "should dump the default hash expr string as now" do
+      with_additional_column Post, :posted_at, :datetime, :default => { :expr => "(DATETIME('now'))" } do
+        expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default =>)\s*\{\s*(?:expr:|:expr =>)\s*"\(DATETIME\('now'\)\)"\s*\}})
       end
+    end
 
-      it "should dump the default value normally" do
-        with_additional_column Post, :posted_at, :string, :default => "now" do
-          expect(dump_posts).to match(%r{t\.string\s*"posted_at",\s*(?:default:|:default =>)\s*"now"})
-        end
+    it "should dump the default value normally" do
+      with_additional_column Post, :posted_at, :string, :default => "now" do
+        expect(dump_posts).to match(%r{t\.string\s*"posted_at",\s*(?:default:|:default =>)\s*"now"})
       end
     end
-
   end
 
   it "should leave out :default when default was changed to null" do
@@ -169,17 +166,13 @@ describe "Schema dump" do
     end
   end
 
-  unless SchemaPlusHelpers.mysql?
-
-    it "should include index order" do
-      with_index Post, [:user_id, :first_comment_id, :short_id], :order => { :user_id => :asc, :first_comment_id => :desc } do
-        expect(dump_posts).to match(%r{t.index \["user_id", "first_comment_id", "short_id"\],.*:order => {"user_id" => :asc, "first_comment_id" => :desc, "short_id" => :asc}})
-      end
+  it "should include index order", :mysql => :skip do
+    with_index Post, [:user_id, :first_comment_id, :short_id], :order => { :user_id => :asc, :first_comment_id => :desc } do
+      expect(dump_posts).to match(%r{t.index \["user_id", "first_comment_id", "short_id"\],.*:order => {"user_id" => :asc, "first_comment_id" => :desc, "short_id" => :asc}})
     end
-
   end
 
-  if SchemaPlusHelpers.postgresql?
+  context "index extras", :postgresql => :only do
 
     it "should define case insensitive index" do
       with_index Post, [:body, :string_no_default], :case_sensitive => false do
@@ -250,26 +243,46 @@ describe "Schema dump" do
 
   end
 
-  unless SchemaPlusHelpers.sqlite3?
-    context "with cyclic foreign key constraints" do
-      before (:all) do
-        ActiveRecord::Base.connection.add_foreign_key(Comment.table_name, :commenter_id, User.table_name, :id)
-        ActiveRecord::Base.connection.add_foreign_key(Comment.table_name, :post_id, Post.table_name, :id)
-        ActiveRecord::Base.connection.add_foreign_key(Post.table_name, :first_comment_id, Comment.table_name, :id)
-        ActiveRecord::Base.connection.add_foreign_key(Post.table_name, :user_id, User.table_name, :id)
-        ActiveRecord::Base.connection.add_foreign_key(User.table_name, :first_post_id, Post.table_name, :id)
-      end
+  context "with cyclic foreign key constraints", :sqlite3 => :skip do
+    before (:all) do
+      ActiveRecord::Base.connection.add_foreign_key(Comment.table_name, :commenter_id, User.table_name, :id)
+      ActiveRecord::Base.connection.add_foreign_key(Comment.table_name, :post_id, Post.table_name, :id)
+      ActiveRecord::Base.connection.add_foreign_key(Post.table_name, :first_comment_id, Comment.table_name, :id)
+      ActiveRecord::Base.connection.add_foreign_key(Post.table_name, :user_id, User.table_name, :id)
+      ActiveRecord::Base.connection.add_foreign_key(User.table_name, :first_post_id, Post.table_name, :id)
+    end
+
+    it "should not raise an error" do
+      expect { dump_schema }.to_not raise_error
+    end
+
+    it "should dump constraints after the tables they reference" do
+      expect(dump_schema).to match(%r{create_table "comments".*foreign_key.*\["first_comment_id"\], "comments", \["id"\]}m)
+      expect(dump_schema).to match(%r{create_table "posts".*foreign_key.*\["first_post_id"\], "posts", \["id"\]}m)
+      expect(dump_schema).to match(%r{create_table "posts".*foreign_key.*\["post_id"\], "posts", \["id"\]}m)
+      expect(dump_schema).to match(%r{create_table "users".*foreign_key.*\["commenter_id"\], "users", \["id"\]}m)
+      expect(dump_schema).to match(%r{create_table "users".*foreign_key.*\["user_id"\], "users", \["id"\]}m)
+    end
+  end
+
+  context 'with enum', :postgresql => :only do
+    let(:connection) { ActiveRecord::Base.connection }
 
-      it "should not raise an error" do
-        expect { dump_schema }.to_not raise_error
+    it 'should include enum' do
+      begin
+        connection.execute "CREATE TYPE color AS ENUM ('red', 'green', 'blue')"
+        expect(dump_schema).to match(%r{create_enum "color", "red", "green", "blue"})
+      ensure
+        connection.execute "DROP TYPE color"
       end
+    end
 
-      it "should dump constraints after the tables they reference" do
-        expect(dump_schema).to match(%r{create_table "comments".*foreign_key.*\["first_comment_id"\], "comments", \["id"\]}m)
-        expect(dump_schema).to match(%r{create_table "posts".*foreign_key.*\["first_post_id"\], "posts", \["id"\]}m)
-        expect(dump_schema).to match(%r{create_table "posts".*foreign_key.*\["post_id"\], "posts", \["id"\]}m)
-        expect(dump_schema).to match(%r{create_table "users".*foreign_key.*\["commenter_id"\], "users", \["id"\]}m)
-        expect(dump_schema).to match(%r{create_table "users".*foreign_key.*\["user_id"\], "users", \["id"\]}m)
+    it 'should include enum with schema' do
+      begin
+        connection.execute "CREATE SCHEMA cmyk; CREATE TYPE cmyk.color AS ENUM ('cyan', 'magenta', 'yellow', 'black')"
+        expect(dump_schema).to match(%r{create_enum "color", "cyan", "magenta", "yellow", "black", :schema => "cmyk"})
+      ensure
+        connection.execute "DROP SCHEMA cmyk CASCADE"
       end
     end
   end

data/spec/spec_helper.rb

@@ -17,6 +17,12 @@ Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
 RSpec.configure do |config|
   config.include(SchemaPlusMatchers)
   config.include(SchemaPlusHelpers)
+  config.filter_run_excluding :postgresql => :only unless SchemaPlusHelpers.postgresql?
+  config.filter_run_excluding :postgresql => :skip if SchemaPlusHelpers.postgresql?
+  config.filter_run_excluding :mysql => :only unless SchemaPlusHelpers.mysql?
+  config.filter_run_excluding :mysql => :skip if SchemaPlusHelpers.mysql?
+  config.filter_run_excluding :sqlite3 => :only unless SchemaPlusHelpers.sqlite3?
+  config.filter_run_excluding :sqlite3 => :skip if SchemaPlusHelpers.sqlite3?
 end
 
 def with_fk_config(opts, &block)

data/spec/views_spec.rb

@@ -95,35 +95,52 @@ describe ActiveRecord do
       end
     end
 
-    if SchemaPlusHelpers.mysql?
-      context "in mysql" do
-
-        around(:each) do |example|
-          migration.suppress_messages do
-            begin
-              migration.drop_view :check if connection.views.include? 'check'
-              example.run
-            ensure
-              migration.drop_view :check if connection.views.include? 'check'
-            end
-          end
-        end
+    context "dropping views" 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 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 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 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$})
+        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
 
-        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$})
+      around(:each) do |example|
+        migration.suppress_messages do
+          begin
+            migration.drop_view :check if connection.views.include? 'check'
+            example.run
+          ensure
+            migration.drop_view :check if connection.views.include? 'check'
+          end
         end
-      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
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.6.0
 platform: ruby
 authors:
 - Ronen Barzel
@@ -9,104 +9,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-07 00:00:00.000000000 Z
+date: 2014-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: valuable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov-gem-profile
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 'SchemaPlus is an ActiveRecord extension that provides enhanced capabilities
@@ -119,9 +119,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
@@ -175,6 +175,7 @@ files:
 - spec/connections/mysql2/connection.rb
 - spec/connections/postgresql/connection.rb
 - spec/connections/sqlite3/connection.rb
+- spec/enum_spec.rb
 - spec/foreign_key_definition_spec.rb
 - spec/foreign_key_spec.rb
 - spec/index_definition_spec.rb
@@ -201,17 +202,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: schema_plus
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Enhances ActiveRecord schema mechanism, including more DRY index creation
@@ -224,6 +225,7 @@ test_files:
 - spec/connections/mysql2/connection.rb
 - spec/connections/postgresql/connection.rb
 - spec/connections/sqlite3/connection.rb
+- spec/enum_spec.rb
 - spec/foreign_key_definition_spec.rb
 - spec/foreign_key_spec.rb
 - spec/index_definition_spec.rb