table_maker 0.0.1 → 0.0.2

data/Gemfile

@@ -10,6 +10,7 @@ group :development do
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.5.2"
   gem "rcov", ">= 0"
+  gem "test-unit"
 
   if RUBY_PLATFORM == 'java'
     gem 'jdbc-sqlite3'

data/Gemfile.lock

@@ -11,6 +11,7 @@ GEM
     rcov (0.9.9-java)
     sequel (3.20.0)
     sqlite3 (1.3.3)
+    test-unit (2.2.0)
 
 PLATFORMS
   java
@@ -22,3 +23,4 @@ DEPENDENCIES
   rcov
   sequel
   sqlite3
+  test-unit

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/table_maker.rb

@@ -7,6 +7,7 @@ class TableMaker
     @column_info = []
     @column_names = []
     @data = []
+    @has_primary_key = false
     parse_layout(layout)
     create_table
     import_data
@@ -27,7 +28,12 @@ class TableMaker
             md = str.match(/(\w+)\((\w+)\)/)
             name = md[1].to_sym
             type = Object.module_eval("::#{md[2]}", __FILE__, __LINE__)
-            @column_info << { :name => name, :type => type }
+            opts = { :name => name, :type => type }
+            if name == :id
+              opts[:primary_key] = true
+              @has_primary_key = true
+            end
+            @column_info << opts
             @column_names << name
           end
         else
@@ -38,8 +44,11 @@ class TableMaker
 
     def create_table
       column_info = @column_info
+      has_primary_key = @has_primary_key
       @db.create_table(@table_name) do
-        primary_key :id
+        if !has_primary_key
+          primary_key :id
+        end
         @columns = column_info
       end
     end

data/test/test_table_maker.rb

@@ -29,7 +29,7 @@ class TestTableMaker < Test::Unit::TestCase
     assert_equal expected, ds.select(:id, :foo, :bar, :baz).order(:id).all
   end
 
-  def test_manually_specified_id
+  def test_manually_specified_integer_id
     db = Sequel.connect("#{RUBY_PLATFORM == 'java' ? "jdbc:" : ""}sqlite::memory:")
     TableMaker.new(db, :foo, <<-EOF)
       +-------------+-------------+-------------+--------------+
@@ -49,6 +49,30 @@ class TestTableMaker < Test::Unit::TestCase
       {:id => 73, :foo => 'mno', :bar => 'pqr', :baz => 789}
     ]
     assert_equal expected, ds.select(:id, :foo, :bar, :baz).order(:id).all
+    assert db.schema(:foo).assoc(:id)[1][:primary_key]
+  end
+
+  def test_manually_specified_string_id
+    db = Sequel.connect("#{RUBY_PLATFORM == 'java' ? "jdbc:" : ""}sqlite::memory:")
+    TableMaker.new(db, :foo, <<-EOF)
+      +------------+-------------+-------------+--------------+
+      | id(String) | foo(String) | bar(String) | baz(Integer) |
+      +============+=============+=============+==============+
+      | abc        | abc         | def         | 123          |
+      | 123        | ghi         | jkl         | 456          |
+      | do re      | mno         | pqr         | 789          |
+      | mi         | stu         | vwx         | 000          |
+      +-------------+-------------+-------------+--------------+
+    EOF
+    ds = db[:foo]
+    expected = [
+      {:id => '123',   :foo => 'ghi', :bar => 'jkl', :baz => 456},
+      {:id => 'abc',   :foo => 'abc', :bar => 'def', :baz => 123},
+      {:id => 'do re', :foo => 'mno', :bar => 'pqr', :baz => 789},
+      {:id => 'mi',    :foo => 'stu', :bar => 'vwx', :baz => 000}
+    ]
+    assert_equal expected, ds.select(:id, :foo, :bar, :baz).order(:id).all
+    assert db.schema(:foo).assoc(:id)[1][:primary_key]
   end
 
   def test_blank_cells_are_null

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: table_maker
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
+  prerelease: 
+  version: 0.0.2
 platform: ruby
 authors: 
 - Jeremy Stephens
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 -06:00
+date: 2011-03-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,8 +20,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   prerelease: false
@@ -37,10 +31,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
   type: :development
   prerelease: false
@@ -52,10 +42,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 2
         version: 1.5.2
   type: :development
   prerelease: false
@@ -67,25 +53,32 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: sqlite3
+  name: test-unit
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id006
 description: Simple ASCII table importer for Sequel
 email: viking@pillageandplunder.net
 executables: []
@@ -120,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3180758858338140348
+      hash: -850477941164118927
       segments: 
       - 0
       version: "0"
@@ -129,13 +122,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: Simple ASCII table importer for Sequel