schema_plus 0.3.3 → 0.3.4

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.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)

data/gemfiles/Gemfile.rails-2.3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/ronen/github/schema_plus
   specs:
-    schema_plus (0.3.3)
+    schema_plus (0.3.4)
       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.3)
+    schema_plus (0.3.4)
       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.3)
+    schema_plus (0.3.4)
       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.3)
+    schema_plus (0.3.4)
       rails
       valuable
 

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

@@ -135,7 +135,7 @@ module SchemaPlus
               raise ArgumentError, "Invalid default expression" unless default_expr_valid?(expr)
               sql << " DEFAULT #{expr}"
             else
-              sql << " DEFAULT #{quote(value, options[:column])}" if value
+              sql << " DEFAULT #{quote(value, options[:column])}" unless value.nil?
             end
           end
           # must explicitly check for :null to allow change_column to work on migrations

data/lib/schema_plus/version.rb

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

data/spec/column_definition_spec.rb

@@ -8,96 +8,127 @@ describe "Column definition" do
 
   let(:connection) { ActiveRecord::Base.connection }
 
-  before(:each) do
-    @sql = 'time_taken text'
-  end
-
-  context "just default passed" do
+  context "text columns" do
     before(:each) do
-      connection.add_column_options!(@sql, { :default => "2011-12-11 00:00:00" })
+      @sql = 'time_taken text'
     end
 
-    subject { @sql}
+    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'"
+      it "should use the normal default" do
+        should == "time_taken text DEFAULT '2011-12-11 00:00:00'"
+      end
     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
 
-  context "just default passed in hash" do
-    before(:each) do
-      connection.add_column_options!(@sql, { :default => { :value => "2011-12-11 00:00:00" } })
+      subject { @sql}
+
+      it "should use the normal default" do
+        should == "time_taken text DEFAULT '2011-12-11 00:00:00'"
+      end
     end
 
-    subject { @sql}
+    context "default function passed as now" do
+      before(:each) do
+        begin
+          connection.add_column_options!(@sql, { :default => :now })
+        rescue ArgumentError => e
+          @raised_argument_error = e
+        end
+      end
 
-    it "should use the normal default" do
-      should == "time_taken text DEFAULT '2011-12-11 00:00:00'"
-    end
-  end
+      subject { @sql }
 
-  context "default function passed as now" do
-    before(:each) do
-      begin
-        connection.add_column_options!(@sql, { :default => :now })
-      rescue ArgumentError => e
-        @raised_argument_error = e
+      if SchemaPlusHelpers.postgresql?
+        it "should use NOW() as the default" do
+          should == "time_taken text DEFAULT NOW()"
+        end
       end
-    end
 
-    subject { @sql }
+      if SchemaPlusHelpers.sqlite3?
+        it "should use NOW() as the default" do
+          should == "time_taken text DEFAULT (DATETIME('now'))"
+        end
+      end
 
-    if SchemaPlusHelpers.postgresql?
-      it "should use NOW() as the default" do
-        should == "time_taken text DEFAULT NOW()"
+      if SchemaPlusHelpers.mysql?
+        it "should raise an error" do
+          @raised_argument_error.should be_a ArgumentError
+        end
       end
     end
 
-    if SchemaPlusHelpers.sqlite3?
-      it "should use NOW() as the default" do
-        should == "time_taken text DEFAULT (DATETIME('now'))"
+    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
 
-    if SchemaPlusHelpers.mysql?
-      it "should raise an error" do
-        @raised_argument_error.should be_a ArgumentError
+    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
 
-  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
+  context "boolean column" do
+    before(:each) do
+      @sql = 'time_taken boolean'
     end
 
-    if SchemaPlusHelpers.sqlite3?
-      it "should use NOW() as the default" do
-        should == "time_taken text DEFAULT NOW()"
+    context "passed as boolean false" do
+      before(:each) do
+        connection.add_column_options!(@sql, { :default => false })
       end
-    end
 
-    if SchemaPlusHelpers.mysql?
-      it "should raise an error" do
-        lambda { subject }.should raise_error
+      subject { @sql}
+
+      it "should give the default as false" do
+        should match /boolean DEFAULT (\'f\'|0)/
       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
+    context "passed as boolean true" do
+      before(:each) do
+        connection.add_column_options!(@sql, { :default => true })
       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"
+
+      subject { @sql}
+
+      it "should give the default as true" do
+        should match /boolean DEFAULT (\'t\'|1)/
       end
     end
   end

metadata

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