schema_plus 1.5.1 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14f770e20ed8fc7090ddc3fd58e95976e6a6ae13
-  data.tar.gz: 999f0ad6bd7a1346dda3ebc152ec2a0f7a430488
+  metadata.gz: 98695abbf9f44e746dda323f7312d0b206b74b33
+  data.tar.gz: f9402bff3980025c1f6a1b6e052f9ec1cf0f2bfe
 SHA512:
-  metadata.gz: 33fdfaee05d32853f87112adc5d156970f4d5bddec6c2f8379a283ad16cf6e9eb3e5adfb84dbf60af476e340f51c15ab6f53d2336877226e670602bbf141d35e
-  data.tar.gz: 3ff056bfd48ea22a5004f3f6760d4bec52127bde7040b65082f2de86fcf00b1353be1a1f46a6b1d37dc04ab87ef0cb6f8146578d985cb126d118b77a670dc124
+  metadata.gz: 1ac7c8fb9f854adb5bd455b19e93427829dffab2ceccbf59044116f1bdee8783acb5d98ede537a9af118e1d44a7872e306700e8ae9f4153c4d523ba7c4da4803
+  data.tar.gz: 521da3cda682a2ab9dc0126a093c3f6b21e5a49a19d7dded7662a5c7d8729671f9a71aa672e01150d4078cf2b076d20974a7a41e825a4616f7c5fae3386bcb72

data/CHANGELOG.md

@@ -0,0 +1,134 @@
+# SchemaPlus
+
+## Change Log
+
+### 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)
+
+### 1.5.2
+
+* For now, pin to rspec 2.* and limit rails to 4.1.1 (issue #158)
+
+### 1.5.1
+
+* Now respects ActiveRecord::SchemaDumper.ignore_tables for views (issue #153)
+
+### 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)
+
+### 1.4.1
+
+* Bug fixes `migration.add_references` with `polymophic: true` (issue #145 and others)
+
+### 1.4.0
+
+* Supports jruby & mysql, thanks to [@rzenha](https://github.com/razenha)
+* Works with MRI ruby & rails 4.1.0beta3
+* Run tests against MRI 2.1.0
+
+### 1.3.3
+
+* Bug fix, dump unique index with expression (Issue #142)
+
+
+### 1.3.2
+
+* Bug fix, remove_index with if_exists but no name
+* Sort indexes alphabetically when dumping, like rails does
+
+### 1.3.1
+
+* Regression bug fix, non-option arguemnts to remove_index
+
+### 1.3.0
+
+* Added :if_exists option for remove_index
+* Initial jruby support (rails 3.2, postgresql), due to efforts of [@donv](https://github.com/donv)
+* Preliminatry groundwork for rails 4.1, due to efforts of [@tovodeverett](https://github.com/tovodeverett)
+* Bug fix for change_table
+* Bug fix for schema_dump postgresql non-btree indexes
+* Bug fix regarding expressions that cast non-string columns to strings in a lower()
+
+### 1.2.0
+*   Now works with rails 4, due to efforts of [@tovodeverett](https://github.com/tovodeverett)
+*   Test against MRI ruby 2.0.0, no longer test against 1.9.2
+
+### 1.1.2
+*   Now works with rails 3.2.13 (fixed railtie initialization)
+
+### 1.1.1
+
+*   Dependency constraint to rails 3.2.12 max, since schema_plus doesn't
+    currently work with 3.2.13.rc2
+
+### 1.1.0
+
+*   Add support for drop_table :cascade => true.  Note that until now,
+    :cascade was implicitly true.  So this change might break existing code
+    that relied on the incorrect implicit cascade behavior.
+*   Add support for :deferrable => :initially_deferred (thanks to
+    [@bhavinkamani](https://github.com/bhavinkamani))
+*   Works with PostGIS (thanks to [@pete](https://github.com/pete))
+*   Bug fix: Circular Reference/Stack Level Too Deep in Column#to_json. 
+    Thanks to [@robdimarco](https://github.com/robdimarco) for tracking down the problem
+*   Bug fix: More robust handling of foreign keys with schema namespaces
+
+
+### 1.0.1
+
+*   README cleanups (thanks to [@denispeplin](https://github.com/denispeplin))
+*   Now raises ArgumentError if index has both :case_sensitive => false and an
+    :expression
+*   Now creates consistent default name for foreign key constraints
+*   Bug fix: respect :length keyword for index (thanks to [@teleological](https://github.com/teleological))
+*   Bug fix: renaming table with multiple foreign key constraints (thanks to
+    [@teleological](https://github.com/teleological))
+*   Bug fix: don't dump :case_sensitive => false for index with an expression
+    that includes "lower(name)".
+*   Bug fix: Properly dump multi-column case-insensitive indexes
+
+
+### 1.0.0
+
+*   No longer support rails < 3.2 and ruby < 1.9
+*   New feature: specify foreign key constraints using :foreign_key => { ...
+    }, motivated in particular to support :name (suggested by [@daniele-m](https://github.com/daniele-m))
+*   New feature: create view using ActiveRecord relation
+*   New feature: `ActiveRecord::DB_DEFAULT` (suggested by
+    [@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))
+*   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
+*   Bug fix: quote default expressions in schema dump (thanks to [@jonleighton](https://github.com/jonleighton))
+*   Bug fix: when removing a foreign key constraint, remove its auto-generated
+    index.
+*   Bug fix: SchemaDumper.ignore_tables needs to support regexps (suggested by
+    [@mtalcott](https://github.com/mtalcott))
+*   Bug fix: More robust handling of Postgresql schema_search path (suggested
+    by [@mtalcott](https://github.com/mtalcott))
+*   Bug fix: Only get index, view, and foreign key information from current
+    schema (thanks to [@bhavinkamani](https://github.com/bhavinkamani))
+
+
+### Earlier releases
+*   0.4.1 - Bug fix: don't attempt foreign key creation for t.belongs_to ...
+    :polymorphic => true
+*   0.4.0 - Add :force for create_view (suggested by [@greglazarev](https://github.com/greglazarev)).  cleanups
+    by [@betelgeuse](https://github.com/betelgeuse)
+*   0.3.4 - Bug fix: regression causing :default => false to be ignored
+*   0.3.3 - Bug fix: properly handle boolean defaults in mysql
+*   0.3.2 - Bug fix: make sure rake db:schema:load initializes schema_plus 
+*   0.3.1 - Bug fix for PostgreSQL schema dump after change_column_default(...
+    nil)
+*   0.3.0 - Add :default => expressions (Thanks to Luke Saunders).  support
+    rails 3.2 and ruby 1.9.3
+*   0.2.1 - Suppress duplicate add_indexes.  compatibility with rails
+    3.2.0.rc2

data/README.md

@@ -17,7 +17,7 @@ For added rails DRYness see also the gems
 
 SchemaPlus supports all combinations of:
 
-*   Rails/ActiveRecord 3.2, 4.0, and 4.1 (currently 4.1.0beta3)
+*   Rails/ActiveRecord 3.2, 4.0, and 4.1
 *   PostgreSQL, MySQL (using mysql2 gem; mysql gem only supported with Rails
     3.2), or SQLite3 (using sqlite3 >= 3.7.7 which has foreign key support)
 *   MRI Ruby 1.9.3, 2.0.0, or 2.1.0
@@ -191,10 +191,10 @@ SchemaPlus extends rails' `drop_table` method to accept these options:
     drop_table :table_name, if_exists: true   # no error if table doesn't exist
     drop_table :table_name, cascade: true     # delete dependencies
 
-The `:cascade` option is particularly useful given foreign key constraints. 
+The `:cascade` option is particularly useful given foreign key constraints.
 For Postgresql it is implemented using `DROP TABLE...CASCADE` which deletes
 all dependencies.  For MySQL, SchemaPlus implements the `:cascade` option to
-delete foreign key references, but does not delete any other dependencies. 
+delete foreign key references, but does not delete any other dependencies.
 For Sqlite3, the `:cascade` option is ignored, but Sqlite3 always drops tables
 with cascade-like behavior.
 
@@ -259,7 +259,7 @@ expression).  For example:
     post.update_attributes(category: ActiveRecord::DB_DEFAULT)
 
 (Without `ActiveRecord::DB_DEFAULT`, you can update a value to `NULL` but not
-to its default value.) 
+to its default value.)
 
 Note that after updating, you would need to reload a record to replace
 `ActiveRecord::DB_DEFAULT` with the value assigned by the database.
@@ -292,145 +292,74 @@ of foreign key constraints, you can re-enable it:
         create_table ...etc...
     end
 
-## Release notes:
 
-### Master branch (to be released)
-
-* *nothing currently waiting to be released*
-
-
-### 1.5.1
-
-* Now respects ActiveRecord::SchemaDumper.ignore_tables for views (issue #153)
-
-### 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)
-
-### 1.4.1
-
-* Bug fixes `migration.add_references` with `polymophic: true` (issue #145 and others)
-
-### 1.4.0
-
-* Supports jruby & mysql, thanks to [@rzenha](https://github.com/razenha)
-* Works with MRI ruby & rails 4.1.0beta3
-* Run tests against MRI 2.1.0
+## History
 
-### 1.3.3
+*   See [CHANGELOG](CHANGELOG.md) for per-version release notes.
 
-* Bug fix, dump unique index with expression (Issue #142)
+*   SchemaPlus is derived from several "Red Hill On Rails" plugins originally
+    created by [@harukizaemon](https://github.com/harukizaemon)
 
+*   SchemaPlus was created in 2011 by [@mlomnicki](https://github.com/mlomnicki) and [@ronen](https://github.com/ronen)
 
-### 1.3.2
+*   And [lots of contributors](https://github.com/lomba/schema_plus/graphs/contributors) since then
 
-* Bug fix, remove_index with if_exists but no name
-* Sort indexes alphabetically when dumping, like rails does
+## Development & Testing
 
-### 1.3.1
+Are you interested in contributing to schema_plus?  Thanks!
 
-* Regression bug fix, non-option arguemnts to remove_index
+Schema_plus has a full set of rspec tests.  [travis-ci](http://travis-ci.org/lomba/schema_plus) runs the tests on the full matrix of supported versions of ruby, rails, and db adapters.  But you can also test all or some part of the matrix locally before you push your changes.  Here's what you need to know:
 
-### 1.3.0
+#### Required environment:
 
-* Added :if_exists option for remove_index
-* Initial jruby support (rails 3.2, postgresql), due to efforts of [@donv](https://github.com/donv)
-* Preliminatry groundwork for rails 4.1, due to efforts of [@tovodeverett](https://github.com/tovodeverett)
-* Bug fix for change_table
-* Bug fix for schema_dump postgresql non-btree indexes
-* Bug fix regarding expressions that cast non-string columns to strings in a lower()
+*  You must have either [rbenv](https://github.com/sstephenson/rbenv) or [rvm](http://rvm.io) installed and working, whichever you prefer.  Within it, have available whichever ruby versions you want to test.  The default set is MRI 1.9.3, 2.0.0, 2.1.0, and jruby
 
-### 1.2.0
-*   Now works with rails 4, due to efforts of [@tovodeverett](https://github.com/tovodeverett)
-*   Test against MRI ruby 2.0.0, no longer test against 1.9.2
+* Of course you must have installed whichever databases you want to test. The default set is: PostgreSQL, MySQL, and SQLite3.
 
-### 1.1.2
-*   Now works with rails 3.2.13 (fixed railtie initialization)
+* 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:
 
-### 1.1.1
+        $ export POSTGRES_DB_USER = pgusername
+        $ export MYSQL_DB_USER = mysqlusername
 
-*   Dependency constraint to rails 3.2.12 max, since schema_plus doesn't
-    currently work with 3.2.13.rc2
+* For PostgreSQL and MySQL you must explicitly create the databases used by the tests:
 
-### 1.1.0
+        $ rake create_databases  # creates both postgresql & mysql
+           OR
+        $ rake postgresql:create_databases
+        $ rake mysql:create_databases
 
-*   Add support for drop_table :cascade => true.  Note that until now,
-    :cascade was implicitly true.  So this change might break existing code
-    that relied on the incorrect implicit cascade behavior.
-*   Add support for :deferrable => :initially_deferred (thanks to
-    [@bhavinkamani](https://github.com/bhavinkamani))
-*   Works with PostGIS (thanks to [@pete](https://github.com/pete))
-*   Bug fix: Circular Reference/Stack Level Too Deep in Column#to_json. 
-    Thanks to [@robdimarco](https://github.com/robdimarco) for tracking down the problem
-*   Bug fix: More robust handling of foreign keys with schema namespaces
+#### Running the tests
 
+The tests are run via a script in the repo root.  Its args are documented by
 
-### 1.0.1
+     $ ./runspecs --help
 
-*   README cleanups (thanks to [@denispeplin](https://github.com/denispeplin))
-*   Now raises ArgumentError if index has both :case_sensitive => false and an
-    :expression
-*   Now creates consistent default name for foreign key constraints
-*   Bug fix: respect :length keyword for index (thanks to [@teleological](https://github.com/teleological))
-*   Bug fix: renaming table with multiple foreign key constraints (thanks to
-    [@teleological](https://github.com/teleological))
-*   Bug fix: don't dump :case_sensitive => false for index with an expression
-    that includes "lower(name)".
-*   Bug fix: Properly dump multi-column case-insensitive indexes
+By default it runs on a matrix of postgresql, mysql2, and sqlite3, for all rubies and all versions of rails.  But the matrix options `--db`, `--ruby`, and `--rails` options let you limit those.  The `--quick` option runs on just one set: postgresql, rails 4.1 and ruby 2.1.0.  The `--full` option adds the mysql adapter to the set (in addition to mysql2 adapter).
 
+* Install gem dependencies for the sets you'll be testing:
 
-### 1.0.0
+		 $ ./runspecs [matrix options] --install   # runs 'bundle install' for all sets
+		 	e.g.
+		 $ ./runspecs --db 'posgresql' --ruby '2.1.0' --rails '4.0 4.1' --install
 
-*   No longer support rails < 3.2 and ruby < 1.9
-*   New feature: specify foreign key constraints using :foreign_key => { ...
-    }, motivated in particular to support :name (suggested by [@daniele-m](https://github.com/daniele-m))
-*   New feature: create view using ActiveRecord relation
-*   New feature: `ActiveRecord::DB_DEFAULT` (suggested by
-    [@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))
-*   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
-*   Bug fix: quote default expressions in schema dump (thanks to [@jonleighton](https://github.com/jonleighton))
-*   Bug fix: when removing a foreign key constraint, remove its auto-generated
-    index.
-*   Bug fix: SchemaDumper.ignore_tables needs to support regexps (suggested by
-    [@mtalcott](https://github.com/mtalcott))
-*   Bug fix: More robust handling of Postgresql schema_search path (suggested
-    by [@mtalcott](https://github.com/mtalcott))
-*   Bug fix: Only get index, view, and foreign key information from current
-    schema (thanks to [@bhavinkamani](https://github.com/bhavinkamani))
+* Run all the tests:
 
+	     $ ./runspecs [matrix options]  # runs rspec for each set in the matrix
+		    e.g.
+		 $ ./runspecs --db 'posgresql' --ruby '2.1.0' --rails '4.0 4.1'
 
-### Earlier releases
-*   0.4.1 - Bug fix: don't attempt foreign key creation for t.belongs_to ...
-    :polymorphic => true
-*   0.4.0 - Add :force for create_view (suggested by [@greglazarev](https://github.com/greglazarev)).  cleanups
-    by [@betelgeuse](https://github.com/betelgeuse)
-*   0.3.4 - Bug fix: regression causing :default => false to be ignored
-*   0.3.3 - Bug fix: properly handle boolean defaults in mysql
-*   0.3.2 - Bug fix: make sure rake db:schema:load initializes schema_plus 
-*   0.3.1 - Bug fix for PostgreSQL schema dump after change_column_default(...
-    nil)
-*   0.3.0 - Add :default => expressions (Thanks to Luke Saunders).  support
-    rails 3.2 and ruby 1.9.3
-*   0.2.1 - Suppress duplicate add_indexes.  compatibility with rails
-    3.2.0.rc2
+  Code coverage information will be in coverage/index.html -- it should be at 100% coverage if you're running against all databases.
 
+* To run rspec on just a limited set of specs, you can do:
 
-## History
+		$ ./runspecs [matrix options] --rspec -- [rspec args]
+		   e.g.
+		$ ./runspecs --quick --rspec -- spec/migration_spec.rb -e 'default name'
 
-*   SchemaPlus is derived from several "Red Hill On Rails" plugins originally
-    created by [@harukizaemon](https://github.com/harukizaemon)
-
-*   SchemaPlus was created in 2011 by [@mlomnicki](https://github.com/mlomnicki) and [@ronen](https://github.com/ronen)
+Contributions to making the testing process itself easier and better will also be gratefully accepted!
 
-*   And [lots of
-    contributors](https://github.com/lomba/schema_plus/graphs/contributors)
-    since then
 
+-
 
 
 [![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/lomba/schema_plus/trend.png)](https://bitdeli.com/free "Bitdeli Badge")

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.beta1"

data/lib/schema_plus/active_record/column_options_handler.rb

@@ -14,6 +14,7 @@ module SchemaPlus::ActiveRecord
 
       # create index if requested explicity or implicitly due to auto_index
       index = column_options[:index]
+      index = column_options[:_index] if column_options.include? :_index
       if index.nil? and fk_args && config.foreign_keys.auto_index?
         index = { :name => auto_index_name(table_name, column_name) }
       end

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

@@ -55,7 +55,7 @@ module SchemaPlus
         # The default as_jon includes all instance variables.  but
         # @model can't be dumped (it contains circular references)
         def as_json(options=nil)
-          instance_values.except "model"
+          instance_values.except "model", "adapter"
         end
       end
     end

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

@@ -11,6 +11,7 @@ module SchemaPlus::ActiveRecord::ConnectionAdapters
 
     def add_reference_with_schema_plus(table_name, ref_name, options = {}) #:nodoc:
       options[:references] = nil if options[:polymorphic]
+      options[:_index] = options.delete(:index) unless options[:polymorphic] # usurp index creation from AR
       add_reference_without_schema_plus(table_name, ref_name, options)
     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]
+      options[:_index] = options.delete(:index) unless options[:polymorphic] # usurp index creation from AR
       args << options
       references_without_schema_plus(*args)
     end
@@ -118,6 +119,7 @@ module SchemaPlus::ActiveRecord::ConnectionAdapters
     def belongs_to_with_schema_plus(*args) #:nodoc:
       options = args.extract_options!
       options[:references] = nil if options[:polymorphic]
+      options[:_index] = options.delete(:index) unless options[:polymorphic] # usurp index creation from AR
       args << options
       belongs_to_without_schema_plus(*args)
     end

data/lib/schema_plus/version.rb

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

data/runspecs

@@ -89,8 +89,8 @@ else
     # rbenv, we already have various environment variables set up.  need
     # strip those out so that the forked shell can run a diifferent ruby
     # version than the one we're in now.
-    ENV['PATH'] = ENV['PATH'].split(':').reject{|dir| dir =~ %r{/rbenv/(?!shims)}}.join(':')
-    ENV['GEM_PATH'] = ENV['GEM_PATH'].split(':').reject{|dir| dir =~ %r{/rbenv}}.join(':')
+    ENV['PATH'] = ENV['PATH'].split(':').reject{|dir| dir =~ %r{/\.?rbenv/(?!shims)}}.join(':')
+    ENV['GEM_PATH'] = ENV['GEM_PATH'].split(':').reject{|dir| dir =~ %r{/\.?rbenv}}.join(':') unless ENV['GEM_PATH'].nil?
     ENV['RBENV_DIR'] = nil
     ENV['RBENV_HOOK_PATH'] = nil
 

data/schema_plus.gemspec

@@ -25,9 +25,9 @@ Gem::Specification.new do |s|
   s.add_dependency("valuable")
 
   s.add_development_dependency("rake")
-  s.add_development_dependency("rspec")
+  s.add_development_dependency("rspec", "~> 3.0.0")
   s.add_development_dependency("rdoc")
   s.add_development_dependency("simplecov")
-  s.add_development_dependency("simplecov-gem-adapter")
+  s.add_development_dependency("simplecov-gem-profile")
 end
 

data/spec/column_default_spec.rb

@@ -0,0 +1,156 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+
+describe "Column definition" do
+  before(:each) do
+    define_schema(:auto_create => true) do
+      create_table :models, :force => true do |t|
+      end
+    end
+    class Model < ::ActiveRecord::Base ; end
+  end
+
+  subject {
+    Model.connection.execute("INSERT INTO models (dummy) values (1)")
+    Model.last.reload.test_column
+  }
+
+  context "text columns" do
+
+    before(:each) do
+      @nowish = /(#{Time.now.utc.to_s.sub(/:[^:]+$/, '')}|#{Time.now.to_s.sub(/:[^:]+$/,'')}).*/
+    end
+
+    context "just default passed" do
+      before(:each) do
+        define_test_column(:string, :default => "2011-12-11 00:00:00")
+      end
+
+      it "should use the normal default" do
+        is_expected.to eq "2011-12-11 00:00:00"
+      end
+    end
+
+    context "just default passed in hash" do
+      before(:each) do
+        define_test_column(:string, :default => { :value => "2011-12-11 00:00:00" })
+      end
+
+      it "should use the normal default" do
+        is_expected.to eq "2011-12-11 00:00:00"
+      end
+    end
+
+    context "default passed with no nulls" do
+      before(:each) do
+        define_test_column(:string, :default => "2011-12-11 00:00:00", null: false)
+      end
+
+      it "should use the normal default" do
+        is_expected.to eq "2011-12-11 00:00:00"
+      end
+    end
+
+    context "default passed in hash with no nulls" do
+      before(:each) do
+        define_test_column(:string, :default => { :value => "2011-12-11 00:00:00" }, null: false)
+      end
+
+      it "should use the normal default" do
+        is_expected.to eq "2011-12-11 00:00:00"
+      end
+    end
+
+    context "default function passed as :now" do
+      before(:each) do
+        begin
+          define_test_column(:string, :default => :now)
+        rescue ArgumentError => e
+          @raised_argument_error = e
+        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
+      end
+    end
+
+    context "default function passed as now with no nulls" do
+      before(:each) do
+        begin
+          define_test_column(:string, :default => :now, null: false)
+        rescue ArgumentError => e
+          @raised_argument_error = e
+        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
+      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
+          define_test_column(:string, :default => { :expr => "(replace('THIS IS A TEST', 'TEST', 'DOG'))" })
+          is_expected.to eq "THIS IS A DOG"
+        end
+      end
+    end
+
+  end
+
+  context "boolean column" do
+
+    context "passed as boolean false" do
+      before(:each) do
+        define_test_column :boolean, :default => false
+      end
+
+      it "should give the default as false" do
+        is_expected.to eq false
+      end
+    end
+
+    context "passed as boolean true" do
+      before(:each) do
+        define_test_column :boolean, :default => true
+      end
+
+      it "should give the default as true" do
+        is_expected.to eq true
+      end
+    end
+  end
+
+  private 
+
+  def define_test_column(type, *args)
+    ActiveRecord::Migration.suppress_messages do
+      ActiveRecord::Migration.create_table Model.table_name, :force => true do |t|
+        t.send type, :test_column, *args
+        t.integer :dummy
+      end
+    end
+    Model.reset_column_information
+    @column = Model.columns.first()
+  end
+end