chicagowarehouse 0.6.0 → 0.6.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmI5NTE0ZmI4MTJhZDc3MjE2YTkzMTM5NWZhY2M5MDIxMTBjODI1Yg==
+    MmViNTc2MjUzYTFiNjI0NDZmODM2Y2Y0ZDQ2N2ZmYjE0Y2MwNzFjYw==
   data.tar.gz: !binary |-
-    MGM2YjI2ZWFkNzhlMzI3NzM0MmY0YjgyMGQ5MjdhYzYxNGQ3ZWM1MQ==
+    YzRlNjA5MjEzYjQ5NzBlZjg3MDBhNjU1NjI5Mzk5NDNkN2I5M2Q0OA==
 SHA512:
   metadata.gz: !binary |-
-    Y2MwMDQ2M2M4NTdiMzE0MzY0MjAwOWU4YmYwYzI5ZjI0NDdhYTU2ZTU3NGQw
-    OThiZjZiZjFmYWYyOGZmYzdkY2EyZjZiYzRjYjE2OWI5Y2ZlNmZiZDNjOWQy
-    NDIwZTZhNGMwYjAxNWJkMTJjZmQ3NDAzNTdkMWVjZDlmMjgxMWQ=
+    NWUwYzE3ZDIwYWNjYjE4YWE1MjU5NWU0ZDJiNjE0ZDZlMGU3YmQ4ZjJkNjJh
+    Nzg2MWU1Njk4YmI5ZDE0ZjQ4ZTY2M2FlZTIzMDQ5NDdiMWFiN2Q1NzgwMGVm
+    ZWYwZTA3MDE3MDMxM2Q0MWFkYzM3ZDcwMjY0ZWVlOTNiNmJkZTE=
   data.tar.gz: !binary |-
-    NzQ1YTA5NjM4NWVlMmU4YmJhMTM3YjhlMzQ5MzgwMWY4YmEwZmU2MTliYzFk
-    OWRmNDAwMDQwNWY1NWFkMzVkODlhYjZiM2U1MGNjZGI0OWQ3ZTViMWQ4ZDg1
-    NDYyMzBjZDA5NzU4NDBkOGE1NTQ2OGM1NGJlZDQ0ZTNkMzJkZGM=
+    YzgxZGY5YTg1NTM1YTk1OTFmZGJjMGFjMjJkOWViNTE3MjFmNTU0MGRhY2Uy
+    NzZjMDYwNzRlMmViYTliOTU1MmM1OWEzNjgxNTdlZjQ1MzhlNDJjODdhMDY4
+    NTJhMzE0NTJlN2QyM2Q1Njc4MWY3NDAxODIyYjE3Yjk4YmUzODM=

data/Gemfile

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 
 gem "sequel", ">= 4.7"
-gem "sequel_migration_builder", ">= 0.4.0"
+gem "sequel_migration_builder", ">= 0.4.1"
 gem "chronic"
 
 group :development do

data/Rakefile

@@ -14,7 +14,7 @@ require 'rake'
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
   gem.name              = "chicagowarehouse"
-  gem.version           = "0.6.0"
+  gem.version           = "0.6.1"
   gem.summary           = "Ruby Data Warehousing"
   gem.description       = "Simple Data Warehouse toolkit for ruby"
   gem.author            = "Roland Swingler"

data/chicagowarehouse.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: chicagowarehouse 0.6.0 ruby lib
+# stub: chicagowarehouse 0.6.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "chicagowarehouse"
-  s.version = "0.6.0"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Roland Swingler"]
-  s.date = "2014-09-01"
+  s.date = "2014-09-02"
   s.description = "Simple Data Warehouse toolkit for ruby"
   s.email = "roland.swingler@gmail.com"
   s.extra_rdoc_files = [
@@ -91,7 +91,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sequel>, [">= 4.7"])
-      s.add_runtime_dependency(%q<sequel_migration_builder>, [">= 0.4.0"])
+      s.add_runtime_dependency(%q<sequel_migration_builder>, [">= 0.4.1"])
       s.add_runtime_dependency(%q<chronic>, [">= 0"])
       s.add_development_dependency(%q<mysql2>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
@@ -103,7 +103,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<timecop>, [">= 0"])
     else
       s.add_dependency(%q<sequel>, [">= 4.7"])
-      s.add_dependency(%q<sequel_migration_builder>, [">= 0.4.0"])
+      s.add_dependency(%q<sequel_migration_builder>, [">= 0.4.1"])
       s.add_dependency(%q<chronic>, [">= 0"])
       s.add_dependency(%q<mysql2>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
@@ -116,7 +116,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<sequel>, [">= 4.7"])
-    s.add_dependency(%q<sequel_migration_builder>, [">= 0.4.0"])
+    s.add_dependency(%q<sequel_migration_builder>, [">= 0.4.1"])
     s.add_dependency(%q<chronic>, [">= 0"])
     s.add_dependency(%q<mysql2>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])

data/lib/chicago/database/concrete_schema_strategies.rb

@@ -16,17 +16,33 @@ module Chicago
       def self.for_db(db)
         if db.database_type == :mysql
           MysqlStrategy.new
-        elsif db.database_type == :postgres && db.opts[:adapter] == "redshift"
+        elsif db.database_type == :postgres && 
+            db.opts[:adapter] == "redshift"
           RedshiftStrategy.new
         else
           self.new
         end
       end
 
+      # Returns the definition of the column which should be used as
+      # the primary id column.
+      def id_column
+        {
+          :name => :id,
+          :column_type => :integer,
+          :unsigned => true
+        }
+      end
+
+      # Returns options to be passed to the Migration Builder.
+      #
+      # Empty by default, may be overridden by subclasses for specific
+      # databases.
       def migration_options
         {}
       end
 
+      # Returns the hash of the column.
       def column_hash(column)
         hsh = column.to_hash.merge(:column_type => db_type(column))
         hsh.delete(:elements) if hsh.has_key?(:elements)
@@ -98,9 +114,17 @@ module Chicago
         {:separate_alter_table_statements => true, :immutable_columns => true}
       end
 
+      def id_column
+        {
+          :name => :id,
+          :column_type => :integer,
+          :unsigned => false
+        }
+      end
+
       def column_hash(column)
         hsh = super(column)
-
+        hsh.delete(:unsigned)
         if column.column_type == :string && hsh[:size]
           # Redshift column sizes are in bytes, not characters, so
           # increase to 4 bytes per-char for UTF-8 reasons.
@@ -110,6 +134,17 @@ module Chicago
         hsh
       end
 
+      def db_type(column)
+        t = super(column)
+
+        case t
+        when :year then :smallint
+        when :binary then :varchar
+        else
+          t
+        end
+      end
+
       # Redshift does not support indexes, so do not output any.
       def indexes(table)
         []

data/lib/chicago/database/schema_generator.rb

@@ -42,11 +42,7 @@ module Chicago
           :primary_key => [:id],
           :table_options => @type_converter.table_options,
           :indexes => @type_converter.indexes(table),
-          :columns => [{
-                         :name => :id,
-                         :column_type => :integer,
-                         :unsigned => true
-                       }]
+          :columns => [@type_converter.id_column]
         }
 
         t[:columns] += table.columns.reject(&:calculated?).

data/spec/database/concrete_schema_strategies.rb

@@ -81,6 +81,28 @@ describe "Generic DbTypeConverter" do
       @tc.db_type(column).should == expected_db_type
     end
   end
+
+  it "should have an unsigned integer id column" do
+    @tc.id_column.should == {
+      :name => :id,
+      :column_type => :integer
+      :unsigned => true
+    }
+  end
+end
+
+describe Chicago::Database::RedshiftStrategy do
+  before :each do
+    @tc = Database::RedshiftStrategy.new
+  end
+
+  it "should have an integer id column (not unsigned)" do
+    @tc.id_column.should == {
+      :name => :id,
+      :column_type => :integer
+      :unsigned => false
+    }
+  end
 end
 
 describe Chicago::Database::MysqlStrategy do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chicagowarehouse
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Roland Swingler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-01 00:00:00.000000000 Z
+date: 2014-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement