schema_plus 0.3.0 → 0.3.1

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.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
 
@@ -186,7 +187,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)
+  * Luke Saunders (https://github.com/lukesaunders)
 
 * SchemaPlus was created in 2011 by Michał Łomnicki and Ronen Barzel
 
@@ -218,7 +219,7 @@ And you can run the specs for a specific adapter:
   $ rake mysql2:spec # to run mysql2 tests only
   $ rake sqlite3:spec # to run sqlite3 tests only
 
-If you're running ruby 1.9.2, code coverage results will be in coverage/index.html -- it should be at 100% coverage.
+If you're running ruby 1.9, code coverage results will be in coverage/index.html -- it should be at 100% coverage.
 
 == License
 

data/gemfiles/Gemfile.rails-2.3.lock

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

data/gemfiles/Gemfile.rails-3.0.lock

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

data/gemfiles/Gemfile.rails-3.1.lock

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

data/gemfiles/Gemfile.rails-3.2.lock

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

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

@@ -25,7 +25,16 @@ module SchemaPlus
 
         module ClassMethods
           def extract_value_from_default_with_schema_plus(default)
+            
+
             value = extract_value_from_default_without_schema_plus(default)
+            
+            # in some cases (e.g. if change_column_default(table, column,
+            # nil) is used), postgresql will return NULL::xxxxx (rather
+            # than nil) for a null default -- make sure we treat it as nil,
+            # not as a function.
+            default = nil if value.nil? && default =~ /\ANULL::(?:character varying|bpchar|text)\z/m
+
             if value.nil? && !default.nil?
               value = { :expr => default }
             end

data/lib/schema_plus/version.rb

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

data/spec/schema_dumper_spec.rb

@@ -21,6 +21,7 @@ describe "Schema dump" do
           t.text :body
           t.integer :user_id
           t.integer :first_comment_id
+          t.string :string_no_default
         end
 
         create_table :comments, :force => true do |t|
@@ -78,7 +79,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
-          dump_posts.should match(to_regexp(%q{t.datetime "posted_at",        :default => '2001-09-28 00:00:00'}))
+          dump_posts.should match(%r{t.datetime "posted_at",\s*:default => '2001-09-28 00:00:00'})
         end
       end
     end
@@ -98,18 +99,18 @@ describe "Schema dump" do
 
       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"}))
+          dump_posts.should match(%r{t.string  "posted_at",\s*: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
+
+  it "should leave out :default when default was changed to null" do
+    ActiveRecord::Migration.suppress_messages do
+      ActiveRecord::Migration.change_column_default :posts, :string_no_default, nil
     end
+    dump_posts.should match(%r{t.string\s+"string_no_default"\s*$})
   end
 
   it "should include foreign_key options" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-19 00:00:00.000000000 Z
+date: 2012-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70239318248000 !ruby/object:Gem::Requirement
+  requirement: &70326231344460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70239318248000
+  version_requirements: *70326231344460
 - !ruby/object:Gem::Dependency
   name: valuable
-  requirement: &70239318247580 !ruby/object:Gem::Requirement
+  requirement: &70326231343800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70239318247580
+  version_requirements: *70326231343800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70239318247080 !ruby/object:Gem::Requirement
+  requirement: &70326231342600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *70239318247080
+  version_requirements: *70326231342600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70239318246660 !ruby/object:Gem::Requirement
+  requirement: &70326235449900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70239318246660
+  version_requirements: *70326235449900
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &70239318246200 !ruby/object:Gem::Requirement
+  requirement: &70326235449440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70239318246200
+  version_requirements: *70326235449440
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &70239318245780 !ruby/object:Gem::Requirement
+  requirement: &70326235449020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70239318245780
+  version_requirements: *70326235449020
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70239318245360 !ruby/object:Gem::Requirement
+  requirement: &70326235448600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70239318245360
+  version_requirements: *70326235448600
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70239318244940 !ruby/object:Gem::Requirement
+  requirement: &70326235448180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70239318244940
+  version_requirements: *70326235448180
 - !ruby/object:Gem::Dependency
   name: simplecov-gem-adapter
-  requirement: &70239318244520 !ruby/object:Gem::Requirement
+  requirement: &70326235447760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,7 +110,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70239318244520
+  version_requirements: *70326235447760
 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.'