schema_plus 1.5.3 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98695abbf9f44e746dda323f7312d0b206b74b33
-  data.tar.gz: f9402bff3980025c1f6a1b6e052f9ec1cf0f2bfe
+  metadata.gz: 620224f986e74b013fddffb7147eecfabe3f27bd
+  data.tar.gz: 323fdba9ed583753abfbdaee67353391356213f0
 SHA512:
-  metadata.gz: 1ac7c8fb9f854adb5bd455b19e93427829dffab2ceccbf59044116f1bdee8783acb5d98ede537a9af118e1d44a7872e306700e8ae9f4153c4d523ba7c4da4803
-  data.tar.gz: 521da3cda682a2ab9dc0126a093c3f6b21e5a49a19d7dded7662a5c7d8729671f9a71aa672e01150d4078cf2b076d20974a7a41e825a4616f7c5fae3386bcb72
+  metadata.gz: 8510bd7c390e12f5e4f2c113395dcde1831e46c9b525a90bb9a5cb2a4e48095840467e03dcac5229fdcab72abc11089d3d14c72ef535c6751fed159578f41bd6
+  data.tar.gz: 47df08a80fb0257e6cc1fa632005517685424af5f717ad847ef817b579288803c36e14f1cf2a96c7bb9442e288aaae08cd328e16ca0bfadda8a47f0910d8aa13

data/.travis.yml

@@ -18,7 +18,7 @@ before_script:
   - rake create_databases
 after_script:
   - rake drop_databases
-env: 'POSTGRES_DB_USER=postgres MYSQL_DB_USER="travis"'
+env: 'POSTGRESQL_DB_USER=postgres MYSQL_DB_USER="travis"'
 notifications:
   recipients:
     - michal.lomnicki@gmail.com
@@ -27,22 +27,22 @@ matrix:
   exclude:
     - rvm: jruby
       gemfile: gemfiles/rails-3.2/Gemfile.sqlite3
-      env: 'POSTGRES_DB_USER=postgres MYSQL_DB_USER="travis"'
+      env: 'POSTGRESQL_DB_USER=postgres MYSQL_DB_USER="travis"'
     - rvm: jruby
       gemfile: gemfiles/rails-4.0/Gemfile.postgresql
-      env: 'POSTGRES_DB_USER=postgres MYSQL_DB_USER="travis"'
+      env: 'POSTGRESQL_DB_USER=postgres MYSQL_DB_USER="travis"'
     - rvm: jruby
       gemfile: gemfiles/rails-4.0/Gemfile.sqlite3
-      env: 'POSTGRES_DB_USER=postgres MYSQL_DB_USER="travis"'
+      env: 'POSTGRESQL_DB_USER=postgres MYSQL_DB_USER="travis"'
     - rvm: jruby
       gemfile: gemfiles/rails-4.0/Gemfile.mysql2
-      env: 'POSTGRES_DB_USER=postgres MYSQL_DB_USER="travis"'
+      env: 'POSTGRESQL_DB_USER=postgres MYSQL_DB_USER="travis"'
     - rvm: jruby
       gemfile: gemfiles/rails-4.1/Gemfile.postgresql
-      env: 'POSTGRES_DB_USER=postgres MYSQL_DB_USER="travis"'
+      env: 'POSTGRESQL_DB_USER=postgres MYSQL_DB_USER="travis"'
     - rvm: jruby
       gemfile: gemfiles/rails-4.1/Gemfile.sqlite3
-      env: 'POSTGRES_DB_USER=postgres MYSQL_DB_USER="travis"'
+      env: 'POSTGRESQL_DB_USER=postgres MYSQL_DB_USER="travis"'
     - rvm: jruby
       gemfile: gemfiles/rails-4.1/Gemfile.mysql2
-      env: 'POSTGRES_DB_USER=postgres MYSQL_DB_USER="travis"'
+      env: 'POSTGRESQL_DB_USER=postgres MYSQL_DB_USER="travis"'

data/CHANGELOG.md

@@ -2,12 +2,18 @@
 
 ## Change Log
 
+### 1.6.0
+
+* Added PostgreSQL enum support (thanks to [@juike](https://github.com/juike)) (issue #167)
+* Added if_exists to drop_view (thanks to [@abrom](https://github.com/abrom)) (issue #171)
+* Partial support for AR 4.* with jRuby (thanks to [@bacrossland])) (issue #172)
+
 ### 1.5.3
 
 * No longer limited to rails 4.1.1 (issue #159)
 * Bug fix: multiple competing indexes created for `t.references... index: :unique` (issue #157)
-* Now works with rspec 3 (thanks to [@robababa](https://github.com/robababa) (issue #160)
-* Improvements to ./runspecs (thanks to [@robababa](https://github.com/robababa) (issue #162)
+* Now works with rspec 3 (thanks to [@robababa](https://github.com/robababa)) (issue #160)
+* Improvements to ./runspecs (thanks to [@robababa](https://github.com/robababa)) (issue #162)
 
 ### 1.5.2
 
@@ -19,7 +25,7 @@
 
 ### 1.5.0
 * Can now be used with activerecord standalone, doesn't need all of rails.
-* `views` ignores postgres internal views, thanks to [@everplays](https://github.com/everplays) (issue #147)
+* `views` ignores PostgreSQL internal views, thanks to [@everplays](https://github.com/everplays) (issue #147)
 
 ### 1.4.1
 
@@ -103,7 +109,7 @@
     [@zaadjis](https://github.com/zaadjis))
 *   New feature: renaming a table renames its indexes and constraints
     correspondingly.
-*   Bug fix for postgres :kind index attribute (thanks to [@eugenebolshakov](https://github.com/eugenebolshakov))
+*   Bug fix for PostgreSQL :kind index attribute (thanks to [@eugenebolshakov](https://github.com/eugenebolshakov))
 *   Sort fks in dump for stability (thanks to [@zephyr-dev](https://github.com/zephyr-dev))
 *   Bug fix: change_column should maintain foreign key constraints even when
     config.foreign_keys.auto_create is false

data/README.md

@@ -211,7 +211,7 @@ a view can be created using a rails relation or literal sql:
 And can be dropped:
 
     drop_view :posts_commented_by_staff
-    drop_view :uncommented_posts
+    drop_view :uncommented_posts, :if_exists => true
 
 ActiveRecord works with views the same as with ordinary tables.  That is, for
 the above views you can define
@@ -223,7 +223,7 @@ the above views you can define
     class UncommentedPost < ActiveRecord::Base
     end
 
-Note: In Postgres, all internal views (the ones with `pg_` prefix) will be skipped.
+Note: In PostgreSQL, all internal views (the ones with `pg_` prefix) will be skipped.
 
 ### Column Defaults: Expressions
 
@@ -267,6 +267,26 @@ Note that after updating, you would need to reload a record to replace
 Note also that Sqlite3 does not support `ActiveRecord::DB_DEFAULT`; attempting
 to use it will raise `ActiveRecord::StatementInvalid`
 
+### Enums (PostgreSQL only)
+
+SchemaPlus provides support for creating, altering and dropping enums. In a migration,
+a enum can be created:
+
+    create_enum :color, :red, :green, :blue # default schema is 'public'
+    create_enum :cmyk, :cyan, :magenta, :yellow, :black, :schema => 'color'
+
+And can be altered: (added a new value)
+
+    alter_enum :color, :black
+    alter_enum :color, :purple, :after => 'red'
+    alter_enum :color, :pink, :before => 'purple'
+    alter_enum :color, :white, :schema => 'public'
+
+Finally, a enum can be dropped:
+
+    drop_enum :color
+    drop_enum :cmyk, :schema => 'color'
+
 ### Schema Dump and Load (schema.rb)
 
 When dumping `schema.rb`, SchemaPlus orders the views and tables in the schema
@@ -316,9 +336,9 @@ Schema_plus has a full set of rspec tests.  [travis-ci](http://travis-ci.org/lom
 
 * Of course you must have installed whichever databases you want to test. The default set is: PostgreSQL, MySQL, and SQLite3.
 
-* For PostgreSQL and MySQL the tests need a db user with permissions to create and access databases: The default username used by the specs is 'postgres' for Postgresql and 'schema_plus' for MySQL; you can change them via:
+* For PostgreSQL and MySQL the tests need a db user with permissions to create and access databases: The default username used by the specs is 'postgres' for PostgreSQL and 'schema_plus' for MySQL; you can change them via:
 
-        $ export POSTGRES_DB_USER = pgusername
+        $ export POSTGRESQL_DB_USER = pgusername
         $ export MYSQL_DB_USER = mysqlusername
 
 * For PostgreSQL and MySQL you must explicitly create the databases used by the tests:

data/Rakefile

@@ -37,7 +37,7 @@ end
 
 DATABASES = %w[schema_plus_test]
 [ 
-  { namespace: :postgresql, uservar: 'POSTGRES_DB_USER', defaultuser: 'postgres', create: "createdb -U '%{user}' %{dbname}", drop: "dropdb -U '%{user}' %{dbname}" },
+  { namespace: :postgresql, uservar: 'POSTGRESQL_DB_USER', defaultuser: 'postgres', create: "createdb -U '%{user}' %{dbname}", drop: "dropdb -U '%{user}' %{dbname}" },
   { namespace: :mysql, uservar: 'MYSQL_DB_USER', defaultuser: 'schema_plus', create: "mysqladmin -u '%{user}' create %{dbname}", drop: "mysqladmin -u '%{user}' -f drop %{dbname}" }
 ].each do |db|
   namespace db[:namespace] do

data/gemfiles/rails-4.1/Gemfile.base

@@ -1,3 +1,3 @@
 eval File.read File.expand_path('../../Gemfile.base', __FILE__)
 
-gem "rails", ">= 4.1.0.beta1"
+gem "rails", "~> 4.1.0"

data/lib/schema_plus/active_record/connection_adapters/abstract_adapter.rb

@@ -27,8 +27,10 @@ module SchemaPlus
                     when 'PostgreSQL', 'PostGIS'   then 'PostgresqlAdapter'
                     when 'SQLite'                  then 'Sqlite3Adapter'
                     end
-          unless adapter
-            ::ActiveRecord::Base.logger.warn "SchemaPlus: Unsupported adapter name #{adapter_name.inspect}.  Leaving it alone."
+          if adapter.nil?
+            unless adapter_name == 'JDBC' # ARJDBC
+              ::ActiveRecord::Base.logger.warn "SchemaPlus: Unsupported adapter name #{adapter_name.inspect}.  Leaving it alone."
+            end
             return
           end
           adapter_module = SchemaPlus::ActiveRecord::ConnectionAdapters.const_get(adapter)
@@ -51,9 +53,13 @@ module SchemaPlus
           execute "CREATE VIEW #{quote_table_name(view_name)} AS #{definition}"
         end
 
-        # Drop the named view
-        def drop_view(view_name)
-          execute "DROP VIEW #{quote_table_name(view_name)}"
+        # Drop the named view.  Specify :if_exists => true
+        # to fail silently if the view doesn't exist.
+        def drop_view(view_name, options = {})
+          sql = "DROP VIEW"
+          sql += " IF EXISTS" if options[:if_exists]
+          sql += " #{quote_table_name(view_name)}"
+          execute sql
         end
 
 

data/lib/schema_plus/active_record/connection_adapters/postgresql_adapter.rb

@@ -68,7 +68,7 @@ module SchemaPlus
           ::ActiveRecord::ConnectionAdapters::PostgreSQLColumn.send(:include, PostgreSQLColumn) unless ::ActiveRecord::ConnectionAdapters::PostgreSQLColumn.include?(PostgreSQLColumn)
         end
 
-        # SchemaPlus provides the following extra options for Postgres
+        # SchemaPlus provides the following extra options for PostgreSQL
         # indexes:
         # * +:conditions+ - SQL conditions for the WHERE clause of the index
         # * +:expression+ - SQL expression to index.  column_name can be nil or ommitted, in which case :name must be provided
@@ -154,7 +154,7 @@ module SchemaPlus
           SQL
 
           result.map do |(index_name, is_unique, indkey, inddef, oid, kind, conditions, expression)|
-            unique = (is_unique == 't')
+            unique = (is_unique == 't' || is_unique == true) # The test against true is for JDBC which is returning a boolean and not a String.
             index_keys = indkey.split(" ")
 
             rows = query(<<-SQL, "Columns for index #{index_name} on #{table_name}")
@@ -282,8 +282,64 @@ module SchemaPlus
           row.first.chomp(';') unless row.nil?
         end
 
+        def enums #:nodoc:
+          result = query(<<-SQL)
+            SELECT
+              N.nspname AS schema_name,
+              T.typname AS enum_name,
+              E.enumlabel AS enum_label,
+              E.enumsortorder AS enum_sort_order
+              --array_agg(E.enumlabel ORDER BY enumsortorder) AS labels
+            FROM pg_type T
+            JOIN pg_enum E ON E.enumtypid = T.oid
+            JOIN pg_namespace N ON N.oid = T.typnamespace
+            ORDER BY 1, 2, 4
+          SQL
+
+          result.reduce([]) do |res, row|
+            last = res.last
+            if last && last[0] == row[0] && last[1] == row[1]
+              last[2] << row[2]
+            else
+              res << (row[0..1] << [row[2]])
+            end
+            res
+          end
+        end
+
+        def create_enum(name, *values)
+          options = values.extract_options!
+          list = values.map { |value| escape_enum_value(value) }
+          execute "CREATE TYPE #{enum_name(name, options[:schema])} AS ENUM (#{list.join(',')})"
+        end
+
+        def alter_enum(name, value, options = {})
+          opts = case
+                 when options[:before] then "BEFORE #{escape_enum_value(options[:before])}"
+                 when options[:after] then "AFTER #{escape_enum_value(options[:after])}"
+                 else
+                   ''
+                 end
+          execute "ALTER TYPE #{enum_name(name, options[:schema])} ADD VALUE #{escape_enum_value(value)} #{opts}"
+        end
+
+        def drop_enum(name, options = {})
+          execute "DROP TYPE #{enum_name(name, options[:schema])}"
+        end
+
         private
 
+        def enum_name(name, schema)
+          [schema || 'public', name].map { |s|
+            %Q{"#{s}"}
+          }.join('.')
+        end
+
+        def escape_enum_value(value)
+          escaped_value = value.sub("'", "''")
+          "'#{escaped_value}'"
+        end
+
         def namespace_sql(table_name)
           (table_name.to_s =~ /(.*)[.]/) ?  "'#{$1}'" : "ANY (current_schemas(false))"
         end

data/lib/schema_plus/active_record/schema_dumper.rb

@@ -49,6 +49,16 @@ module SchemaPlus
         @backref_fks = Hash.new{ |h, k| h[k] = [] }
         @dump_dependencies = {}
 
+        if @connection.respond_to?(:enums)
+          @connection.enums.each do |schema, name, values|
+            params = [name.inspect]
+            params << values.map(&:inspect).join(', ')
+            params << ":schema => #{schema.inspect}" if schema != 'public'
+
+            stream.puts "  create_enum #{params.join(', ')}"
+          end
+        end
+
         tables_without_schema_plus(nil)
 
         @connection.views.each do |view_name|

data/lib/schema_plus/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlus
-  VERSION = "1.5.3"
+  VERSION = "1.6.0"
 end

data/runspecs

@@ -47,7 +47,7 @@ OptionParser.new do |opts|
       o.db_adapters = DB_ADAPTERS
     end
 
-    opts.on("--quick", "quick run on Postgres, ruby #{RUBY_VERSIONS.last} and rails #{RAILS_VERSIONS.last}") do
+    opts.on("--quick", "quick run on PostgreSQL, ruby #{RUBY_VERSIONS.last} and rails #{RAILS_VERSIONS.last}") do
       o.ruby_versions  = [RUBY_VERSIONS.last]
       o.rails_versions = [RAILS_VERSIONS.last]
       o.db_adapters = ["postgresql"]

data/spec/column_default_spec.rb

@@ -70,14 +70,12 @@ describe "Column definition" do
         end
       end
 
-      if SchemaPlusHelpers.mysql?
-        it "should raise an error" do
-          expect(@raised_argument_error).to be_a ArgumentError
-        end
-      else
-        it "should use NOW() as the default" do
-          is_expected.to match @nowish
-        end
+      it "should use NOW() as the default", :mysql => :skip do
+        is_expected.to match @nowish
+      end
+
+      it "should raise an error", :mysql => :only do
+        expect(@raised_argument_error).to be_a ArgumentError
       end
     end
 
@@ -90,29 +88,25 @@ describe "Column definition" do
         end
       end
 
-      if SchemaPlusHelpers.mysql?
-        it "should raise an error" do
-          expect(@raised_argument_error).to be_a ArgumentError
-        end
-      else
-        it "should use NOW() as the default" do
-          is_expected.to match @nowish
-        end
+      it "should use NOW() as the default", :mysql => :skip do
+        is_expected.to match @nowish
+      end
+
+      it "should raise an error", :mysql => :only do
+        expect(@raised_argument_error).to be_a ArgumentError
       end
     end
 
     context "valid expr passed as default" do
-      if SchemaPlusHelpers.mysql?
-        it "raises an error" do
-          expect {
-            define_test_column(:string, :default => { :expr => "(replace('THIS IS A TEST', 'TEST', 'DOG'))" })
-          }.to raise_error ArgumentError
-        end
-      else
-        it "uses the expression" do
+      it "uses the expression", :mysql => :skip do
+        define_test_column(:string, :default => { :expr => "(replace('THIS IS A TEST', 'TEST', 'DOG'))" })
+        is_expected.to eq "THIS IS A DOG"
+      end
+
+      it "raises an error", :mysql => :only do
+        expect {
           define_test_column(:string, :default => { :expr => "(replace('THIS IS A TEST', 'TEST', 'DOG'))" })
-          is_expected.to eq "THIS IS A DOG"
-        end
+        }.to raise_error ArgumentError
       end
     end
 

data/spec/column_spec.rb

@@ -101,32 +101,30 @@ describe "Column" do
       create_table(User, :alpha => { :default => "gabba" }, :beta => {})
     end
 
-    if SchemaPlusHelpers.sqlite3?
-      it "creating a record should raise an error" do
-        expect { User.create!(:alpha => ActiveRecord::DB_DEFAULT, :beta => "hello") }.to raise_error ActiveRecord::StatementInvalid
-      end
-      it "updating a record should raise an error" do
-        u = User.create!(:alpha => "hey", :beta => "hello")
-        expect { u.update_attributes(:alpha => ActiveRecord::DB_DEFAULT, :beta => "goodbye") }.to raise_error ActiveRecord::StatementInvalid
-      end
-    else
+    it "creating a record should respect default expression", :sqlite3 => :skip do
+      User.create!(:alpha => ActiveRecord::DB_DEFAULT, :beta => "hello")
+      expect(User.last.alpha).to eq("gabba")
+      expect(User.last.beta).to eq("hello")
+    end
 
-      it "creating a record should respect default expression" do
-        User.create!(:alpha => ActiveRecord::DB_DEFAULT, :beta => "hello")
-        expect(User.last.alpha).to eq("gabba")
-        expect(User.last.beta).to eq("hello")
-      end
+    it "creating a record should raise an error", :sqlite3 => :only do
+      expect { User.create!(:alpha => ActiveRecord::DB_DEFAULT, :beta => "hello") }.to raise_error ActiveRecord::StatementInvalid
+    end
 
-      it "updating a record should respect default expression" do
-        u = User.create!(:alpha => "hey", :beta => "hello")
-        u.reload
-        expect(u.alpha).to eq("hey")
-        expect(u.beta).to eq("hello")
-        u.update_attributes(:alpha => ActiveRecord::DB_DEFAULT, :beta => "goodbye")
-        u.reload
-        expect(u.alpha).to eq("gabba")
-        expect(u.beta).to eq("goodbye")
-      end
+    it "updating a record should respect default expression", :sqlite3 => :skip do
+      u = User.create!(:alpha => "hey", :beta => "hello")
+      u.reload
+      expect(u.alpha).to eq("hey")
+      expect(u.beta).to eq("hello")
+      u.update_attributes(:alpha => ActiveRecord::DB_DEFAULT, :beta => "goodbye")
+      u.reload
+      expect(u.alpha).to eq("gabba")
+      expect(u.beta).to eq("goodbye")
+    end
+
+    it "updating a record should raise an error", :sqlite3 => :only do
+      u = User.create!(:alpha => "hey", :beta => "hello")
+      expect { u.update_attributes(:alpha => ActiveRecord::DB_DEFAULT, :beta => "goodbye") }.to raise_error ActiveRecord::StatementInvalid
     end
   end
 

data/spec/connections/postgresql/connection.rb

@@ -6,7 +6,7 @@ ActiveRecord::Base.logger = Logger.new(File.open("postgresql.log", "w"))
 ActiveRecord::Base.configurations = {
   'schema_plus' => {
     :adapter => 'postgresql',
-    :username => ENV['POSTGRES_DB_USER'],
+    :username => ENV['POSTGRESQL_DB_USER'],
     :database => 'schema_plus_test',
     :min_messages => 'warning'
   }

data/spec/enum_spec.rb

@@ -0,0 +1,132 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+def enum_fields(name, schema = 'public')
+  sql = <<-SQL
+    SELECT array_to_string(array_agg(E.enumlabel ORDER BY enumsortorder), ' ') AS "values"
+    FROM pg_enum E
+    JOIN pg_type T ON E.enumtypid = T.oid
+    JOIN pg_namespace N ON N.oid = T.typnamespace
+    WHERE N.nspname = '#{schema}' AND T.typname = '#{name}'
+    GROUP BY T.oid;
+  SQL
+
+  data = ActiveRecord::Base.connection.select_all(sql)
+  return nil if data.empty?
+  data[0]['values'].split(' ')
+end
+
+describe 'enum', :postgresql => :only do
+  before(:all) do ActiveRecord::Migration.verbose = false end
+
+  let(:migration) { ActiveRecord::Migration }
+
+  describe 'enums' do
+    it 'should return all enums' do
+      begin
+        migration.execute 'create schema cmyk'
+        migration.create_enum 'color', 'red', 'green', 'blue'
+        migration.create_enum 'color', 'cyan', 'magenta', 'yellow', 'black', schema: 'cmyk'
+
+        expect(migration.enums).to match_array [['cmyk', 'color', %w|cyan magenta yellow black|], ['public', 'color', %w|red green blue|]]
+      ensure
+        migration.drop_enum 'color'
+        migration.execute 'drop schema cmyk cascade'
+      end
+    end
+  end
+
+  describe 'create_enum' do
+    it 'should create enum with given values' do
+      begin
+        migration.create_enum 'color', *%w|red green blue|
+        expect(enum_fields('color')).to eq(%w|red green blue|)
+      ensure
+        migration.execute 'DROP TYPE IF EXISTS color'
+      end
+    end
+
+    it 'should create enum with schema' do
+      begin
+        migration.execute 'CREATE SCHEMA colors'
+        migration.create_enum 'color', *%|red green blue|, schema: 'colors'
+        expect(enum_fields('color', 'colors')).to eq(%w|red green blue|)
+      ensure
+        migration.execute 'DROP SCHEMA IF EXISTS colors CASCADE'
+      end
+    end
+
+    it 'should escape enum value' do
+      begin
+        migration.create_enum('names', "O'Neal")
+        expect(enum_fields('names')).to eq(["O'Neal"])
+      ensure
+        migration.execute "DROP TYPE IF EXISTS names"
+      end
+    end
+
+    it 'should escape schame name and enum name' do
+      begin
+        migration.execute 'CREATE SCHEMA "select"'
+        migration.create_enum 'where', *%|red green blue|, schema: 'select'
+        expect(enum_fields('where', 'select')).to eq(%w|red green blue|)
+      ensure
+        migration.execute 'DROP SCHEMA IF EXISTS "select" CASCADE'
+      end
+    end
+
+  end
+
+  describe 'alter_enum' do
+    before(:each) do migration.create_enum('color', 'red', 'green', 'blue') end
+    after(:each) do migration.execute 'DROP TYPE IF EXISTS color' end
+
+    it 'should add new value after all values' do
+      migration.alter_enum('color', 'magenta')
+      expect(enum_fields('color')).to eq(%w|red green blue magenta|)
+    end
+
+    it 'should add new value after existed' do
+      migration.alter_enum('color', 'magenta', after: 'red')
+      expect(enum_fields('color')).to eq(%w|red magenta green blue|)
+    end
+
+    it 'should add new value before existed' do
+      migration.alter_enum('color', 'magenta', before: 'green')
+      expect(enum_fields('color')).to eq(%w|red magenta green blue|)
+    end
+
+    it 'should add new value within given schema' do
+      begin
+        migration.execute 'CREATE SCHEMA colors'
+        migration.create_enum('color', 'red', schema: 'colors')
+        migration.alter_enum('color', 'green', schema: 'colors')
+
+        expect(enum_fields('color', 'colors')).to eq(%w|red green|)
+      ensure
+        migration.execute 'DROP SCHEMA colors CASCADE'
+      end
+    end
+  end
+
+  describe 'drop_enum' do
+    it 'should drop enum with given name' do
+      migration.execute "CREATE TYPE color AS ENUM ('red', 'blue')"
+      expect(enum_fields('color')).to eq(%w|red blue|)
+      migration.drop_enum('color')
+
+      expect(enum_fields('color')).to be_nil
+    end
+
+    it 'should drop enum within given name and schema' do
+      begin
+        migration.execute "CREATE SCHEMA colors; CREATE TYPE colors.color AS ENUM ('red', 'blue')"
+        expect(enum_fields('color', 'colors')).to eq(%w|red blue|)
+        migration.drop_enum('color', schema: 'colors')
+
+        expect(enum_fields('color', 'colors')).to be_nil
+      ensure
+        migration.execute "DROP SCHEMA colors CASCADE"
+      end
+    end
+  end
+end

data/spec/foreign_key_spec.rb

@@ -79,25 +79,12 @@ describe "Foreign Key" do
       class Comment < ::ActiveRecord::Base ; end
     end
 
-    if SchemaPlusHelpers.sqlite3?
 
-      it "raises an exception when attempting to add" do
-        expect { 
-          add_foreign_key(:posts, :author_id, :users, :id, :on_update => :cascade, :on_delete => :restrict)
-        }.to raise_error(NotImplementedError)
-      end
-
-      it "raises an exception when attempting to remove" do
-        expect { 
-          remove_foreign_key(:posts, "dummy")
-        }.to raise_error(NotImplementedError)
-      end
-
-    else
+    context "works", :sqlite3 => :skip do
 
       context "when is added", "posts(author_id)" do
 
-        before(:each) do 
+        before(:each) do
           add_foreign_key(:posts, :author_id, :users, :id, :on_update => :cascade, :on_delete => :restrict)
         end
 
@@ -186,6 +173,22 @@ describe "Foreign Key" do
       end
 
     end
+
+    context "raises an exception", :sqlite3 => :only do
+
+      it "when attempting to add" do
+        expect {
+          add_foreign_key(:posts, :author_id, :users, :id, :on_update => :cascade, :on_delete => :restrict)
+        }.to raise_error(NotImplementedError)
+      end
+
+      it "when attempting to remove" do
+        expect {
+          remove_foreign_key(:posts, "dummy")
+        }.to raise_error(NotImplementedError)
+      end
+
+    end
   end
 
   protected