schema_plus 0.3.2 → 0.3.3

data/.travis.yml

@@ -1,10 +1,12 @@
 rvm:
   - 1.8.7
   - 1.9.2
+  - 1.9.3
 gemfile:
   - gemfiles/Gemfile.rails-2.3
   - gemfiles/Gemfile.rails-3.0
   - gemfiles/Gemfile.rails-3.1
+  - gemfiles/Gemfile.rails-3.2
 before_script:
   - "mysql -e 'create database schema_plus_unittest;' > /dev/null"
   - "psql -c 'create database schema_plus_unittest;' -U postgres > /dev/null"

data/README.rdoc

@@ -176,6 +176,7 @@ take advantage of auto-creation of foreign keys, you can re-enable it:
 == History
 
 * Recent Release notes:
+    * 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

data/gemfiles/Gemfile.rails-2.3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/ronen/github/schema_plus
   specs:
-    schema_plus (0.3.2)
+    schema_plus (0.3.3)
       rails
       valuable
 

data/gemfiles/Gemfile.rails-3.0.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/ronen/github/schema_plus
   specs:
-    schema_plus (0.3.2)
+    schema_plus (0.3.3)
       rails
       valuable
 

data/gemfiles/Gemfile.rails-3.1.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/ronen/github/schema_plus
   specs:
-    schema_plus (0.3.2)
+    schema_plus (0.3.3)
       rails
       valuable
 

data/gemfiles/Gemfile.rails-3.2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/ronen/github/schema_plus
   specs:
-    schema_plus (0.3.2)
+    schema_plus (0.3.3)
       rails
       valuable
 

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

@@ -124,20 +124,18 @@ module SchemaPlus
         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
+            if default.is_a? Hash
+              value = default[:value]
+              expr = sql_for_function(default[:expr]) || default[:expr] if default[:expr]
+            else
+              value = default
+              expr = sql_for_function(default)
             end
             if expr
+              raise ArgumentError, "Invalid default expression" unless default_expr_valid?(expr)
               sql << " DEFAULT #{expr}"
             else
-              value = (default.is_a? Hash) ? default[:value] : default
-              sql << " DEFAULT #{quote(value.to_s, options[:column])}" if value
+              sql << " DEFAULT #{quote(value, options[:column])}" if value
             end
           end
           # must explicitly check for :null to allow change_column to work on migrations

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

@@ -110,6 +110,9 @@ module SchemaPlus
         end
 
         def sql_for_function(function)
+          case function
+          when :now then 'CURRENT_TIMESTAMP'
+          end
         end
       end
     end

data/lib/schema_plus/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlus
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/spec/column_definition_spec.rb

@@ -22,6 +22,7 @@ describe "Column definition" do
     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
@@ -38,7 +39,11 @@ describe "Column definition" do
 
   context "default function passed as now" do
     before(:each) do
-      connection.add_column_options!(@sql, { :default => :now })
+      begin
+        connection.add_column_options!(@sql, { :default => :now })
+      rescue ArgumentError => e
+        @raised_argument_error = e
+      end
     end
 
     subject { @sql }
@@ -56,8 +61,8 @@ describe "Column definition" do
     end
 
     if SchemaPlusHelpers.mysql?
-      it "should use CURRENT_TIMESTAMP as the default" do
-        should == "time_taken text DEFAULT 'now'"
+      it "should raise an error" do
+        @raised_argument_error.should be_a ArgumentError
       end
     end
   end

data/spec/migration_spec.rb

@@ -14,6 +14,11 @@ describe ActiveRecord::Migration do
       @model = Post
     end
 
+    it "should properly handle default values for booleans" do
+      expect { create_table(@model,  :bool => { :METHOD => :boolean, :default => true }) }.should_not raise_error
+      @model.create.reload.bool.should be_true
+    end
+
     it "should create foreign keys" do
       create_table(@model,  :user_id => {}, 
                           :author_id => { :references => :users },

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-22 00:00:00.000000000 Z
+date: 2012-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70126041366100 !ruby/object:Gem::Requirement
+  requirement: &70124822121760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70126041366100
+  version_requirements: *70124822121760
 - !ruby/object:Gem::Dependency
   name: valuable
-  requirement: &70126041365680 !ruby/object:Gem::Requirement
+  requirement: &70124822121340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70126041365680
+  version_requirements: *70124822121340
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70126041365180 !ruby/object:Gem::Requirement
+  requirement: &70124822120840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *70126041365180
+  version_requirements: *70124822120840
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70126041364760 !ruby/object:Gem::Requirement
+  requirement: &70124822120420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70126041364760
+  version_requirements: *70124822120420
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &70126041364300 !ruby/object:Gem::Requirement
+  requirement: &70124822119960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70126041364300
+  version_requirements: *70124822119960
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &70126041363880 !ruby/object:Gem::Requirement
+  requirement: &70124822119540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70126041363880
+  version_requirements: *70124822119540
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70126041363460 !ruby/object:Gem::Requirement
+  requirement: &70124822119120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70126041363460
+  version_requirements: *70124822119120
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70126041363040 !ruby/object:Gem::Requirement
+  requirement: &70124822118700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70126041363040
+  version_requirements: *70124822118700
 - !ruby/object:Gem::Dependency
   name: simplecov-gem-adapter
-  requirement: &70126041362620 !ruby/object:Gem::Requirement
+  requirement: &70124822118280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,7 +110,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70126041362620
+  version_requirements: *70124822118280
 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.'