schema_plus 0.2.1 → 0.3.0

data/README.rdoc

@@ -11,11 +11,11 @@ For added rails DRYness see also the gems
 == Compatibility
 
 SchemaPlus supports all combinations of:
-* rails 2.3, 3.0, or 3.1
-* MRI ruby 1.8.7 or 1.9.2
+* rails 2.3, 3.0, or 3.1, or 3.2
+* MRI ruby 1.8.7, 1.9.2 or 1.9.3
 * PostgreSQL, MySQL (using mysql or mysql2 gem), or SQLite3 (using sqlite3 3.7.7 which has foreign key support)
 
-Support for rails 2.3 will likely be dropped starting in version 0.2.x.
+Support for rails 2.3 will likely be dropped eventually.
 
 == Installation
 
@@ -120,6 +120,33 @@ ActiveRecord works with views the same as with ordinary tables.  That is, for th
   class UncommentedPosts < ActiveRecord::Base
   end
 
+=== Column Defaults
+
+SchemaPlus allows expressions to be used as column defaults.  For example:
+
+  t.datetime :seen_at, :default => :now
+
+resolves to
+
+  DEFAULT NOW() # PostgreSQL
+  (DATETIME('now')) # SQLite3
+  invalid # MySQL
+
+Arbitrary SQL expressions can also be specified by passing a hash with an :expr parameter:
+
+  t.datetime :seen_at, :default => { :expr => 'NOW()' }
+
+In MySQL only the TIMESTAMP column accepts SQL column defaults and Rails uses DATETIME,
+so this is not possible at this time.
+
+Standard default values can be specified verbosely:
+
+  t.datetime :seen_at, :default => { :value => "2011-12-11 00:00:00" }
+
+But the standard syntax will still work as usual:
+
+  t.datetime :seen_at, :default => "2011-12-11 00:00:00"
+
 === Schema Dump and Load (schema.rb)
 
 When dumping <tt>schema.rb</tt>, SchemaPlus orders the views and tables in
@@ -149,6 +176,7 @@ take advantage of auto-creation of foreign keys, you can re-enable it:
 == History
 
 * Recent Release notes:
+    * 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
 
 * SchemaPlus is derived from several "Red Hill On Rails" plugins
@@ -158,6 +186,7 @@ take advantage of auto-creation of foreign keys, you can re-enable it:
   * François Beausoleil (https://github.com/francois)
   * Greg Barnett (https://github.com/greg-barnett)
   * Ronen Barzel (https://github.com/ronen)
+  * Luke Suanders (https://github.com/lukesaunders)
 
 * SchemaPlus was created in 2011 by Michał Łomnicki and Ronen Barzel
 

data/gemfiles/Gemfile.rails-2.3

@@ -2,5 +2,5 @@ source "http://rubygems.org"
 
 puts __FILE__
 gemspec :path => File.expand_path('../..', __FILE__)
-gem "rails", "~> 2.3"
+gem "rails", "~> 2.3.0"
 gem "mysql2", "~> 0.2.7"

data/gemfiles/Gemfile.rails-2.3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/ronen/github/schema_plus
   specs:
-    schema_plus (0.2.0)
+    schema_plus (0.2.1)
       rails
       valuable
 
@@ -19,10 +19,10 @@ GEM
       activesupport (= 2.3.14)
     activesupport (2.3.14)
     diff-lcs (1.1.3)
-    multi_json (1.0.4)
+    multi_json (1.1.0)
     mysql (2.8.1)
     mysql2 (0.2.18)
-    pg (0.12.2)
+    pg (0.13.2)
     rack (1.1.3)
     rails (2.3.14)
       actionmailer (= 2.3.14)
@@ -32,22 +32,22 @@ GEM
       activesupport (= 2.3.14)
       rake (>= 0.8.3)
     rake (0.8.7)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    simplecov (0.5.4)
-      multi_json (~> 1.0.3)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
+    simplecov (0.6.1)
+      multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-gem-adapter (1.0.1)
       simplecov
     simplecov-html (0.5.3)
     sqlite3 (1.3.5)
-    valuable (0.9.2)
+    valuable (0.9.3)
 
 PLATFORMS
   ruby
@@ -56,7 +56,7 @@ DEPENDENCIES
   mysql
   mysql2 (~> 0.2.7)
   pg
-  rails (~> 2.3)
+  rails (~> 2.3.0)
   rake (~> 0.8.7)
   rspec
   schema_plus!

data/gemfiles/Gemfile.rails-3.0.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/ronen/github/schema_plus
   specs:
-    schema_plus (0.2.0)
+    schema_plus (0.2.1)
       rails
       valuable
 
@@ -9,82 +9,82 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.11)
-      actionpack (= 3.0.11)
+    actionmailer (3.0.12)
+      actionpack (= 3.0.12)
       mail (~> 2.2.19)
-    actionpack (3.0.11)
-      activemodel (= 3.0.11)
-      activesupport (= 3.0.11)
+    actionpack (3.0.12)
+      activemodel (= 3.0.12)
+      activesupport (= 3.0.12)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.5.0)
-      rack (~> 1.2.1)
+      rack (~> 1.2.5)
       rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.11)
-      activesupport (= 3.0.11)
+    activemodel (3.0.12)
+      activesupport (= 3.0.12)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.0.11)
-      activemodel (= 3.0.11)
-      activesupport (= 3.0.11)
+    activerecord (3.0.12)
+      activemodel (= 3.0.12)
+      activesupport (= 3.0.12)
       arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.11)
-      activemodel (= 3.0.11)
-      activesupport (= 3.0.11)
-    activesupport (3.0.11)
+    activeresource (3.0.12)
+      activemodel (= 3.0.12)
+      activesupport (= 3.0.12)
+    activesupport (3.0.12)
     arel (2.0.10)
     builder (2.1.2)
     diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     i18n (0.5.0)
-    json (1.6.4)
+    json (1.6.5)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.17.2)
-    multi_json (1.0.4)
+    multi_json (1.1.0)
     mysql (2.8.1)
     mysql2 (0.2.18)
-    pg (0.12.2)
+    pg (0.13.2)
     polyglot (0.3.3)
     rack (1.2.5)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.11)
-      actionmailer (= 3.0.11)
-      actionpack (= 3.0.11)
-      activerecord (= 3.0.11)
-      activeresource (= 3.0.11)
-      activesupport (= 3.0.11)
+    rails (3.0.12)
+      actionmailer (= 3.0.12)
+      actionpack (= 3.0.12)
+      activerecord (= 3.0.12)
+      activeresource (= 3.0.12)
+      activesupport (= 3.0.12)
       bundler (~> 1.0)
-      railties (= 3.0.11)
-    railties (3.0.11)
-      actionpack (= 3.0.11)
-      activesupport (= 3.0.11)
+      railties (= 3.0.12)
+    railties (3.0.12)
+      actionpack (= 3.0.12)
+      activesupport (= 3.0.12)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.4)
     rake (0.8.7)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    simplecov (0.5.4)
-      multi_json (~> 1.0.3)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
+    simplecov (0.6.1)
+      multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-gem-adapter (1.0.1)
       simplecov
@@ -94,8 +94,8 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
-    valuable (0.9.2)
+    tzinfo (0.3.32)
+    valuable (0.9.3)
 
 PLATFORMS
   ruby

data/gemfiles/Gemfile.rails-3.1

@@ -1,5 +1,5 @@
 source "http://rubygems.org"
 
 gemspec :path => File.expand_path('../..', __FILE__)
-gem "rails", "~> 3.1"
+gem "rails", "~> 3.1.0"
 gem "mysql2"

data/gemfiles/Gemfile.rails-3.1.lock

@@ -1,60 +1,60 @@
 PATH
   remote: /Users/ronen/github/schema_plus
   specs:
-    schema_plus (0.2.0)
+    schema_plus (0.2.1)
       rails
       valuable
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.3)
-      actionpack (= 3.1.3)
+    actionmailer (3.1.4)
+      actionpack (= 3.1.4)
       mail (~> 2.3.0)
-    actionpack (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
+    actionpack (3.1.4)
+      activemodel (= 3.1.4)
+      activesupport (= 3.1.4)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6)
-      rack (~> 1.3.5)
+      rack (~> 1.3.6)
       rack-cache (~> 1.1)
       rack-mount (~> 0.8.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.0.3)
-    activemodel (3.1.3)
-      activesupport (= 3.1.3)
+    activemodel (3.1.4)
+      activesupport (= 3.1.4)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activerecord (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-      arel (~> 2.2.1)
+    activerecord (3.1.4)
+      activemodel (= 3.1.4)
+      activesupport (= 3.1.4)
+      arel (~> 2.2.3)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-    activesupport (3.1.3)
+    activeresource (3.1.4)
+      activemodel (= 3.1.4)
+      activesupport (= 3.1.4)
+    activesupport (3.1.4)
       multi_json (~> 1.0)
-    arel (2.2.1)
+    arel (2.2.3)
     builder (3.0.0)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     hike (1.2.1)
     i18n (0.6.0)
-    json (1.6.4)
-    mail (2.3.0)
+    json (1.6.5)
+    mail (2.3.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.17.2)
-    multi_json (1.0.4)
+    multi_json (1.1.0)
     mysql (2.8.1)
     mysql2 (0.3.11)
-    pg (0.12.2)
+    pg (0.13.2)
     polyglot (0.3.3)
     rack (1.3.6)
-    rack-cache (1.1)
+    rack-cache (1.2)
       rack (>= 0.4)
     rack-mount (0.8.3)
       rack (>= 1.0.0)
@@ -62,17 +62,17 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.3)
-      actionmailer (= 3.1.3)
-      actionpack (= 3.1.3)
-      activerecord (= 3.1.3)
-      activeresource (= 3.1.3)
-      activesupport (= 3.1.3)
+    rails (3.1.4)
+      actionmailer (= 3.1.4)
+      actionpack (= 3.1.4)
+      activerecord (= 3.1.4)
+      activeresource (= 3.1.4)
+      activesupport (= 3.1.4)
       bundler (~> 1.0)
-      railties (= 3.1.3)
-    railties (3.1.3)
-      actionpack (= 3.1.3)
-      activesupport (= 3.1.3)
+      railties (= 3.1.4)
+    railties (3.1.4)
+      actionpack (= 3.1.4)
+      activesupport (= 3.1.4)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -80,16 +80,16 @@ GEM
     rake (0.8.7)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    simplecov (0.5.4)
-      multi_json (~> 1.0.3)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
+    simplecov (0.6.1)
+      multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-gem-adapter (1.0.1)
       simplecov
@@ -104,8 +104,8 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
-    valuable (0.9.2)
+    tzinfo (0.3.32)
+    valuable (0.9.3)
 
 PLATFORMS
   ruby
@@ -114,7 +114,7 @@ DEPENDENCIES
   mysql
   mysql2
   pg
-  rails (~> 3.1)
+  rails (~> 3.1.0)
   rake (~> 0.8.7)
   rspec
   schema_plus!

data/gemfiles/Gemfile.rails-3.2

@@ -1,5 +1,5 @@
 source "http://rubygems.org"
 
 gemspec :path => File.expand_path('../..', __FILE__)
-gem "rails", "~> 3.2.0.rc2"
+gem "rails", "~> 3.2.0"
 gem "mysql2"

data/gemfiles/Gemfile.rails-3.2.lock

@@ -1,76 +1,76 @@
 PATH
   remote: /Users/ronen/github/schema_plus
   specs:
-    schema_plus (0.2.0)
+    schema_plus (0.2.1)
       rails
       valuable
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.0.rc2)
-      actionpack (= 3.2.0.rc2)
-      mail (~> 2.3.0)
-    actionpack (3.2.0.rc2)
-      activemodel (= 3.2.0.rc2)
-      activesupport (= 3.2.0.rc2)
+    actionmailer (3.2.2)
+      actionpack (= 3.2.2)
+      mail (~> 2.4.0)
+    actionpack (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.0.rc1)
+      journey (~> 1.0.1)
       rack (~> 1.4.0)
       rack-cache (~> 1.1)
       rack-test (~> 0.6.1)
       sprockets (~> 2.1.2)
-    activemodel (3.2.0.rc2)
-      activesupport (= 3.2.0.rc2)
+    activemodel (3.2.2)
+      activesupport (= 3.2.2)
       builder (~> 3.0.0)
-    activerecord (3.2.0.rc2)
-      activemodel (= 3.2.0.rc2)
-      activesupport (= 3.2.0.rc2)
-      arel (~> 3.0.0.rc1)
+    activerecord (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.0.rc2)
-      activemodel (= 3.2.0.rc2)
-      activesupport (= 3.2.0.rc2)
-    activesupport (3.2.0.rc2)
+    activeresource (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
+    activesupport (3.2.2)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (3.0.0.rc1)
+    arel (3.0.2)
     builder (3.0.0)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     hike (1.2.1)
     i18n (0.6.0)
-    journey (1.0.0.rc4)
-    json (1.6.4)
-    mail (2.3.0)
+    journey (1.0.3)
+    json (1.6.5)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.17.2)
-    multi_json (1.0.4)
+    multi_json (1.1.0)
     mysql (2.8.1)
     mysql2 (0.3.11)
-    pg (0.12.2)
+    pg (0.13.2)
     polyglot (0.3.3)
-    rack (1.4.0)
-    rack-cache (1.1)
+    rack (1.4.1)
+    rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.2.0.rc2)
-      actionmailer (= 3.2.0.rc2)
-      actionpack (= 3.2.0.rc2)
-      activerecord (= 3.2.0.rc2)
-      activeresource (= 3.2.0.rc2)
-      activesupport (= 3.2.0.rc2)
+    rails (3.2.2)
+      actionmailer (= 3.2.2)
+      actionpack (= 3.2.2)
+      activerecord (= 3.2.2)
+      activeresource (= 3.2.2)
+      activesupport (= 3.2.2)
       bundler (~> 1.0)
-      railties (= 3.2.0.rc2)
-    railties (3.2.0.rc2)
-      actionpack (= 3.2.0.rc2)
-      activesupport (= 3.2.0.rc2)
+      railties (= 3.2.2)
+    railties (3.2.2)
+      actionpack (= 3.2.2)
+      activesupport (= 3.2.2)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -78,16 +78,16 @@ GEM
     rake (0.8.7)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    simplecov (0.5.4)
-      multi_json (~> 1.0.3)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
+    simplecov (0.6.1)
+      multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-gem-adapter (1.0.1)
       simplecov
@@ -102,8 +102,8 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
-    valuable (0.9.2)
+    tzinfo (0.3.32)
+    valuable (0.9.3)
 
 PLATFORMS
   ruby
@@ -112,7 +112,7 @@ DEPENDENCIES
   mysql
   mysql2
   pg
-  rails (~> 3.2.0.rc2)
+  rails (~> 3.2.0)
   rake (~> 0.8.7)
   rspec
   schema_plus!

data/lib/schema_plus.rb

@@ -20,6 +20,7 @@ module SchemaPlus
     module ConnectionAdapters
       autoload :MysqlAdapter, 'schema_plus/active_record/connection_adapters/mysql_adapter'
       autoload :PostgresqlAdapter, 'schema_plus/active_record/connection_adapters/postgresql_adapter'
+      autoload :PostgreSQLColumn, 'schema_plus/active_record/connection_adapters/postgresql_adapter'
       autoload :Sqlite3Adapter, 'schema_plus/active_record/connection_adapters/sqlite3_adapter'
     end
   end

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

@@ -28,7 +28,7 @@ module SchemaPlus
             adapter = 'MysqlAdapter'
           when 'PostgreSQL' 
             adapter = 'PostgresqlAdapter'
-          when 'SQLite' 
+          when 'SQLite'
             adapter = 'Sqlite3Adapter'
           end
           if adapter 
@@ -43,6 +43,13 @@ module SchemaPlus
               monkeypatch = SchemaPlus::ActiveRecord::ConnectionAdapters::IndexDefinition
               mysql2index.send(:include, monkeypatch) unless mysql2index.include? monkeypatch
             end
+
+            if adapter == 'PostgresqlAdapter'
+              ::ActiveRecord::ConnectionAdapters::PostgreSQLColumn.send(:include, SchemaPlus::ActiveRecord::ConnectionAdapters::PostgreSQLColumn) unless ::ActiveRecord::ConnectionAdapters::PostgreSQLColumn.include?(SchemaPlus::ActiveRecord::ConnectionAdapters::PostgreSQLColumn)
+            end
+            if adapter == 'Sqlite3Adapter'
+              ::ActiveRecord::ConnectionAdapters::SQLiteColumn.send(:include, SchemaPlus::ActiveRecord::ConnectionAdapters::SQLiteColumn) unless ::ActiveRecord::ConnectionAdapters::SQLiteColumn.include?(SchemaPlus::ActiveRecord::ConnectionAdapters::SQLiteColumn)
+            end
           end
           extend(SchemaPlus::ActiveRecord::ForeignKeys)
         end
@@ -114,6 +121,39 @@ module SchemaPlus
           false
         end
 
+        def add_column_options!(sql, options)
+          if options_include_default?(options)
+            default = options[:default]
+            # figure out if this is an expression and if not treat as standard default value
+            expr = sql_for_function( (default.is_a? Hash) ? default[:expr] : default )
+            if !expr && default.is_a?(Hash) && default[:expr]
+              if default_expr_valid? default[:expr]
+                expr = default[:expr]
+              else
+                raise(ArgumentError)
+              end
+            end
+            if expr
+              sql << " DEFAULT #{expr}"
+            else
+              value = (default.is_a? Hash) ? default[:value] : default
+              sql << " DEFAULT #{quote(value.to_s, options[:column])}" if value
+            end
+          end
+          # must explicitly check for :null to allow change_column to work on migrations
+          if options[:null] == false
+            sql << " NOT NULL"
+          end
+        end
+
+        def default_expr_valid?(expr)
+          # override in database specific adaptor
+        end
+
+        def sql_for_function(function_name)
+          # override in database specific adaptor
+        end
+
         # This is define in rails 3.x, but not in rails2.x
         unless defined? ::ActiveRecord::ConnectionAdapters::SchemaStatements::index_name_exists?
           # File activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb, line 403

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

@@ -7,6 +7,7 @@ module SchemaPlus
       #
       module Column
 
+        attr_reader :default_expr
         attr_writer :connection # connection gets set by SchemaPlus::ActiveRecord::Base::columns_with_schema_plus
 
         # Returns the list of IndexDefinition instances for each index that

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

@@ -105,6 +105,12 @@ module SchemaPlus
           sql
         end
 
+        def default_expr_valid?(expr)
+          false # only the TIMESTAMP column accepts SQL column defaults and rails uses DATETIME
+        end
+
+        def sql_for_function(function)
+        end
       end
     end
   end

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

@@ -1,6 +1,39 @@
 module SchemaPlus
   module ActiveRecord
     module ConnectionAdapters
+      # PostgreSQL-specific extensions to column definitions in a table.
+      module PostgreSQLColumn
+        # Extracts the value from a PostgreSQL column default definition.
+        def self.included(base) #:nodoc:
+          base.extend ClassMethods
+          base.class_eval do
+            class << self
+              alias_method_chain :extract_value_from_default, :schema_plus
+            end
+          end
+        end
+
+        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
+          super(name, default, sql_type, null)
+        end
+
+        module ClassMethods
+          def extract_value_from_default_with_schema_plus(default)
+            value = extract_value_from_default_without_schema_plus(default)
+            if value.nil? && !default.nil?
+              value = { :expr => default }
+            end
+            value
+          end
+        end
+      end
+
       # The Postgresql adapter implements the SchemaPlus extensions and
       # enhancements
       module PostgresqlAdapter
@@ -159,6 +192,17 @@ module SchemaPlus
 
           foreign_keys
         end
+
+        def default_expr_valid?(expr)
+          true # arbitrary sql is okay in PostgreSQL
+        end
+
+        def sql_for_function(function)
+          case function
+            when :now
+              "NOW()"
+          end
+        end
       end
     end
   end

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

@@ -1,6 +1,15 @@
 module SchemaPlus
   module ActiveRecord
     module ConnectionAdapters
+      module SQLiteColumn
+        def initialize(name, default, sql_type = nil, null = true)
+          if default =~ /DATETIME/
+            @default_expr = "(#{default})"
+          end
+          super(name, default, sql_type, null)
+        end
+      end
+
       # SchemaPlus includes an Sqlite3 implementation of the AbstractAdapater
       # extensions.  
       module Sqlite3Adapter
@@ -71,6 +80,16 @@ module SchemaPlus
           foreign_keys
         end
 
+        def default_expr_valid?(expr)
+          true # arbitrary sql is okay
+        end
+
+        def sql_for_function(function)
+          case function
+            when :now
+              "(DATETIME('now'))"
+          end
+        end
       end
 
     end

data/lib/schema_plus/active_record/schema_dumper.rb

@@ -98,7 +98,13 @@ module SchemaPlus
       def table_with_schema_plus(table, ignore) #:nodoc:
         stream = StringIO.new
         table_without_schema_plus(table, stream)
-        @table_dumps[table] = stream.string
+        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}\" }")
+          end
+        end
+        @table_dumps[table] = stream_string
       end
 
       def indexes_with_schema_plus(table, stream) #:nodoc:

data/lib/schema_plus/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlus
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/runspecs

@@ -2,8 +2,9 @@
 
 require 'optparse'
 require 'ostruct'
+require 'tempfile'
 
-RUBY_VERSIONS = %W[1.8.7 1.9.2]
+RUBY_VERSIONS = %W[1.8.7 1.9.2 1.9.3]
 RAILS_VERSIONS = %W[2.3 3.0 3.1 3.2]
 DB_ADAPTERS = %W[postgresql mysql mysql2 sqlite3]
 
@@ -90,6 +91,11 @@ combos.each_with_index do |combo, n|
     puts "\n\n*** ruby version #{ruby} - rails version #{rails} - db adapter: #{db_adapter}  [#{n+1} of #{combos.size}]\n\n#{command}"
 
     next if o.dry_run
-    system(command) or errs << "ruby #{ruby}, rails #{rails}#{db_adapter && ", db_adapter #{db_adapter}"}"
+
+    Tempfile.open('runspecs') do |file|
+        system("(#{command}) 2>&1 | tee #{file.path}")
+        file.rewind
+        errs << "ruby #{ruby}, rails #{rails}#{db_adapter && ", db_adapter #{db_adapter}"}" if file.readlines.grep(/^Failed examples/).any?
+    end
 end
 puts errs.any? ?  "\n*** #{errs.size} failures:\n\t#{errs.join("\n\t")}" : "\n*** #{combos.size > 1 ? 'all versions' : 'spec'} succeeded ***" unless o.dry_run

data/spec/column_definition_spec.rb

@@ -0,0 +1,99 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+
+describe "Column definition" do
+  before(:all) do
+    load_core_schema
+  end
+
+  let(:connection) { ActiveRecord::Base.connection }
+
+  before(:each) do
+    @sql = 'time_taken text'
+  end
+
+  context "just default passed" do
+    before(:each) do
+      connection.add_column_options!(@sql, { :default => "2011-12-11 00:00:00" })
+    end
+
+    subject { @sql}
+
+    it "should use the normal default" do
+      should == "time_taken text DEFAULT '2011-12-11 00:00:00'"
+    end
+  end
+
+  context "just default passed in hash" do
+    before(:each) do
+      connection.add_column_options!(@sql, { :default => { :value => "2011-12-11 00:00:00" } })
+    end
+
+    subject { @sql}
+
+    it "should use the normal default" do
+      should == "time_taken text DEFAULT '2011-12-11 00:00:00'"
+    end
+  end
+
+  context "default function passed as now" do
+    before(:each) do
+      connection.add_column_options!(@sql, { :default => :now })
+    end
+
+    subject { @sql }
+
+    if SchemaPlusHelpers.postgresql?
+      it "should use NOW() as the default" do
+        should == "time_taken text DEFAULT NOW()"
+      end
+    end
+
+    if SchemaPlusHelpers.sqlite3?
+      it "should use NOW() as the default" do
+        should == "time_taken text DEFAULT (DATETIME('now'))"
+      end
+    end
+
+    if SchemaPlusHelpers.mysql?
+      it "should use CURRENT_TIMESTAMP as the default" do
+        should == "time_taken text DEFAULT 'now'"
+      end
+    end
+  end
+
+  context "valid expr passed as default" do
+    subject { connection.add_column_options!(@sql, { :default => { :expr => 'NOW()' } }); @sql }
+
+    if SchemaPlusHelpers.postgresql?
+      it "should use NOW() as the default" do
+        should == "time_taken text DEFAULT NOW()"
+      end
+    end
+
+    if SchemaPlusHelpers.sqlite3?
+      it "should use NOW() as the default" do
+        should == "time_taken text DEFAULT NOW()"
+      end
+    end
+
+    if SchemaPlusHelpers.mysql?
+      it "should raise an error" do
+        lambda { subject }.should raise_error
+      end
+    end
+  end
+
+  context "invalid expr passed as default" do
+    if SchemaPlusHelpers.mysql?
+      it "should raise an error" do
+        lambda {connection.add_column_options!(@sql, { :default => { :expr => "ARBITRARY_EXPR" } })}.should raise_error ArgumentError
+      end
+    else
+      it "should just accept the SQL" do
+        connection.add_column_options!(@sql, { :default => { :expr => "ARBITRARY_EXPR" } })
+        @sql.should == "time_taken text DEFAULT ARBITRARY_EXPR"
+      end
+    end
+  end
+end

data/spec/foreign_key_spec.rb

@@ -102,6 +102,8 @@ describe "Foreign Key" do
           Post.reverse_foreign_keys.collect(&:column_names).should_not include(%w[post_id])
         end
 
+        it "removes auto-generated index"
+
       end
 
       context "when referencing column and column is removed" do

data/spec/index_spec.rb

@@ -39,7 +39,7 @@ describe "add_index" do
       expect { add_index(:users, :login) }.should_not raise_error
       index_for(:login).should_not be_nil
     end
-    if defined? Rails and Rails.version >= "3.0"
+    if ActiveRecord::VERSION::STRING >= "3.0"
       it "should complain if the index is different" do
         add_index(:users, :login, :unique => true)
         index_for(:login).should_not be_nil

data/spec/migration_spec.rb

@@ -307,6 +307,10 @@ describe ActiveRecord::Migration do
         SchemaPlus.config.foreign_keys.auto_index = false
       end
 
+      it "should not auto-index if column already has an index"
+
+      it "should remove auto-created index when removing foreign key"
+
       it "should use default on_update action" do
         SchemaPlus.config.foreign_keys.on_update = :cascade
         add_column(:post_id, :integer) do

data/spec/rails3_migration_spec.rb

@@ -63,6 +63,12 @@ describe ActiveRecord::Migration do
         change_column :user, :string, :references => nil
       end
 
+      it "should remove a foreign key" do
+        @model.should reference(:users, :id).on(:user_id)
+        change_column :user_id, :integer, :references => nil
+        @model.should_not reference(:users, :id).on(:user_id)
+      end
+
     end
 
     context "when column is removed" do

data/spec/schema_dumper_spec.rb

@@ -68,6 +68,50 @@ describe "Schema dump" do
     end
   end
 
+  context "with date default" do
+    if SchemaPlusHelpers.postgresql?
+      it "should dump the default hash expr as now()" do
+        with_additional_column Post, :posted_at, :datetime, :default => :now do
+          dump_posts.should match(to_regexp(%q{t.datetime "posted_at", :default => \{ :expr => "now()" \}}))
+        end
+      end
+
+      it "should dump the default hash expr as CURRENT_TIMESTAMP" do
+        with_additional_column Post, :posted_at, :datetime, :default => {:expr => 'date \'2001-09-28\''} do
+          dump_posts.should match(to_regexp(%q{t.datetime "posted_at",        :default => '2001-09-28 00:00:00'}))
+        end
+      end
+    end
+
+    if SchemaPlusHelpers.sqlite3?
+      it "should dump the default hash expr as now" do
+        with_additional_column Post, :posted_at, :datetime, :default => :now do
+          dump_posts.should match(to_regexp(%q{t.datetime "posted_at", :default => \{ :expr => "(DATETIME('now'))" \}}))
+        end
+      end
+
+      it "should dump the default hash expr string as now" do
+        with_additional_column Post, :posted_at, :datetime, :default => { :expr => "(DATETIME('now'))" } do
+          dump_posts.should match(to_regexp(%q{t.datetime "posted_at", :default => \{ :expr => "(DATETIME('now'))" \}}))
+        end
+      end
+
+      it "should dump the default value normally" do
+        with_additional_column Post, :posted_at, :string, :default => "now" do
+          dump_posts.should match(to_regexp(%q{t.string  "posted_at",        :default => "now"}))
+        end
+      end
+    end
+
+    if SchemaPlusHelpers.postgresql?
+      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
+          dump_posts.should match(to_regexp(%q{t.datetime "posted_at",        :default => '2001-09-28 00:00:00'}))
+        end
+      end
+    end
+  end
+
   it "should include foreign_key options" do
     with_foreign_key Post, :user_id, :users, :id, :on_update => :cascade, :on_delete => :set_null do
       dump_posts.should match(to_regexp(%q{t.foreign_key ["user_id"], "users", ["id"], :on_update => :cascade, :on_delete => :set_null}))
@@ -149,6 +193,19 @@ describe "Schema dump" do
     Regexp.new(Regexp.escape(string))
   end
 
+  def with_additional_column(model, column_name, column_type, options)
+    table_columns = model.columns.reject{|column| column.name == 'id'}
+    ActiveRecord::Migration.suppress_messages do
+      ActiveRecord::Migration.create_table model.table_name, :force => true do |t|
+        table_columns.each do |column|
+          t.column column.name, column.type, :default => column.default
+        end
+        t.column column_name, column_type, options
+      end
+    end
+    yield
+  end
+
   def with_foreign_key(model, columns, referenced_table_name, referenced_columns, options = {})
     table_columns = model.columns.reject{|column| column.name == 'id'}
     ActiveRecord::Migration.suppress_messages do
@@ -172,7 +229,7 @@ describe "Schema dump" do
       end
     end
   end
-  
+
   def with_index(model, columns, options = {})
     ActiveRecord::Migration.suppress_messages do
       ActiveRecord::Migration.add_index(model.table_name, columns, options)

data/spec/schema_spec.rb

@@ -22,12 +22,13 @@ describe ActiveRecord::Schema do
 
     it "should create only explicity added indexes" do
       define_schema
-      connection.tables.collect { |table| connection.indexes(table) }.flatten.should have(1).item
+      expected = SchemaPlusHelpers.mysql? ? 2 : 1
+      connection.tables.collect { |table| connection.indexes(table) }.flatten.should have(expected).items
     end
 
     it "should create only explicity added foriegn keys" do
       define_schema
-      connection.tables.collect { |table| connection.foreign_keys(table) }.flatten.should have(1).item
+      connection.tables.collect { |table| connection.foreign_keys(table) }.flatten.should have(2).items
     end
 
   end
@@ -41,8 +42,16 @@ describe ActiveRecord::Schema do
         create_table :users, :force => true do
         end
 
+        create_table :colors, :force => true do
+        end
+
+        create_table :shoes, :force => true do
+        end
+
         create_table :posts, :force => true do |t|
           t.integer :user_id, :references => :users, :index => true
+          t.integer :shoe_id, :references => :shoes   # should not have an index (except mysql)
+          t.integer :color_id   # should not have a foreign key nor index
         end
       end
     end

data/spec/views_spec.rb

@@ -1,5 +1,11 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
+class AOnes < ActiveRecord::Base
+end
+
+class ABOnes < ActiveRecord::Base
+end
+
 describe ActiveRecord do
 
   let(:schema) { ActiveRecord::Schema }
@@ -24,8 +30,8 @@ describe ActiveRecord do
     end
 
     it "should query correctly" do
-      @a_ones.all.collect(&:s).should == %W[one_one one_two]
-      @ab_ones.all.collect(&:s).should == %W[one_one]
+      AOnes.all.collect(&:s).should == %W[one_one one_two]
+      ABOnes.all.collect(&:s).should == %W[one_one]
     end
 
     it "should instrospect" do
@@ -118,8 +124,6 @@ describe ActiveRecord do
     connection.execute "insert into items (a, b, s) values (2, 1, 'two_one')"
     connection.execute "insert into items (a, b, s) values (2, 2, 'two_two')"
 
-    @a_ones = Class.new(ActiveRecord::Base) do set_table_name "a_ones" end
-    @ab_ones = Class.new(ActiveRecord::Base) do set_table_name "ab_ones" end
   end
 
   def drop_definitions

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-06 00:00:00.000000000 Z
+date: 2012-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70342781866240 !ruby/object:Gem::Requirement
+  requirement: &70239318248000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70342781866240
+  version_requirements: *70239318248000
 - !ruby/object:Gem::Dependency
   name: valuable
-  requirement: &70342781865820 !ruby/object:Gem::Requirement
+  requirement: &70239318247580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70342781865820
+  version_requirements: *70239318247580
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70342781865300 !ruby/object:Gem::Requirement
+  requirement: &70239318247080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *70342781865300
+  version_requirements: *70239318247080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70342781864880 !ruby/object:Gem::Requirement
+  requirement: &70239318246660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70342781864880
+  version_requirements: *70239318246660
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &70342781864320 !ruby/object:Gem::Requirement
+  requirement: &70239318246200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70342781864320
+  version_requirements: *70239318246200
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &70342781863720 !ruby/object:Gem::Requirement
+  requirement: &70239318245780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70342781863720
+  version_requirements: *70239318245780
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70342781863120 !ruby/object:Gem::Requirement
+  requirement: &70239318245360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70342781863120
+  version_requirements: *70239318245360
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70342781862620 !ruby/object:Gem::Requirement
+  requirement: &70239318244940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70342781862620
+  version_requirements: *70239318244940
 - !ruby/object:Gem::Dependency
   name: simplecov-gem-adapter
-  requirement: &70342781862160 !ruby/object:Gem::Requirement
+  requirement: &70239318244520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,7 +110,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70342781862160
+  version_requirements: *70239318244520
 description: ! 'SchemaPlus is an ActiveRecord extension that provides enhanced capabilities
   for schema definition and querying, including: enhanced and more DRY index capabilities,
   support and automation for foreign key constraints, and support for views.'
@@ -156,6 +156,7 @@ files:
 - lib/schema_plus/version.rb
 - runspecs
 - schema_plus.gemspec
+- spec/column_definition_spec.rb
 - spec/column_spec.rb
 - spec/connection_spec.rb
 - spec/connections/mysql/connection.rb
@@ -208,6 +209,7 @@ specification_version: 3
 summary: Enhances ActiveRecord schema mechanism, including more DRY index creation
   and support for foreign key constraints and views.
 test_files:
+- spec/column_definition_spec.rb
 - spec/column_spec.rb
 - spec/connection_spec.rb
 - spec/connections/mysql/connection.rb
@@ -234,3 +236,4 @@ test_files:
 - spec/support/matchers/reference.rb
 - spec/support/reference.rb
 - spec/views_spec.rb
+has_rdoc: