chicagowarehouse 0.4.2 → 0.4.3

data/Rakefile

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

data/chicagowarehouse.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "chicagowarehouse"
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roland Swingler"]

data/lib/chicago/database/schema_generator.rb

@@ -89,7 +89,7 @@ module Chicago
         indexes = @table.columns.select(&:indexed?).inject({}) do |hsh, d|
           hsh.merge("#{d.name}_idx".to_sym => {
                       :columns => d.database_name,
-                      :unique => false})
+                      :unique => d.unique?})
         end
         indexes.merge!(natural_key_index) if @table.natural_key
         indexes

data/lib/chicago/database/type_converters.rb

@@ -28,7 +28,6 @@ module Chicago
           when :string  then string_type(column.min, column.max)
           when :money   then :decimal
           when :percent then :decimal
-          when :hash    then :binary
           else
             column.column_type
           end

data/lib/chicago/schema/column.rb

@@ -53,8 +53,9 @@ module Chicago
         @default     = @opts[:default]
         @descriptive = !! @opts[:descriptive]
         @internal    = @opts.has_key?(:internal) ? !! @opts[:internal] : 
-          column_type == :hash
-        @unique      = !! @opts[:unique]
+          column_type == :binary
+        @unique      = @opts.has_key?(:unique) ? !! @opts[:unique] :
+          column_type == :binary
         @optional    = !! (@opts.has_key?(:optional) ? @opts[:optional] : 
                            @opts[:null])
       end
@@ -161,7 +162,7 @@ module Chicago
 
       # Returns true if the column stores a binary value.
       def binary?
-        @binary ||= [:binary, :hash].include?(column_type)
+        @binary ||= :binary == column_type
       end
 
       def hash #:nodoc:
@@ -208,7 +209,7 @@ module Chicago
                     [12,2]
                   elsif column_type == :percent
                     [6,3]
-                  elsif column_type == :hash
+                  elsif column_type == :binary
                     16
                   end
       end

data/spec/database/db_type_converter_spec.rb

@@ -31,11 +31,6 @@ shared_examples_for "All DB type converters" do
       @tc.db_type(column).should == :decimal
     end
 
-    it "should return :binary for a hash column type" do
-      column = Schema::Column.new(:id, :hash)
-      @tc.db_type(column).should == :binary
-    end
-
     it "should assume any other type is a database type and return it" do
       column = Schema::Column.new(:id, :foo)
       @tc.db_type(column).should == :foo

data/spec/database/schema_generator_spec.rb

@@ -120,13 +120,13 @@ describe Chicago::Database::SchemaGenerator do
         columns do
           string :foo, :descriptive => true
           string :bar
-          string :baz
+          string :baz, :unique => true
         end
       end
 
       expected = {
         :bar_idx => {:columns => :bar, :unique => false},
-        :baz_idx => {:columns => :baz, :unique => false}
+        :baz_idx => {:columns => :baz, :unique => true}
       }
       subject.visit_dimension(@dimension)[:dimension_user][:indexes].should == expected
     end

data/spec/query_spec.rb

@@ -423,35 +423,35 @@ describe Chicago::Query do
     end
 
     it "can filter based on starts with" do
-      @q.filter({:column => "sales.product.sku", :value => "123", :op => :sw}).dataset.sql.should =~ /WHERE \(`product`\.`sku` LIKE '123%'\)/
+      @q.filter({:column => "sales.product.sku", :value => "123", :op => :sw}).dataset.sql.should =~ /WHERE \(`product`\.`sku` LIKE '123%'( ESCAPE '.+')?\)/
     end
 
     it "can filter based on 'starts with' with multiple values" do
-      @q.filter({:column => "sales.product.sku", :value => ["123","AB"], :op => :sw}).dataset.sql.should =~ /WHERE \(\(`product`\.`sku` LIKE '123%'\) OR \(`product`\.`sku` LIKE 'AB%'\)\)/
+      @q.filter({:column => "sales.product.sku", :value => ["123","AB"], :op => :sw}).dataset.sql.should =~ /WHERE \(\(`product`\.`sku` LIKE '123%'( ESCAPE '.+')?\) OR \(`product`\.`sku` LIKE 'AB%'( ESCAPE '.+')?\)\)/
     end
 
     it "can filter based on not starts with" do
-      @q.filter({:column => "sales.product.sku", :value => "123", :op => :nsw}).dataset.sql.should =~ /WHERE \(`product`\.`sku` NOT LIKE '123%'\)/
+      @q.filter({:column => "sales.product.sku", :value => "123", :op => :nsw}).dataset.sql.should =~ /WHERE \(`product`\.`sku` NOT LIKE '123%'( ESCAPE '.+')?\)/
     end
 
     it "can filter based on 'not starts with' with multiple values" do
-      @q.filter({:column => "sales.product.sku", :value => ["123","AB"], :op => :nsw}).dataset.sql.should =~ /WHERE \(\(`product`\.`sku` NOT LIKE '123%'\) AND \(`product`\.`sku` NOT LIKE 'AB%'\)\)/
+      @q.filter({:column => "sales.product.sku", :value => ["123","AB"], :op => :nsw}).dataset.sql.should =~ /WHERE \(\(`product`\.`sku` NOT LIKE '123%'( ESCAPE '.+')?\) AND \(`product`\.`sku` NOT LIKE 'AB%'( ESCAPE '.+')?\)\)/
     end
 
     it "can filter based on contains" do
-      @q.filter({:column => "sales.product.sku", :value => "123", :op => :con}).dataset.sql.should =~ /WHERE \(`product`\.`sku` LIKE '%123%'\)/
+      @q.filter({:column => "sales.product.sku", :value => "123", :op => :con}).dataset.sql.should =~ /WHERE \(`product`\.`sku` LIKE '%123%'( ESCAPE '.+')?\)/
     end
 
     it "can filter based on not contains" do
-      @q.filter({:column => "sales.product.sku", :value => "123", :op => :ncon}).dataset.sql.should =~ /WHERE \(`product`\.`sku` NOT LIKE '%123%'\)/
+      @q.filter({:column => "sales.product.sku", :value => "123", :op => :ncon}).dataset.sql.should =~ /WHERE \(`product`\.`sku` NOT LIKE '%123%'( ESCAPE '.+')?\)/
     end
 
     it "can filter based on multiple contains" do
-      @q.filter({:column => "sales.product.sku", :value => ["123", "AB", "foo"], :op => :con}).dataset.sql.should =~ /WHERE \(\(`product`\.`sku` LIKE '%123%'\) OR \(`product`\.`sku` LIKE '%AB%'\) OR \(`product`\.`sku` LIKE '%foo%'\)\)/
+      @q.filter({:column => "sales.product.sku", :value => ["123", "AB", "foo"], :op => :con}).dataset.sql.should =~ /WHERE \(\(`product`\.`sku` LIKE '%123%'( ESCAPE '.+')?\) OR \(`product`\.`sku` LIKE '%AB%'( ESCAPE '.+')?\) OR \(`product`\.`sku` LIKE '%foo%'( ESCAPE '.+')?\)\)/
     end
 
     it "can filter based on multiple contains" do
-      @q.filter({:column => "sales.product.sku", :value => ["123", "AB", "foo"], :op => :ncon}).dataset.sql.should =~ /WHERE \(\(`product`\.`sku` NOT LIKE '%123%'\) AND \(`product`\.`sku` NOT LIKE '%AB%'\) AND \(`product`\.`sku` NOT LIKE '%foo%'\)\)/
+      @q.filter({:column => "sales.product.sku", :value => ["123", "AB", "foo"], :op => :ncon}).dataset.sql.should =~ /WHERE \(\(`product`\.`sku` NOT LIKE '%123%'( ESCAPE '.+')?\) AND \(`product`\.`sku` NOT LIKE '%AB%'( ESCAPE '.+')?\) AND \(`product`\.`sku` NOT LIKE '%foo%'( ESCAPE '.+')?\)\)/
     end
     
     it "does not join the base table when filtering" do

data/spec/schema/column_spec.rb

@@ -158,15 +158,15 @@ describe Chicago::Schema::Column do
   end
   
   it "is binary if a hash" do
-    described_class.new(:foo, :hash).should be_binary
+    described_class.new(:foo, :binary).should be_binary
   end
 
-  it "is nullable by default if a hash" do
-    described_class.new(:foo, :hash).should be_null
+  it "is nullable by default if binary" do
+    described_class.new(:foo, :binary).should be_null
   end
 
-  it "is internal by default if a hash" do
-    described_class.new(:foo, :hash).should be_internal
+  it "is internal by default if binary" do
+    described_class.new(:foo, :binary).should be_internal
   end
 
   it "is visitable" do
@@ -214,8 +214,9 @@ describe "Chicago::Schema::Column#to_hash" do
     Chicago::Schema::Column.new(:some_value, :money).to_hash[:size].should == [12,2]
   end
 
-  it "should have a default :size of 16 for hash types" do
-    Chicago::Schema::Column.new(:some_value, :hash).to_hash[:size].should == 16
+  it "should have a default :size of 16 for binary types" do
+    Chicago::Schema::Column.new(:some_value, :binary).
+      to_hash[:size].should == 16
   end
 
   it "should be unsigned by default if a percentage" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: chicagowarehouse
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Roland Swingler
@@ -28,10 +28,10 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-  requirement: *id001
-  type: :runtime
-  prerelease: false
   name: sequel
+  prerelease: false
+  type: :runtime
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -44,10 +44,10 @@ dependencies:
         - 3
         - 2
         version: 0.3.2
-  requirement: *id002
-  type: :runtime
-  prerelease: false
   name: sequel_migration_builder
+  prerelease: false
+  type: :runtime
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -60,10 +60,10 @@ dependencies:
         - 8
         - 1
         version: 2.8.1
-  requirement: *id003
-  type: :runtime
-  prerelease: false
   name: mysql
+  prerelease: false
+  type: :runtime
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -74,10 +74,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
-  type: :runtime
-  prerelease: false
   name: chronic
+  prerelease: false
+  type: :runtime
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -88,10 +88,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
-  type: :development
-  prerelease: false
   name: yard
+  prerelease: false
+  type: :development
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -103,10 +103,10 @@ dependencies:
         - 2
         - 0
         version: "2.0"
-  requirement: *id006
-  type: :development
-  prerelease: false
   name: rspec
+  prerelease: false
+  type: :development
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -117,10 +117,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id007
-  type: :development
-  prerelease: false
   name: bundler
+  prerelease: false
+  type: :development
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -131,10 +131,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id008
-  type: :development
-  prerelease: false
   name: jeweler
+  prerelease: false
+  type: :development
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -145,10 +145,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id009
-  type: :development
-  prerelease: false
   name: rcov
+  prerelease: false
+  type: :development
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
@@ -159,10 +159,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id010
-  type: :development
-  prerelease: false
   name: flog
+  prerelease: false
+  type: :development
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
   version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
@@ -173,10 +173,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id011
-  type: :development
-  prerelease: false
   name: ZenTest
+  prerelease: false
+  type: :development
+  requirement: *id011
 - !ruby/object:Gem::Dependency 
   version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
@@ -187,10 +187,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id012
-  type: :development
-  prerelease: false
   name: timecop
+  prerelease: false
+  type: :development
+  requirement: *id012
 description: Simple Data Warehouse toolkit for ruby
 email: roland.swingler@gmail.com
 executables: []