sequel_migration_builder 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/sequel/migration_builder.rb

@@ -100,7 +100,7 @@ module Sequel
       indent do
         output_columns(table[:columns], table[:primary_key])
         output_indexes(table[:indexes])
-        output_composite_primary_key(table[:primary_key])
+        output_primary_key(table)
       end
       add_line "end"
     end
@@ -112,7 +112,7 @@ module Sequel
     def output_columns(columns, primary_key)
       columns.each do |c| 
         column = Schema::DbColumn.build_from_hash(c)
-        if primary_key && primary_key.size == 1 && primary_key.first == column.name
+        if inline_primary_key?(primary_key, column)
           column.single_primary_key = true
         end
         add_line column.define_statement
@@ -128,8 +128,13 @@ module Sequel
       end
     end
 
-    def output_composite_primary_key(primary_key)
-      if primary_key && primary_key.size > 1
+    def output_primary_key(table)
+      primary_key = table[:primary_key]
+      primary_key_already_output = table[:columns].any? do |c| 
+        inline_primary_key?(primary_key, Schema::DbColumn.build_from_hash(c))
+      end
+
+      if primary_key && ! primary_key_already_output
         add_blank_line
         add_line "primary_key #{primary_key.inspect}"
       end
@@ -137,6 +142,13 @@ module Sequel
 
     private
 
+    def inline_primary_key?(primary_key, column)
+      primary_key &&
+        primary_key.size == 1 &&
+        primary_key.first == column.name &&
+        column.integer_type?
+    end
+    
     attr_reader :result
 
     def each_table(table_names, tables)

data/lib/sequel/schema/db_column.rb

@@ -91,6 +91,10 @@ module Sequel
         }.select {|attribute, method| __send__(method, attribute, other) }.map {|a| a.first }.to_set
       end
 
+      def integer_type?
+        INTEGER_TYPES.include?(column_type)
+      end
+      
       # Returns true if this column is numeric.
       #
       def numeric?

data/sequel_migration_builder.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sequel_migration_builder}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Roland Swingler"]
-  s.date = %q{2011-03-01}
+  s.authors = [%q{Roland Swingler}]
+  s.date = %q{2012-05-11}
   s.description = %q{Build Sequel Migrations based on the differences between two schemas}
   s.email = %q{roland.swingler@gmail.com}
   s.extra_rdoc_files = [
@@ -38,20 +38,11 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/knaveofdiamonds/sequel_migration_builder}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.6}
   s.summary = %q{Build Sequel Migrations based on the differences between two schemas}
-  s.test_files = [
-    "spec/alter_table_operations_spec.rb",
-    "spec/db_column_spec.rb",
-    "spec/db_index_spec.rb",
-    "spec/db_schema_parser_spec.rb",
-    "spec/migration_builder_spec.rb",
-    "spec/spec_helper.rb"
-  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/spec/db_column_spec.rb

@@ -10,11 +10,11 @@ describe Sequel::Schema::DbColumn 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
+  it "should return a primary_key invocation if single_primary_key is set and the column is an integer" 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"
   end

data/spec/db_schema_parser_spec.rb

@@ -71,6 +71,11 @@ describe "A hash in the array returned by Sequel::Schema::DbSchemaParser#parse_t
     @parser.parse_table_schema(@schema).first.size.should == [14,5]
   end
 
+  it "should contain a :size attribute for binary columns" do
+    set_db_type "binary(16)", :blob
+    @parser.parse_table_schema(@schema).first.size.should == 16
+  end
+  
   it "should contain :unsigned false if a numeric column is not unsigned" do
     set_db_type "int(10)"
     @parser.parse_table_schema(@schema).first.unsigned.should == false

data/spec/migration_builder_spec.rb

@@ -78,6 +78,27 @@ END
       should == expected.strip
   end
 
+  it "should add the non-integer primary key of the table" do
+    mock_db = mock(:database)
+    mock_db.should_receive(:tables).at_least(:once).and_return([])
+    table = {
+      :primary_key => :foo,
+      :columns => [{:name => :foo, :column_type => :binary}, {:name => :bar, :column_type => :varchar}]
+    }
+
+    expected = <<-END
+create_table :example_table do
+  binary :foo, :null => false
+  varchar :bar, :null => false
+
+  primary_key [:foo]
+end
+END
+
+    Sequel::MigrationBuilder.new(mock_db).create_table_statement(:example_table, table).join("\n").
+      should == expected.strip
+  end
+  
   it "should add the table options do the create_table statement" do
     mock_db = mock(:database)
     mock_db.should_receive(:tables).at_least(:once).and_return([])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sequel_migration_builder
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Roland Swingler
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 +00:00
-default_executable: 
+date: 2012-05-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sequel
@@ -79,7 +78,6 @@ files:
 - spec/migration_builder_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/knaveofdiamonds/sequel_migration_builder
 licenses: []
 
@@ -109,14 +107,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Build Sequel Migrations based on the differences between two schemas
-test_files: 
-- spec/alter_table_operations_spec.rb
-- spec/db_column_spec.rb
-- spec/db_index_spec.rb
-- spec/db_schema_parser_spec.rb
-- spec/migration_builder_spec.rb
-- spec/spec_helper.rb
+test_files: []
+