schema_plus 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4482f0825b25fe83cd40a915432b6ad80ffd7ba
-  data.tar.gz: 91a6a499ca49d9a76ee33be36ab3e25e9d94369d
+  metadata.gz: 8894d9c9a340bef4433ef8cdafeda27802aea3d7
+  data.tar.gz: e9f724492b719a928460d071891af9aa98ab2a9e
 SHA512:
-  metadata.gz: 654b22739dde19ab529e5e1517e61f60b6d1ecb9d15a76e5d9baf1b5c50eccf975410409512a0c35327bb4a1dea164a8838fcb137e38e18c596a3284aef938a4
-  data.tar.gz: 6e3f70498af24d967fe475dfadc9ee85f96731002eadd44eef5857314b5e136660c4f9e2ae7dea5d9cd57a8a6aef33d09efb011ddb5d2490374b782a1dd4a07c
+  metadata.gz: 1959ab185f75834d483af81b45009ea13678528bab3f3fdfa9799cb2a136fac56167a6683e31144fded7e26399b6f02f75bc82951ee937d5b1167a83112874cc
+  data.tar.gz: ef5155047bc0700c50f0a8d8dee7c8632c0c7c7025ea37ee6181801cf59d5aa316bf23856106e67d9d8742173a8726bf3730df25000dc7fdd5077a6c31d85ac1

data/.travis.yml

@@ -1,8 +1,9 @@
 # This file was auto-generated by the schema_dev tool, based on the data in
-#                 ./schema_dev.yml 
+#                 ./schema_dev.yml
 # Please do not edit this file; any changes will be overwritten next time
 # schema_dev gets run.
 ---
+sudo: false
 rvm:
 - 1.9.3
 - 2.1.3
@@ -18,29 +19,42 @@ gemfile:
 - gemfiles/rails-4.1/Gemfile.mysql2
 - gemfiles/rails-4.1/Gemfile.postgresql
 - gemfiles/rails-4.1/Gemfile.sqlite3
+- gemfiles/rails-4.2/Gemfile.mysql2
+- gemfiles/rails-4.2/Gemfile.postgresql
+- gemfiles/rails-4.2/Gemfile.sqlite3
+env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
 before_script: bundle exec rake create_databases
 after_script: bundle exec rake drop_databases
-env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER="travis"
+script: bundle exec rake travis
 matrix:
   exclude:
   - rvm: jruby
     gemfile: gemfiles/rails-3.2/Gemfile.sqlite3
-    env: POSTGRESQL_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: POSTGRESQL_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: POSTGRESQL_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: POSTGRESQL_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: POSTGRESQL_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: POSTGRESQL_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: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER="travis"
+    env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
+  - rvm: jruby
+    gemfile: gemfiles/rails-4.2/Gemfile.mysql2
+    env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
+  - rvm: jruby
+    gemfile: gemfiles/rails-4.2/Gemfile.postgresql
+    env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
+  - rvm: jruby
+    gemfile: gemfiles/rails-4.2/Gemfile.sqlite3
+    env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Change Log
 
+## 1.8.0
+
+* Rails 4.2 now supported.  Thanks to [@methodmissing](https://github.com/methodmissing) and [@dimonzozo](https://github.com/dimonzozo)
+* Padrino compatibility.  Thanks to [@thmzlt](https://github.com/thmzlt)
+* Internal: Now use our own drop_view function rather than duplicating code.  Thanks to [@robertomiranda](https://github.com/robertomiranda)
+
 ### 1.7.1
 
 * Eliminate warnings when ruby is in verbose mode

data/README.md

@@ -9,15 +9,16 @@ For added rails DRYness see also the gems
 [schema_associations](http://rubygems.org/gems/schema_associations) and
 [schema_validations](http://rubygems.org/gems/schema_validations)
 
-[![Gem Version](https://badge.fury.io/rb/schema_plus.png)](http://badge.fury.io/rb/schema_plus)
-[![Build Status](https://secure.travis-ci.org/SchemaPlus/schema_plus.png)](http://travis-ci.org/SchemaPlus/schema_plus)
-[![Dependency Status](https://gemnasium.com/SchemaPlus/schema_plus.png)](https://gemnasium.com/SchemaPlus/schema_plus)
+[![Gem Version](https://badge.fury.io/rb/schema_plus.svg)](http://badge.fury.io/rb/schema_plus)
+[![Build Status](https://secure.travis-ci.org/SchemaPlus/schema_plus.svg)](http://travis-ci.org/SchemaPlus/schema_plus)
+[![Coverage Status](https://img.shields.io/coveralls/SchemaPlus/schema_plus.svg)](https://coveralls.io/r/SchemaPlus/schema_plus)
+[![Dependency Status](https://gemnasium.com/lomba/schema_plus.svg)](https://gemnasium.com/SchemaPlus/schema_plus)
 
 ## Compatibility
 
 SchemaPlus supports all combinations of:
 
-*   Rails/ActiveRecord 3.2, 4.0, and 4.1
+*   Rails/ActiveRecord 3.2, 4.0, 4.1, and 4.2
 *   PostgreSQL, MySQL (using mysql2 gem; mysql gem only supported with Rails
     3.2), or SQLite3 (using sqlite3 >= 3.7.7 for foreign key support, >= 3.8 for partial indexes)
 *   MRI Ruby >= 1.9.3
@@ -57,7 +58,7 @@ table definition:
     add_index :parts, :product_code, unique: true
 
 But with SchemaPlus you can specify your indexes when you define each column,
-with options as desired
+with options as desired.  (Rails 4.2 introduced this same capability. Yay! But SchemaPlus still adds some shorthands that aren't in Rails 4.2.)
 
     # More DRY way...
     create_table :parts do |t|
@@ -335,4 +336,6 @@ Schema_plus has a full set of rspec tests.  [travis-ci](http://travis-ci.org/Sch
 
     $ schema_dev rspec
 
+
 For more details, see the [schema_dev](https://github.com/SchemaPlus/schema_dev) README.
+

data/gemfiles/Gemfile.base

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 gemspec :path => File.expand_path('..', __FILE__)
 
-gem "byebug" if RUBY_VERSION > "2"
+platform :ruby do
+    gem "byebug" if RUBY_VERSION > "2"
+end

data/gemfiles/{rails-edge → rails-4.2}/Gemfile.base

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

data/gemfiles/{rails-edge → rails-4.2}/Gemfile.mysql2

@@ -7,4 +7,4 @@ end
 
 platform :jruby do
   gem 'activerecord-jdbcmysql-adapter'
-end
+end

data/gemfiles/{rails-edge → rails-4.2}/Gemfile.postgresql

@@ -7,4 +7,4 @@ end
 
 platform :jruby do
   gem 'activerecord-jdbcpostgresql-adapter'
-end
+end

data/gemfiles/{rails-edge → rails-4.2}/Gemfile.sqlite3

@@ -7,4 +7,4 @@ end
 
 platform :jruby do
   gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
-end
+end

data/lib/schema_plus.rb

@@ -1,6 +1,8 @@
+require 'active_record'
 require 'valuable'
 
 require 'schema_plus/version'
+require 'schema_plus/active_record/attribute'
 require 'schema_plus/active_record/base'
 require 'schema_plus/active_record/column_options_handler'
 require 'schema_plus/active_record/db_default'
@@ -137,6 +139,10 @@ module SchemaPlus
       ::ActiveRecord::ConnectionAdapters::AbstractAdapter::SchemaCreation.send(:include, SchemaPlus::ActiveRecord::ConnectionAdapters::AbstractAdapter::VisitTableDefinition)
     end
 
+    if "#{::ActiveRecord::VERSION::MAJOR}.#{::ActiveRecord::VERSION::MINOR}".to_r >= "4.2".to_r
+      require 'active_record/connection_adapters/abstract_mysql_adapter'
+      ::ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter::SchemaCreation.send(:include, SchemaPlus::ActiveRecord::ConnectionAdapters::AbstractAdapter::VisitTableDefinition)
+    end
   end
 
   def self.insert #:nodoc:
@@ -147,6 +153,7 @@ module SchemaPlus
     ::ActiveRecord::Schema.send(:include, SchemaPlus::ActiveRecord::Schema)
     ::ActiveRecord::SchemaDumper.send(:include, SchemaPlus::ActiveRecord::SchemaDumper)
     ::ActiveRecord.const_set(:DB_DEFAULT, SchemaPlus::ActiveRecord::DB_DEFAULT)
+    ::ActiveRecord::Attribute.send(:include, SchemaPlus::ActiveRecord::Attribute) if defined? ::ActiveRecord::Attribute
   end
 
 end

data/lib/schema_plus/active_record/attribute.rb

@@ -0,0 +1,19 @@
+module SchemaPlus
+  module ActiveRecord
+    module Attribute
+      def self.included(base)
+        base.alias_method_chain :original_value, :schema_plus
+      end
+
+      def original_value_with_schema_plus
+        # prevent attempts to cast DB_DEFAULT to the attributes type.
+        # We want to keep it as DB_DEFAULT so that we can handle it when
+        # generating the sql.
+        return DB_DEFAULT if value_before_type_cast == DB_DEFAULT
+        original_value_without_schema_plus
+      end
+
+    end
+  end
+end
+

data/lib/schema_plus/active_record/column_options_handler.rb

@@ -1,5 +1,22 @@
 module SchemaPlus::ActiveRecord
   module ColumnOptionsHandler
+    def schema_plus_normalize_column_options(options)
+      # replace some shortcuts with full versions
+      case options[:index]
+      when true then options[:index] = {}
+      when :unique then options[:index] = { :unique => true }
+      when Hash
+        if options[:index][:length].is_a? Hash
+          normalize = if "#{::ActiveRecord::VERSION::MAJOR}.#{::ActiveRecord::VERSION::MINOR}".to_r >= "4.2".to_r
+                        :stringify_keys!
+                      else
+                        :symbolize_keys!
+                      end
+          options[:index][:length].send normalize
+        end
+      end
+    end
+
     def schema_plus_handle_column_options(table_name, column_name, column_options, opts = {}) #:nodoc:
       config = opts[:config] || SchemaPlus.config
       fk_args = get_fk_args(table_name, column_name, column_options, config)
@@ -79,8 +96,6 @@ module SchemaPlus::ActiveRecord
 
 
     def column_index(table_name, column_name, options) #:nodoc:
-      options = {} if options == true
-      options = { :unique => true } if options == :unique
       column_name = [column_name] + Array.wrap(options.delete(:with)).compact
       add_index(table_name, column_name, options)
     end

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

@@ -49,7 +49,9 @@ module SchemaPlus
         # to first drop the view if it already exists.
         def create_view(view_name, definition, options={})
           definition = definition.to_sql if definition.respond_to? :to_sql
-          execute "DROP VIEW IF EXISTS #{quote_table_name(view_name)}" if options[:force]
+          if options[:force]
+            drop_view(view_name, if_exists: true)
+          end
           execute "CREATE VIEW #{quote_table_name(view_name)} AS #{definition}"
         end
 
@@ -84,7 +86,9 @@ module SchemaPlus
         end
 
         def _build_foreign_key(table_name, column_names, references_table_name, references_column_names, options = {}) #:nodoc:
-          ForeignKeyDefinition.new(options[:name] || ForeignKeyDefinition.default_name(table_name, column_names), table_name, column_names, AbstractAdapter.proper_table_name(references_table_name), references_column_names, options[:on_update], options[:on_delete], options[:deferrable])
+          options.merge!(:column_names => column_names, :references_column_names => references_column_names)
+          options.reverse_merge!(:name => ForeignKeyDefinition.default_name(table_name, column_names))
+          ForeignKeyDefinition.new(table_name, AbstractAdapter.proper_table_name(references_table_name), options)
         end
 
         def self.proper_table_name(name)

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

@@ -1,3 +1,43 @@
+if "#{::ActiveRecord::VERSION::MAJOR}.#{::ActiveRecord::VERSION::MINOR}".to_r < "4.2".to_r
+  class ActiveRecord::ConnectionAdapters::ForeignKeyDefinition < Struct.new(:from_table, :to_table, :options) #:nodoc:
+    # The name of the foreign key constraint
+    def name
+      options[:name]
+    end
+
+    def column
+      options[:column]
+    end
+
+    def primary_key
+      options[:primary_key] || default_primary_key
+    end
+
+    # The ON_DELETE behavior for the constraint.  See above for the
+    # possible values.
+    def on_delete
+      options[:on_delete]
+    end
+
+    # The ON_UPDATE behavior for the constraint.  See above for the
+    # possible values.
+    def on_update
+      options[:on_update]
+    end
+
+    def custom_primary_key?
+      options[:primary_key] != default_primary_key
+    end
+
+    private
+    def default_primary_key
+      "id"
+    end
+  end
+else
+  require 'active_record/connection_adapters/abstract/schema_definitions'
+end
+
 module SchemaPlus
   module ActiveRecord
     module ConnectionAdapters
@@ -13,48 +53,24 @@ module SchemaPlus
       # The deferrable attribute can take on the following values:
       #   true
       #   :initially_deferred
-      class ForeignKeyDefinition
-
-        # The name of the foreign key constraint
-        attr_reader :name
-
-        # The name of the table the constraint is defined on
-        attr_reader :table_name
+      class ForeignKeyDefinition < ::ActiveRecord::ConnectionAdapters::ForeignKeyDefinition
 
         # The list of column names that are constrained (as strings).
         attr_reader :column_names
 
-        # The foreign table that is referenced by the constraint
-        attr_reader :references_table_name
-
         # The list of column names (as strings) of the foreign table that are referenced
         # by the constraint
         attr_reader :references_column_names
-
-        # The ON_UPDATE behavior for the constraint.  See above for the
-        # possible values.
-        attr_reader :on_update
-
-        # The ON_DELETE behavior for the constraint.  See above for the
-        # possible values.
-        attr_reader :on_delete
-
-        # True if the constraint is deferrable
-        attr_reader :deferrable
-
         # :enddoc:
 
         ACTIONS = { :cascade => "CASCADE", :restrict => "RESTRICT", :set_null => "SET NULL", :set_default => "SET DEFAULT", :no_action => "NO ACTION" }.freeze
 
-        def initialize(name, table_name, column_names, references_table_name, references_column_names, on_update = nil, on_delete = nil, deferrable = nil)
-          @name = name
-          @table_name = unquote(table_name)
-          @column_names = unquote(Array.wrap(column_names))
-          @references_table_name = unquote(references_table_name)
-          @references_column_names = unquote(Array.wrap(references_column_names))
-          @on_update = on_update
-          @on_delete = on_delete
-          @deferrable = deferrable
+        def initialize(from_table, to_table, options) 
+          super
+          @from_table = unquote(from_table)
+          @to_table = unquote(to_table)
+          @column_names = unquote(Array.wrap(options.delete(:column_names)))
+          @references_column_names = unquote(Array.wrap(options.delete(:references_column_names)))
 
           ACTIONS.has_key?(on_update) or raise(ArgumentError, "invalid :on_update action: #{on_update.inspect}") if on_update
           ACTIONS.has_key?(on_delete) or raise(ArgumentError, "invalid :on_delete action: #{on_delete.inspect}") if on_delete
@@ -64,6 +80,19 @@ module SchemaPlus
           end
         end
 
+        def table_name
+          from_table
+        end
+
+        def references_table_name
+          to_table
+        end
+
+        # True if the constraint is deferrable
+        def deferrable
+          options[:deferrable]
+        end
+
         # Dumps a definition of foreign key.
         def to_dump(opts={})
           dump = (opts[:inline] ? "  t.foreign_key" : "add_foreign_key #{table_name.inspect},")

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

@@ -59,12 +59,18 @@ module SchemaPlus
 
         # implement cascade by removing foreign keys
         def drop_table(name, options={})
-          reverse_foreign_keys(name).each{ |foreign_key| remove_foreign_key(foreign_key.table_name, foreign_key.name) } if options[:cascade]
-          sql = "DROP"
-          sql += " TEMPORARY" if options[:temporary]
-          sql += " TABLE"
-          sql += " IF EXISTS" if options[:if_exists]
+          if options[:cascade]
+            reverse_foreign_keys(name).each do |foreign_key|
+              remove_foreign_key(foreign_key.table_name, foreign_key.name)
+            end
+          end
+
+          sql = 'DROP'
+          sql += ' TEMPORARY' if options[:temporary]
+          sql += ' TABLE'
+          sql += ' IF EXISTS' if options[:if_exists]
           sql += " #{quote_table_name(name)}"
+
           execute sql
         end
 
@@ -108,10 +114,15 @@ module SchemaPlus
                 on_update = on_update ? on_update.downcase.gsub(' ', '_').to_sym : :restrict
                 on_delete = on_delete ? on_delete.downcase.gsub(' ', '_').to_sym : :restrict
 
-                foreign_keys << ForeignKeyDefinition.new(name,
-                                                         namespace_prefix + table_name, column_names.gsub('`', '').split(', '),
-                                                         references_table_name, references_column_names.gsub('`', '').split(', '),
-                                                         on_update, on_delete)
+                options = { :name => name,
+                            :on_delete => on_delete,
+                            :on_update => on_update,
+                            :column_names => column_names.gsub('`', '').split(', '),
+                            :references_column_names => references_column_names.gsub('`', '').split(', ') }
+
+                foreign_keys << ForeignKeyDefinition.new(namespace_prefix + table_name,
+                                                         references_table_name,
+                                                         options)
               end
             end
           end
@@ -127,27 +138,27 @@ module SchemaPlus
            AND referenced_table_schema = table_schema
          ORDER BY constraint_name, ordinal_position;
           SQL
-          current_foreign_key = nil
-          foreign_keys = []
-
-          namespace_prefix = table_namespace_prefix(table_name)
 
-          results.each do |row|
-            next unless table_name_without_namespace(table_name).casecmp(row["referenced_table_name"]) == 0
-            if current_foreign_key != row["constraint_name"]
-                referenced_table_name = row["table_name"]
-                referenced_table_name = namespace_prefix + referenced_table_name if table_namespace_prefix(referenced_table_name).blank?
-                references_table_name = row["referenced_table_name"]
-                references_table_name = namespace_prefix + references_table_name if table_namespace_prefix(references_table_name).blank?
-              foreign_keys << ForeignKeyDefinition.new(row["constraint_name"], referenced_table_name, [], references_table_name, [])
-              current_foreign_key = row["constraint_name"]
-            end
+          constraints = results.to_a.group_by do |r|
+            r.values_at('constraint_name', 'table_name', 'referenced_table_name')
+          end
 
-            foreign_keys.last.column_names << row["column_name"]
-            foreign_keys.last.references_column_names << row["referenced_column_name"]
+          from_table_constraints = constraints.select do |(_, _, to_table), _|
+            table_name_without_namespace(table_name).casecmp(to_table) == 0
           end
 
-          foreign_keys
+          from_table_constraints.map do |(constraint_name, from_table, to_table), columns|
+            from_table = table_namespace_prefix(from_table) + from_table
+            to_table = table_namespace_prefix(to_table) + to_table
+
+            options = {
+              :name => constraint_name,
+              :column_names => columns.map { |row| row['column_name'] },
+              :references_column_names => columns.map { |row| row['referenced_column_name'] }
+            }
+
+            ForeignKeyDefinition.new(from_table, to_table, options)
+          end
         end
 
         def views(name = nil)

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

@@ -9,22 +9,38 @@ module SchemaPlus
           if defined?(JRUBY_VERSION)
             base.alias_method_chain :default_value, :schema_plus
           else
-            base.class_eval do
-              class << self
-                alias_method_chain :extract_value_from_default, :schema_plus
+            if "#{::ActiveRecord::VERSION::MAJOR}.#{::ActiveRecord::VERSION::MINOR}".to_r < "4.2".to_r
+              base.class_eval do
+                class << self
+                  alias_method_chain :extract_value_from_default, :schema_plus
+                end
               end
             end
           end
         end
 
-        def initialize(name, default, sql_type = nil, null = true)
-          if default.is_a? Hash
-            if default[:expr]
-              @default_expr = default[:expr]
+        if "#{::ActiveRecord::VERSION::MAJOR}.#{::ActiveRecord::VERSION::MINOR}".to_r <= "4.1".to_r
+          def initialize(name, default, sql_type = nil, null = true)
+            if default.is_a? Hash
+              if default[:expr]
+                @default_expr = default[:expr]
+              end
+              default = nil
             end
-            default = nil
+            super(name, default, sql_type, null)
+          end
+        else
+          def initialize(name, default, cast_type, sql_type = nil, null = true, default_function = nil)
+            if sql_type =~ /\[\]$/
+              @array = true
+              super(name, default, cast_type, sql_type[0..sql_type.length - 3], null)
+            else
+              @array = false
+              super(name, default, cast_type, sql_type, null)
+            end
+
+            @default_function = @default_expr = default_function
           end
-          super(name, default, sql_type, null)
         end
 
         def default_value_with_schema_plus(default)
@@ -87,6 +103,7 @@ module SchemaPlus
           options = {} if options.nil?  # some callers explicitly pass options=nil
           column_name, options = [], column_name if column_name.is_a?(Hash)
           column_names = Array(column_name).compact
+          column_names += Array(options[:with] || [])
           if column_names.empty?
             raise ArgumentError, "No columns and :expression missing from options - cannot create index" unless options[:expression]
             raise ArgumentError, "Index name not given. Pass :name option" unless options[:name]
@@ -352,6 +369,12 @@ module SchemaPlus
           execute "DROP TYPE #{enum_name(name, options[:schema])}"
         end
 
+        # pg gem defines a drop_table with fewer options than our Abstract
+        # one, so use the abstract one instead
+        def drop_table(name, options={})
+          SchemaPlus::ActiveRecord::ConnectionAdapters::AbstractAdapter.instance_method(:drop_table).bind(self).call(name, options)
+        end
+
         private
 
         def enum_name(name, schema)
@@ -390,10 +413,16 @@ module SchemaPlus
               on_update = on_update ? on_update.downcase.gsub(' ', '_').to_sym : :no_action
               on_delete = on_delete ? on_delete.downcase.gsub(' ', '_').to_sym : :no_action
 
-              foreign_keys << ForeignKeyDefinition.new(name,
-                                                       from_table_name, column_names.split(', '),
-                                                       references_table_name.sub(/^"(.*)"$/, '\1'), references_column_names.split(', '),
-                                                       on_update, on_delete, deferrable)
+              options = { :name => name,
+                          :on_delete => on_delete,
+                          :on_update => on_update,
+                          :column_names => column_names.split(', '),
+                          :references_column_names => references_column_names.split(', '),
+                          :deferrable => deferrable }
+
+              foreign_keys << ForeignKeyDefinition.new(from_table_name,
+                                                       references_table_name.sub(/^"(.*)"$/, '\1'),
+                                                       options)
             end
           end
 

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

@@ -5,6 +5,7 @@ module SchemaPlus::ActiveRecord::ConnectionAdapters
       base.class_eval do
         alias_method_chain :create_table, :schema_plus
         alias_method_chain :add_reference, :schema_plus unless ::ActiveRecord::VERSION::MAJOR.to_i < 4
+        alias_method_chain :add_index_options, :schema_plus if "#{::ActiveRecord::VERSION::MAJOR}.#{::ActiveRecord::VERSION::MINOR}".to_r >= "4.2".to_r
         include AddIndex
       end
     end
@@ -52,6 +53,11 @@ module SchemaPlus::ActiveRecord::ConnectionAdapters
       end
     end
 
+    def add_index_options_with_schema_plus(table_name, column_name, options = {})
+      columns = options.delete(:with) { |_| [] }
+      add_index_options_without_schema_plus(table_name, Array(column_name).concat(Array(columns).map(&:to_s)), options)
+    end
+
     def self.add_index_exception_handler(connection, table, columns, options, e) #:nodoc:
       raise unless e.message.match(/["']([^"']+)["'].*already exists/)
       name = $1

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

@@ -8,6 +8,16 @@ module SchemaPlus
           end
           super(name, default, sql_type, null)
         end
+
+        # AR 4.2 uses default_function rather than default_expr
+        def self.included(base)
+          base.alias_method_chain :default_function, :sqlite3 if base.instance_methods.include? :default_function
+        end
+
+        def default_function_with_sqlite3
+          @default_function ||= "(#{default})" if default =~ /DATETIME/
+          default_function_without_sqlite3
+        end
       end
 
       # SchemaPlus includes an Sqlite3 implementation of the AbstractAdapter
@@ -20,12 +30,15 @@ module SchemaPlus
           base.class_eval do
             alias_method_chain :indexes, :schema_plus
             alias_method_chain :rename_table, :schema_plus
+            alias_method_chain :tables, :schema_plus
           end
 
           if ::ActiveRecord::VERSION::MAJOR.to_i < 4
             ::ActiveRecord::ConnectionAdapters::SQLiteColumn.send(:include, SQLiteColumn) unless ::ActiveRecord::ConnectionAdapters::SQLiteColumn.include?(SQLiteColumn)
-          else
+          elsif defined? ::ActiveRecord::ConnectionAdapters::SQLite3Column
             ::ActiveRecord::ConnectionAdapters::SQLite3Column.send(:include, SQLiteColumn) unless ::ActiveRecord::ConnectionAdapters::SQLite3Column.include?(SQLiteColumn)
+          else # in ActiveRecord::VERSION 4.2 there's no SQLite3Column
+            ::ActiveRecord::ConnectionAdapters::Column.send(:include, SQLiteColumn) unless ::ActiveRecord::ConnectionAdapters::Column.include?(SQLiteColumn)
           end
         end
 
@@ -84,6 +97,11 @@ module SchemaPlus
           get_foreign_keys(nil, name).select{|definition| definition.references_table_name == table_name}
         end
 
+        def tables_with_schema_plus(*args)
+          # AR 4.2 explicitly looks for views or tables, but only for sqlite3.  so take away the tables.
+          tables_without_schema_plus(*args) - views
+        end
+
         def views(name = nil)
           execute("SELECT name FROM sqlite_master WHERE type='view'", name).collect{|row| row["name"]}
         end
@@ -121,10 +139,17 @@ module SchemaPlus
               on_update = on_update ? on_update.downcase.gsub(' ', '_').to_sym : :no_action
               on_delete = on_delete ? on_delete.downcase.gsub(' ', '_').to_sym : :no_action
               deferrable = deferrable ? (initially_deferred ? :initially_deferred : true) : false
-              foreign_keys << ForeignKeyDefinition.new(name,
-                                                       table_name, column_names,
-                                                       references_table_name, references_column_names,
-                                                       on_update, on_delete, deferrable)
+
+              options = { :name => name,
+                          :on_update => on_update,
+                          :on_delete => on_delete,
+                          :column_names => column_names,
+                          :references_column_names => references_column_names,
+                          :deferrable => deferrable }
+
+              foreign_keys << ForeignKeyDefinition.new(table_name,
+                                                       references_table_name,
+                                                       options)
             end
           end
 

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

@@ -109,6 +109,7 @@ module SchemaPlus::ActiveRecord::ConnectionAdapters
     def references_with_schema_plus(*args) #:nodoc:
       options = args.extract_options!
       options[:references] = nil if options[:polymorphic]
+      schema_plus_normalize_column_options(options)
       options[:_index] = options.delete(:index) unless options[:polymorphic] # usurp index creation from AR
       args << options
       references_without_schema_plus(*args)
@@ -119,13 +120,20 @@ module SchemaPlus::ActiveRecord::ConnectionAdapters
     def belongs_to_with_schema_plus(*args) #:nodoc:
       options = args.extract_options!
       options[:references] = nil if options[:polymorphic]
+      schema_plus_normalize_column_options(options)
       options[:_index] = options.delete(:index) unless options[:polymorphic] # usurp index creation from AR
       args << options
       belongs_to_without_schema_plus(*args)
     end
 
     def column_with_schema_plus(name, type, options = {}) #:nodoc:
+      schema_plus_normalize_column_options(options)
+      # prevent AR from seeing :index => false as a request for an index
+      if noindex = options[:index] == false
+        options.delete(:index)
+      end
       column_without_schema_plus(name, type, options)
+      options[:index] = false if noindex
       schema_plus_handle_column_options(self.name, name, options, :config => schema_plus_config)
       self
     end
@@ -144,7 +152,9 @@ module SchemaPlus::ActiveRecord::ConnectionAdapters
     end
 
     def foreign_key(column_names, references_table_name, references_column_names, options = {})
-      @foreign_keys << ForeignKeyDefinition.new(options[:name] || ForeignKeyDefinition.default_name(self.name, column_names), self.name, column_names, AbstractAdapter.proper_table_name(references_table_name), references_column_names, options[:on_update], options[:on_delete], options[:deferrable])
+      options.merge!(:column_names => column_names, :references_column_names => references_column_names)
+      options.reverse_merge!(:name => ForeignKeyDefinition.default_name(self.name, column_names))
+      @foreign_keys << ForeignKeyDefinition.new(self.name, AbstractAdapter.proper_table_name(references_table_name), options)
       self
     end
 

data/lib/schema_plus/active_record/foreign_keys.rb

@@ -121,12 +121,14 @@ module SchemaPlus::ActiveRecord
     # automatically create an index for foreign keys if you don't.)
     #
     def add_column(table_name, column_name, type, options = {})
+      schema_plus_normalize_column_options(options)
       super
       schema_plus_handle_column_options(table_name, column_name, options)
     end
 
     # Enhances ActiveRecord::Migration#change_column to support indexes and foreign keys same as add_column.
     def change_column(table_name, column_name, type, options = {})
+      schema_plus_normalize_column_options(options)
       super
       schema_plus_handle_column_options(table_name, column_name, options)
     end

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

@@ -11,10 +11,12 @@ module SchemaPlus
             alias_method_chain :add_column, :schema_plus
             alias_method_chain :add_reference, :schema_plus unless ::ActiveRecord::VERSION::MAJOR.to_i < 4
             alias_method_chain :invert_add_index, :schema_plus
+            alias_method_chain :invert_add_foreign_key, :schema_plus if "#{::ActiveRecord::VERSION::MAJOR}.#{::ActiveRecord::VERSION::MINOR}".to_r >= "4.2".to_r
           end
         end
 
         def add_column_with_schema_plus(table_name, name, type, options = {}) #:nodoc:
+          schema_plus_normalize_column_options(options)
           add_column_without_schema_plus(table_name, name, type, options)
           revertable_schema_plus_handle_column_options(table_name, name, options, :config => schema_plus_config)
           self
@@ -69,6 +71,7 @@ module SchemaPlus
           table_name, column_names, references_table_name, references_column_names, options = args
           [:remove_foreign_key, [table_name, column_names, references_table_name, references_column_names, (options||{}).merge(if_exists: true)]]
         end
+        alias :invert_add_foreign_key_with_schema_plus :invert_add_foreign_key
 
         def invert_add_index_with_schema_plus(args)
           table, columns, options = *args

data/lib/schema_plus/active_record/schema_dumper.rb

@@ -59,7 +59,11 @@ module SchemaPlus
           end
         end
 
+      if "#{::ActiveRecord::VERSION::MAJOR}.#{::ActiveRecord::VERSION::MINOR}".to_r < "4.2".to_r
         tables_without_schema_plus(nil)
+      else
+        tables_without_schema_plus(stream)
+      end
 
         @connection.views.each do |view_name|
           next if Array.wrap(::ActiveRecord::SchemaDumper.ignore_tables).any? {|pattern| view_name.match pattern}
@@ -114,8 +118,14 @@ module SchemaPlus
         table_without_schema_plus(table, stream)
         stream_string = stream.string
         @connection.columns(table).each do |column|
-          if !column.default_expr.nil?
-            stream_string.gsub!("\"#{column.name}\"", "\"#{column.name}\", :default => { :expr => #{column.default_expr.inspect} }")
+          if "#{::ActiveRecord::VERSION::MAJOR}.#{::ActiveRecord::VERSION::MINOR}".to_r < "4.2".to_r
+            if !column.default_expr.nil?
+              stream_string.gsub!("\"#{column.name}\"", "\"#{column.name}\", :default => { :expr => #{column.default_expr.inspect} }")
+            end
+          else
+            if !column.default_function.nil?
+              stream_string.gsub!("\"#{column.name}\"", "\"#{column.name}\", :default => { :expr => #{column.default_function.inspect} }")
+            end
           end
         end
         @table_dumps[table] = stream_string

data/lib/schema_plus/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlus
-  VERSION = "1.7.1"
+  VERSION = "1.8.0"
 end

data/schema_dev.yml

@@ -6,6 +6,7 @@ rails:
     - 3.2
     - 4.0
     - 4.1
+    - 4.2
 db:
     - mysql
     - mysql2
@@ -18,12 +19,18 @@ exclude:
   -
     rails: 4.1
     db: mysql
+  -
+    rails: 4.2
+    db: mysql
   -
     ruby: jruby
     rails: 4.0
   -
     ruby: jruby
     rails: 4.1
+  -
+    ruby: jruby
+    rails: 4.2
   -
     ruby: jruby
     db: sqlite3

data/schema_plus.gemspec

@@ -21,10 +21,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency("activerecord", ">= 3.2")
+  s.add_dependency("activerecord", ">= 3.2", "< 4.3")
   s.add_dependency("valuable")
 
-  s.add_development_dependency("schema_dev", "~> 0.1")
+  s.add_development_dependency("schema_dev", "~> 1.2", ">= 1.2.5")
   s.add_development_dependency("rake")
   s.add_development_dependency("rspec", "~> 3.0.0")
   s.add_development_dependency("rdoc")

data/spec/column_spec.rb

@@ -14,7 +14,17 @@ describe "Column" do
       @login = User.columns.find{|column| column.name == "login"}
     end
     it "works properly" do
-      expect(JSON.parse(@login.to_json)).to include("name" => "login", "type" => "string")
+      type = case
+             when "#{::ActiveRecord::VERSION::MAJOR}.#{::ActiveRecord::VERSION::MINOR}".to_r <= "4.1".to_r
+               { "type" => "string" }
+             when SchemaDev::Rspec::Helpers.mysql?
+               { "sql_type" => "varchar(255)" }
+             when SchemaDev::Rspec::Helpers.postgresql?
+               { "sql_type" => "character varying" }
+             when SchemaDev::Rspec::Helpers.sqlite3?
+               { "sql_type" => "varchar" }
+             end
+      expect(JSON.parse(@login.to_json)).to include(type.merge("name" => "login"))
     end
   end
 

data/spec/foreign_key_definition_spec.rb

@@ -2,19 +2,24 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Foreign Key definition" do
 
-  let(:definition) { SchemaPlus::ActiveRecord::ConnectionAdapters::ForeignKeyDefinition.new("posts_user_fkey", :posts, :user, :users, :id) }
+  let(:definition) {
+    options = {:name => "posts_user_fkey", :column_names => :user, :references_column_names => :id}
+    SchemaPlus::ActiveRecord::ConnectionAdapters::ForeignKeyDefinition.new(:posts, :users, options)
+  }
 
   it "dumps to sql with quoted values" do
     expect(definition.to_sql).to eq(%Q{CONSTRAINT posts_user_fkey FOREIGN KEY (#{quote_column_name('user')}) REFERENCES #{quote_table_name('users')} (#{quote_column_name('id')})})
   end
 
   it "dumps to sql with deferrable values" do
-    deferred_definition = SchemaPlus::ActiveRecord::ConnectionAdapters::ForeignKeyDefinition.new("posts_user_fkey", :posts, :user, :users, :id, nil, nil, true)
+    options = {:name => "posts_user_fkey", :column_names => :user, :references_column_names => :id, :deferrable => true}
+    deferred_definition = SchemaPlus::ActiveRecord::ConnectionAdapters::ForeignKeyDefinition.new(:posts, :users, options)
     expect(deferred_definition.to_sql).to eq(%Q{CONSTRAINT posts_user_fkey FOREIGN KEY (#{quote_column_name('user')}) REFERENCES #{quote_table_name('users')} (#{quote_column_name('id')}) DEFERRABLE})
   end
 
   it "dumps to sql with initially deferrable values" do
-    initially_deferred_definition = SchemaPlus::ActiveRecord::ConnectionAdapters::ForeignKeyDefinition.new("posts_user_fkey", :posts, :user, :users, :id, nil, nil, :initially_deferred)
+    options = {:name => "posts_user_fkey", :column_names => :user, :references_column_names => :id, :deferrable => :initially_deferred}
+    initially_deferred_definition = SchemaPlus::ActiveRecord::ConnectionAdapters::ForeignKeyDefinition.new(:posts, :users, options)
     expect(initially_deferred_definition.to_sql).to eq(%Q{CONSTRAINT posts_user_fkey FOREIGN KEY (#{quote_column_name('user')}) REFERENCES #{quote_table_name('users')} (#{quote_column_name('id')}) DEFERRABLE INITIALLY DEFERRED})
   end
 

data/spec/schema_dumper_spec.rb

@@ -96,7 +96,7 @@ describe "Schema dump" do
 
     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'})
+        expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default =>).*2001-09-28.*})
       end
     end
 
@@ -131,7 +131,9 @@ describe "Schema dump" do
     ActiveRecord::Migration.suppress_messages do
       ActiveRecord::Migration.change_column_default :posts, :string_no_default, nil
     end
-    expect(dump_posts).to match(%r{t\.string\s+"string_no_default"\s*$})
+    # mysql2 includes 'limit: 255' in the output.  that's OK, just want to
+    # make sure the full line doesn't have 'default' in it.
+    expect(dump_posts).to match(%r{t\.string\s+"string_no_default"\s*(,\s*limit:\s*\d+)?$})
   end
 
   it "should include foreign_key options" do

data/spec/support/matchers/have_index.rb

@@ -9,6 +9,7 @@ module SchemaPlusMatchers
     end
 
     def matches?(model)
+      @too_many = nil
       @model = model
       indexes = @model.indexes.select { |index| index.columns.to_set == @required_columns }
       if indexes.length > 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Ronen Barzel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-07 00:00:00.000000000 Z
+date: 2014-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -18,6 +18,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -25,6 +28,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: valuable
   requirement: !ruby/object:Gem::Requirement
@@ -45,14 +51,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -169,13 +181,14 @@ files:
 - gemfiles/rails-4.1/Gemfile.mysql2
 - gemfiles/rails-4.1/Gemfile.postgresql
 - gemfiles/rails-4.1/Gemfile.sqlite3
-- gemfiles/rails-edge/Gemfile.base
-- gemfiles/rails-edge/Gemfile.mysql2
-- gemfiles/rails-edge/Gemfile.postgresql
-- gemfiles/rails-edge/Gemfile.sqlite3
+- gemfiles/rails-4.2/Gemfile.base
+- gemfiles/rails-4.2/Gemfile.mysql2
+- gemfiles/rails-4.2/Gemfile.postgresql
+- gemfiles/rails-4.2/Gemfile.sqlite3
 - init.rb
 - lib/rails/tasks/database.rake
 - lib/schema_plus.rb
+- lib/schema_plus/active_record/attribute.rb
 - lib/schema_plus/active_record/base.rb
 - lib/schema_plus/active_record/column_options_handler.rb
 - lib/schema_plus/active_record/connection_adapters/abstract_adapter.rb