sequel_migration_builder 0.2.1 → 0.2.2

data/CHANGELOG

@@ -1,5 +1,10 @@
 CHANGELOG
 
+== 0.2.2
+
+* Bug fix - decimal defaults are compared correctly.
+* Bug fix - escaped ' in enum elements partially solved.
+
 == 0.2.1
 
 * Bug fix - cast :unique => nil to false in DbIndex.

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/sequel/schema/db_column.rb

@@ -1,4 +1,5 @@
 require 'set'
+require 'bigdecimal'
 
 module Sequel
   module Schema
@@ -26,6 +27,11 @@ module Sequel
         self.new *members.map {|key| attrs[key] || attrs[key.to_sym] }
       end
 
+      def initialize(*args)
+        super
+        normalize_default
+      end
+      
       # Returns a Sequel migration statement to define a column in a
       # create_table block.
       #
@@ -147,6 +153,12 @@ module Sequel
         opts.render
       end
 
+      def normalize_default
+        if DECIMAL_TYPES.include?(column_type) && ! self[:default].nil?
+          self.default = BigDecimal(self[:default].to_s)
+        end
+      end
+      
       # Formats column options in a Sequel migration
       class OptionBuilder
         def initialize

data/lib/sequel/schema/db_schema_parser.rb

@@ -43,7 +43,7 @@ module Sequel
         db_schema.map do |column|
           type = parse_type(column.last[:db_type])
           DbColumn.build_from_hash(:name        => column.first,
-                                   :default     => column.last[:ruby_default],
+                                   :default     => column.last[:ruby_default] || column.last[:default],
                                    :null        => column.last[:allow_null],
                                    :column_type => type,
                                    :unsigned    => extract_unsigned(column.last[:db_type], type),
@@ -98,7 +98,7 @@ module Sequel
         return unless type == :enum
 
         match = db_type_string.match(/\((.+)\)/)
-        eval('[' + match[1] + ']') if match[1]
+        eval('[' + match[1].gsub(/''/, "\\\\'") + ']') if match[1]
       end
     end
   end

data/sequel_migration_builder.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sequel_migration_builder}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roland Swingler"]
-  s.date = %q{2011-01-13}
+  s.date = %q{2011-01-14}
   s.description = %q{Build Sequel Migrations based on the differences between two schemas}
   s.email = %q{roland.swingler@gmail.com}
   s.extra_rdoc_files = [

data/spec/db_column_spec.rb

@@ -99,6 +99,14 @@ describe Sequel::Schema::DbColumn do
     b.diff(a).should == [:elements].to_set
   end
 
+  it "should cast decimal defaults to the correct number" do
+    a = Sequel::Schema::DbColumn.new(:foo, :decimal, true, '0.00', true, [4,2], nil)
+    b = Sequel::Schema::DbColumn.new(:foo, :decimal, true, 0, true, [4,2], nil)
+
+    a.diff(b).should == Set.new
+    b.diff(a).should == Set.new
+  end
+  
   it "should be buildable from a Hash" do
     Sequel::Schema::DbColumn.build_from_hash(:name => "foo", 
                                        :column_type => "integer").column_type.should == "integer"

data/spec/db_schema_parser_spec.rb

@@ -151,4 +151,18 @@ describe "Parsing an enum column" do
 
     lambda { parser.parse_table_schema(schema) }.should_not raise_error(SyntaxError)
   end
+
+  it "should correctly parse elements with escaped '' in them" do
+    parser = Sequel::Schema::DbSchemaParser.for_db(stub(:database))
+    schema = [[:example_column, 
+               { :type => :enum, 
+                 :default => nil, 
+                 :ruby_default => nil, 
+                 :primary_key => false, 
+                 :db_type => "enum('don''t')",
+                 :allow_null => true   }]]
+
+    
+    parser.parse_table_schema(schema).first.elements.should == ["don't"]
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sequel_migration_builder
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Roland Swingler
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-13 00:00:00 +00:00
+date: 2011-01-14 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency