sequel_migration_builder 0.1.0 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.2

data/lib/sequel/migration_builder.rb

@@ -111,8 +111,13 @@ module Sequel
     def create_table_statement(table_name, table)
       add_line "create_table #{table_name.inspect}#{pretty_hash(table[:table_options])} do"
       indent do
+        table[:primary_key] = [table[:primary_key]] if table[:primary_key].kind_of?(Symbol)
         table[:columns].each do |c| 
-          add_line Schema::DbColumn.build_from_hash(c).define_statement
+          column = Schema::DbColumn.build_from_hash(c)
+          if table[:primary_key] && table[:primary_key].size == 1 && table[:primary_key].first == column.name
+            column.single_primary_key = true
+          end
+          add_line column.define_statement
         end
         if table[:indexes]
           add_blank_line
@@ -122,7 +127,7 @@ module Sequel
             add_line "index #{columns.inspect}, :name => #{name.to_sym.inspect}#{pretty_hash(opts)}"
           end
         end
-        if table[:primary_key]
+        if table[:primary_key] && table[:primary_key].size > 1
           add_blank_line
           add_line "primary_key #{table[:primary_key].inspect}"
         end

data/lib/sequel/schema/alter_table_operations.rb

@@ -44,7 +44,7 @@ module Sequel
         result = []
         
         diffs = db_column.diff(new_column)
-        result << :change_type_statement    if [:column_type, :size, :unsigned].any? {|sym| diffs.include?(sym) }
+        result << :change_type_statement    if [:elements, :column_type, :size, :unsigned].any? {|sym| diffs.include?(sym) }
         # only need to explicitly set the default if we're not changing the column type.
         result << :change_default_statement if diffs.include?(:default) && result.empty?
         result << :change_null_statement    if diffs.include?(:null)

data/lib/sequel/schema/db_column.rb

@@ -2,7 +2,7 @@ require 'set'
 
 module Sequel
   module Schema
-    DbColumn = Struct.new(:name, :column_type, :null, :default, :unsigned, :size, :elements)
+    DbColumn = Struct.new(:name, :column_type, :null, :default, :unsigned, :size, :elements, :single_primary_key)
 
     # A column in a database table.
     #
@@ -30,7 +30,11 @@ module Sequel
       # create_table block.
       #
       def define_statement
-        ["#{column_type} #{name.inspect}", options].compact.join(", ")
+        if single_primary_key
+          ["primary_key #{name.inspect}, :type => #{column_type.inspect}", options].compact.join(", ")
+        else
+          ["#{column_type} #{name.inspect}", options].compact.join(", ")
+        end
       end
 
       # Returns a Sequel migration statement to remove the column.

data/lib/sequel/schema/db_schema_parser.rb

@@ -97,7 +97,7 @@ module Sequel
       def extract_enum_elements(db_type_string, type)
         return unless type == :enum
 
-        match = db_type_string.match(/\(([^)]+)\)/)
+        match = db_type_string.match(/\((.+)\)/)
         eval('[' + match[1] + ']') if match[1]
       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.1.0"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roland Swingler"]
-  s.date = %q{2010-07-02}
+  s.date = %q{2010-07-13}
   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/alter_table_operations_spec.rb

@@ -60,6 +60,14 @@ describe "Sequel::Schema::AlterTableOperations.build_column_operations" do
     ops.size.should == 1
     ops.first.up.should == "set_column_type :foo, :smallint, :default => 2"
   end
+
+  it "should return a ChangeColumn operation if the elements are different" do
+    a = build_column(:name => :foo, :column_type => :enum, :elements => ["A"])
+    b = build_column(:name => :foo, :column_type => :enum, :elements => ["A", "B"])
+    ops = Sequel::Schema::AlterTableOperations.build_column_operations(a,b)
+
+    ops.first.up.should == "set_column_type :foo, :enum, :default => nil, :elements => [\"A\", \"B\"]"
+  end
 end
 
 describe "Sequel::Schema::AlterTableOperations.build" do

data/spec/db_column_spec.rb

@@ -9,6 +9,11 @@ describe Sequel::Schema::DbColumn do
   it "should return a #define_statement" do
     @column.define_statement.should == "integer :foo, :null => false, :default => 10, :unsigned => true, :size => 10"
   end
+
+  it "should return a primary_key invocation if single_primary_key is set" do
+    @column.single_primary_key = true
+    @column.define_statement.should == "primary_key :foo, :type => :integer, :null => false, :default => 10, :unsigned => true, :size => 10"
+  end
   
   it "should return a #drop_statement" do
     @column.drop_statement.should == "drop_column :foo"
@@ -87,6 +92,13 @@ describe Sequel::Schema::DbColumn do
     b.diff(a).should == [:default].to_set
   end
 
+  it "should consider columns with different elements to be different" do
+    a = Sequel::Schema::DbColumn.new(:foo, :enum, true, nil, true, nil, ["A"])
+    b = Sequel::Schema::DbColumn.new(:foo, :enum, true, nil, true, nil, ["A", "B"])
+    a.diff(b).should == [:elements].to_set
+    b.diff(a).should == [:elements].to_set
+  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

@@ -137,3 +137,18 @@ describe "Parsing a text column" do
     lambda { parser.parse_table_schema(schema) }.should_not raise_error
   end
 end
+
+describe "Parsing an enum column" do
+  it "should not raise an error when enum values contains brackets" 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('foo (bar)', 'baz')",
+                 :allow_null => true   }]]
+
+    lambda { parser.parse_table_schema(schema) }.should_not raise_error(SyntaxError)
+  end
+end

data/spec/migration_builder_spec.rb

@@ -78,10 +78,8 @@ END
 
     expected = <<-END
 create_table :example_table do
-  integer :foo, :null => false
+  primary_key :foo, :type => :integer, :null => false
   varchar :bar, :null => false
-
-  primary_key :foo
 end
 END
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Roland Swingler
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-02 00:00:00 +01:00
+date: 2010-07-13 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency