chicagowarehouse 0.4.8 → 0.5.0

data/Gemfile

@@ -1,7 +1,6 @@
 source "http://rubygems.org"
 
-# The distinct extension won't work in Sequel 3.30 onwards at present.
-gem "sequel", ">= 3.34", "< 4.7"
+gem "sequel", ">= 4.7"
 gem "sequel_migration_builder", ">= 0.3.2"
 gem "chronic"
 

data/Rakefile

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

data/chicagowarehouse.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "chicagowarehouse"
-  s.version = "0.4.8"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roland Swingler"]
-  s.date = "2014-03-21"
+  s.date = "2014-04-03"
   s.description = "Simple Data Warehouse toolkit for ruby"
   s.email = "roland.swingler@gmail.com"
   s.extra_rdoc_files = [
@@ -27,7 +27,6 @@ Gem::Specification.new do |s|
     "lib/chicago.rb",
     "lib/chicago/core_ext/hash.rb",
     "lib/chicago/core_ext/sequel/dataset.rb",
-    "lib/chicago/core_ext/sequel/sql.rb",
     "lib/chicago/data/month.rb",
     "lib/chicago/database/constants.rb",
     "lib/chicago/database/dataset_builder.rb",
@@ -55,7 +54,6 @@ Gem::Specification.new do |s|
     "lib/chicago/schema/query_column.rb",
     "lib/chicago/schema/table.rb",
     "lib/chicago/star_schema.rb",
-    "spec/core_ext/sequel_extensions_spec.rb",
     "spec/data/month_spec.rb",
     "spec/database/db_type_converter_spec.rb",
     "spec/database/migration_file_writer_spec.rb",
@@ -83,14 +81,14 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/notonthehighstreet/chicago"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.28"
+  s.rubygems_version = "1.8.25"
   s.summary = "Ruby Data Warehousing"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<sequel>, ["< 4.7", ">= 3.34"])
+      s.add_runtime_dependency(%q<sequel>, [">= 4.7"])
       s.add_runtime_dependency(%q<sequel_migration_builder>, [">= 0.3.2"])
       s.add_runtime_dependency(%q<chronic>, [">= 0"])
       s.add_development_dependency(%q<mysql2>, [">= 0"])
@@ -104,7 +102,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<ZenTest>, [">= 0"])
       s.add_development_dependency(%q<timecop>, [">= 0"])
     else
-      s.add_dependency(%q<sequel>, ["< 4.7", ">= 3.34"])
+      s.add_dependency(%q<sequel>, [">= 4.7"])
       s.add_dependency(%q<sequel_migration_builder>, [">= 0.3.2"])
       s.add_dependency(%q<chronic>, [">= 0"])
       s.add_dependency(%q<mysql2>, [">= 0"])
@@ -119,7 +117,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<timecop>, [">= 0"])
     end
   else
-    s.add_dependency(%q<sequel>, ["< 4.7", ">= 3.34"])
+    s.add_dependency(%q<sequel>, [">= 4.7"])
     s.add_dependency(%q<sequel_migration_builder>, [">= 0.3.2"])
     s.add_dependency(%q<chronic>, [">= 0"])
     s.add_dependency(%q<mysql2>, [">= 0"])

data/lib/chicago.rb

@@ -6,7 +6,6 @@ Sequel.extension(:core_extensions)
 
 # TODO: move this back to the Sequel MySQL adapter
 require 'chicago/core_ext/sequel/dataset'
-require 'chicago/core_ext/sequel/sql'
 
 require 'chicago/core_ext/hash'
 require 'chicago/data/month'

data/lib/chicago/schema/query_column.rb

@@ -159,7 +159,7 @@ module Chicago
       end
       
       def select_name
-        :count.sql_function(@column.count_name.distinct)
+        :count.sql_function(@column.count_name).distinct
       end
       
       def label

data/spec/database/db_type_converter_spec.rb

@@ -3,9 +3,9 @@ require "spec_helper"
 shared_examples_for "All DB type converters" do
   context "#db_type" do
     before(:each) do
-      @dimension = stub(:dimension)
+      @dimension = double(:dimension)
     end
-    
+
     it "should return :varchar for a string column" do
       column = Schema::Column.new(:id, :string)
       @tc.db_type(column).should == :varchar
@@ -40,7 +40,7 @@ end
 
 describe "DbTypeConverter.for_db" do
   before :each do
-    @mock_db = mock()
+    @mock_db = double()
   end
 
   it "should return a type converter specific to MySQL if the database type is :mysql" do
@@ -61,7 +61,7 @@ end
 describe "Generic DbTypeConverter" do
   it_behaves_like "All DB type converters"
 
-  before :each do 
+  before :each do
     @tc = Database::TypeConverters::DbTypeConverter.new
   end
 
@@ -96,7 +96,7 @@ describe Chicago::Database::TypeConverters::MysqlTypeConverter do
       :bigint    => [0, 18446744073709551615]
 
     }.each do |expected_db_type, range|
-      
+
       it "should return #{expected_db_type} if the maximum column value < #{range.max} and min is >= #{range.min}" do
         column = Schema::Column.new(:id, :integer, :max => range.max, :min => range.min)
         @tc.db_type(column).should == expected_db_type
@@ -104,11 +104,11 @@ describe Chicago::Database::TypeConverters::MysqlTypeConverter do
     end
 
     it "should raise an ArgumentError if either of the min/max values are out of bounds" do
-      column = Schema::Column.new(:id, 
-                                    :integer, 
-                                    :min => 0, 
+      column = Schema::Column.new(:id,
+                                    :integer,
+                                    :min => 0,
                                     :max => 18_446_744_073_709_551_616)
-      
+
       lambda { @tc.db_type(column) }.should raise_error(ArgumentError)
     end
 
@@ -118,7 +118,7 @@ describe Chicago::Database::TypeConverters::MysqlTypeConverter do
     end
 
     it "should return :varchar if the column definition has a large number of elements" do
-      column = Schema::Column.new(:id, :string, :elements => stub(:size => 70_000))
+      column = Schema::Column.new(:id, :string, :elements => double(:size => 70_000))
       @tc.db_type(column).should == :varchar
     end
   end

data/spec/database/migration_file_writer_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Chicago::Database::MigrationFileWriter do
   before :each do
-    @mock_db = mock(:db)
+    @mock_db = double(:db)
     @mock_db.stub(:database_type).and_return(:generic)
     @builder = described_class.new(@mock_db, "schema")
   end
@@ -14,21 +14,21 @@ describe Chicago::Database::MigrationFileWriter do
   end
 
   it "should write out a migration file generated by Sequel::MigrationBuilder" do
-    schema = stub(:schema)
+    schema = double(:schema)
 
-    generator = stub(:generator)
+    generator = double(:generator)
     generator.should_receive(:traverse).
       with(schema).and_return(:table => :definitions)
     Chicago::Database::SchemaGenerator.stub(:new).and_return(generator)
-    
-    migration_builder = mock(:migration_builder)
+
+    migration_builder = double(:migration_builder)
     migration_builder.should_receive(:generate_migration).
       with(:table => :definitions).and_return("migration content")
     Sequel::MigrationBuilder.stub(:new).and_return(migration_builder)
-    
+
     file = StringIO.new
     File.stub(:open).and_yield(file)
-    
+
     @builder.write_migration_file(schema)
 
     file.rewind

data/spec/query_spec.rb

@@ -30,7 +30,7 @@ describe Chicago::Query do
         boolean :recent
       end
     end
-    
+
     @schema.define_fact(:sales) do
       dimensions :product, :customer.as(:buyer), :customer.as(:seller)
 
@@ -61,7 +61,7 @@ describe Chicago::Query do
       }.to raise_error(StandardError)
     end
   end
-  
+
   describe "#table" do
     it "returns the schema table definition" do
       described_class.new(@schema, :table_name => "sales", :query_type => "fact").table.should == @schema.fact(:sales)
@@ -84,13 +84,13 @@ describe Chicago::Query do
     it "is a Sequel::Dataset" do
       @q.dataset.should be_kind_of(Sequel::Dataset)
     end
-    
+
     it "selects a qualified column" do
       @q.select("product.name")
       @q.dataset.opts[:select].
         should == [:name.qualify(:product).as("product.name".to_sym)]
     end
-    
+
     it "selects multiple qualified columns" do
       @q.select("product.name", "product.type")
       @q.dataset.opts[:select].
@@ -104,7 +104,7 @@ describe Chicago::Query do
       @q.dataset.sql.should =~ /COUNT\(DISTINCT `product`\.`original_id`\)/i
     end
   end
-  
+
   describe "generates a dataset for a fact that" do
     before :each do
       @q = described_class.new(@schema,
@@ -117,13 +117,13 @@ describe Chicago::Query do
     end
 
     it "can be generated for a specific database" do
-      dataset  = stub(:dataset).as_null_object
-      database = stub(:database).as_null_object
+      dataset  = double(:dataset).as_null_object
+      database = double(:database).as_null_object
       database.stub(:[]).and_return(dataset)
-      
+
       @q.dataset(database).should == dataset
     end
-    
+
     it "selects from the correctly aliased table" do
       @q.dataset.sql.should =~ /FROM `facts_sales` AS `sales`/
     end
@@ -216,7 +216,7 @@ describe Chicago::Query do
                     :pivot => "sales.product.type"})
         }.to raise_error(Chicago::UnimplementedError)
       end
-      
+
       it "via IF, for a measure, by a boolean column" do
         @q.select({ :column => "sales.total",
                     :op => "sum",
@@ -288,7 +288,7 @@ describe Chicago::Query do
         @q.dataset.opts[:group].should be_nil
       end
     end
-    
+
     it "groups on a degenerate dimension column" do
       @q.select 'sales.order_ref'
       @q.dataset.opts[:group].should == ['sales.order_ref'.to_sym]
@@ -336,7 +336,7 @@ describe Chicago::Query do
       @q.dataset.sql.
         should =~ /INNER JOIN `dimension_product` AS `product` ON \(`product`.`id` = `sales`.`product_dimension_id`\)/
     end
-    
+
     it "joins on multiple tables" do
       @q.select("sales.buyer.name", "sales.seller.name")
       @q.dataset.opts[:join].map(&:table_alias).
@@ -460,7 +460,7 @@ describe Chicago::Query do
     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%'( 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
       @q.
         filter({:column => "sales.order_ref", :value => "123", :op => :eq}).dataset.opts[:join].should be_nil

data/spec/schema/column_spec.rb

@@ -4,7 +4,7 @@ describe Chicago::Schema::Column do
   subject { described_class.new(:user_name, :string) }
 
   it_behaves_like "a column"
-  
+
   it "should be equal to another column definition with the same attributes" do
     described_class.new(:username, :string).should == described_class.new(:username, :string)
   end
@@ -160,7 +160,7 @@ describe Chicago::Schema::Column do
     described_class.new(:foo, :string).
       should_not be_unique
   end
-  
+
   it "is binary if a hash" do
     described_class.new(:foo, :binary).should be_binary
   end
@@ -174,7 +174,7 @@ describe Chicago::Schema::Column do
   end
 
   it "is visitable" do
-    visitor = mock(:visitor)
+    visitor = double(:visitor)
     column = described_class.new(:foo, :integer)
     visitor.should_receive(:visit_column).with(column)
     column.visit(visitor)

data/spec/schema/dimension_builder_spec.rb

@@ -2,22 +2,22 @@ require 'spec_helper'
 
 describe Chicago::Schema::Builders::DimensionBuilder do
   before :each do
-    @builder = described_class.new(stub())
+    @builder = described_class.new(double())
   end
 
   it "builds a dimension" do
     @builder.build("foo").should be_kind_of(Chicago::Schema::Dimension)
   end
-  
+
   it "builds a dimension with a name" do
     @builder.build("foo").name.should == :foo
   end
 
-  it "can have a column builder specified" do    
+  it "can have a column builder specified" do
     @builder.column_builder = Class.new do
       def initialize(klass)
       end
-      
+
       def build
         [:column] if block_given?
       end

data/spec/schema/dimension_reference_spec.rb

@@ -75,7 +75,7 @@ describe Chicago::Schema::DimensionReference do
   end
 
   it "qualfies a column based on the column name" do
-    column = stub(:column, :name => :baz)
+    column = double(:column, :name => :baz)
     column.should_receive(:qualify_by).with(:dimension_foo)
     described_class.new(:foo, @dimension).qualify(column)
   end
@@ -97,9 +97,9 @@ describe Chicago::Schema::DimensionReference do
   it "uses the first null record id as the default value" do
     described_class.new(:foo, @dimension).default_value.should == 1
   end
-  
+
   it "is visitable" do
-    visitor = mock(:visitor)
+    visitor = double(:visitor)
     column = described_class.new(:foo, @dimension)
     visitor.should_receive(:visit_dimension_reference).with(column)
     column.visit(visitor)

data/spec/schema/dimension_spec.rb

@@ -16,7 +16,7 @@ describe Chicago::Schema::Dimension do
   end
 
   it "has columns" do
-    column = stub(:column)
+    column = double(:column)
     described_class.new(:foo, :columns => [column]).
       columns.should == [column]
   end
@@ -26,30 +26,30 @@ describe Chicago::Schema::Dimension do
   end
 
   it "can qualify a column" do
-    described_class.new(:foo).qualify(stub(:column, :name => :bar)).
+    described_class.new(:foo).qualify(double(:column, :name => :bar)).
       should == :bar.qualify(:dimension_foo)
   end
 
   it "provides a hash-like accessor syntax for columns" do
-    column = stub(:column, :name => :bar)
+    column = double(:column, :name => :bar)
     dimension = described_class.new(:foo, :columns => [column])
     dimension[:bar].should == column
   end
 
   it "can have identifiers" do
-    identifiers = [stub(:i), stub(:j)]
+    identifiers = [double(:i), double(:j)]
     described_class.new(:user, :identifiers => identifiers).
       identifiers.should == identifiers
   end
 
   it "can have a main identifier" do
-    identifiers = [stub(:i), stub(:j)]
+    identifiers = [double(:i), double(:j)]
     described_class.new(:user, :identifiers => identifiers).
       main_identifier.should == identifiers.first
   end
 
   it "has null records" do
-    column = stub(:column, :name => :bar, :default_value => '')
+    column = double(:column, :name => :bar, :default_value => '')
 
     options = {
       :columns => [column],
@@ -61,7 +61,7 @@ describe Chicago::Schema::Dimension do
   end
 
   it "can create null records in the database, replacing existing records" do
-    db = mock(:db)
+    db = double(:db)
     db.stub(:[]).and_return(db)
     db.stub(:table_exists?).with(:keys_dimension_user).and_return(true)
     db.should_receive(:insert_replace).twice.and_return(db)
@@ -73,7 +73,7 @@ describe Chicago::Schema::Dimension do
   end
 
   it "doesn't attempt to create null rows in non-existent key table" do
-    db = mock(:db)
+    db = double(:db)
     db.stub(:[]).and_return(db)
     db.stub(:table_exists?).with(:keys_dimension_user).and_return(false)
     db.should_receive(:insert_replace).and_return(db)
@@ -106,23 +106,23 @@ describe Chicago::Schema::Dimension do
   end
 
   it "supports original_key if it has an original_id column [DEPRECATED]" do
-    column = stub(:c, :name => :original_id)
+    column = double(:c, :name => :original_id)
     described_class.new(:user, :columns => [column]).original_key.should == column
   end
 
   it "is considered identifiable if it has an original key [DEPRECATED]" do
-    column = stub(:c, :name => :original_id)
+    column = double(:c, :name => :original_id)
     described_class.new(:user, :columns => [column]).should be_identifiable
   end
 
   it "is considered countable if it has an original key [DEPRECATED]" do
-    column = stub(:c, :name => :original_id)
+    column = double(:c, :name => :original_id)
     described_class.new(:user, :columns => [column]).should be_countable
     described_class.new(:user, :columns => []).should_not be_countable
   end
 
   it "can be marked as uncountable" do
-    column = stub(:c, :name => :original_id)
+    column = double(:c, :name => :original_id)
     described_class.new(:user, :columns => [column],
                         :uncountable => true).should_not be_countable
   end
@@ -132,7 +132,7 @@ describe Chicago::Schema::Dimension do
   end
 
   it "is visitable" do
-    visitor = mock(:visitor)
+    visitor = double(:visitor)
     dimension = described_class.new(:foo)
     visitor.should_receive(:visit_dimension).with(dimension)
     dimension.visit(visitor)

data/spec/schema/fact_spec.rb

@@ -6,7 +6,7 @@ describe Chicago::Schema::Fact do
   it "has a table name" do
     described_class.new("foo").table_name.should == :facts_foo
   end
-  
+
   it "has no dimensions by default" do
     described_class.new("foo").dimensions.should be_empty
   end
@@ -22,30 +22,30 @@ describe Chicago::Schema::Fact do
   it "can have a description" do
     described_class.new(:foo, :description => "bar").description.should == "bar"
   end
-  
+
   it "can have dimensions" do
-    dimension = stub(:dimension)
+    dimension = double(:dimension)
     described_class.new("foo", :dimensions => [dimension]).
       dimensions.should == [dimension]
   end
 
   it "has degenerate dimensions" do
-    column = stub(:column)
+    column = double(:column)
     described_class.new("foo", :degenerate_dimensions => [column]).
       degenerate_dimensions.should == [column]
   end
 
   it "has measures" do
-    column = stub(:column)
+    column = double(:column)
     described_class.new("foo", :measures => [column]).
       measures.should == [column]
   end
 
   it "has columns defined as dimensions, degenerate dimensions & measures" do
 
-    dimension = stub(:dimension)
-    column = stub(:column)
-    column_2 = stub(:column_2)
+    dimension = double(:dimension)
+    column = double(:column)
+    column_2 = double(:column_2)
     fact = described_class.new("foo",
                              :dimensions => [dimension],
                              :degenerate_dimensions => [column],
@@ -54,19 +54,19 @@ describe Chicago::Schema::Fact do
   end
 
   it "can qualify a column" do
-    described_class.new(:foo).qualify(stub(:column, :name => :bar)).
+    described_class.new(:foo).qualify(double(:column, :name => :bar)).
       should == :bar.qualify(:facts_foo)
   end
 
   it "provides a hash-like accessor syntax for columns" do
-    measure = stub(:column, :name => :bar)
+    measure = double(:column, :name => :bar)
     fact = described_class.new(:foo, :measures => [measure])
     fact[:bar].should == measure
   end
 
   it "is factless if it has no measures" do
-    described_class.new(:foo, :measures => [stub()]).should_not be_factless
-    described_class.new(:foo).should be_factless    
+    described_class.new(:foo, :measures => [double()]).should_not be_factless
+    described_class.new(:foo).should be_factless
   end
 
   it "can define a natural key" do
@@ -75,7 +75,7 @@ describe Chicago::Schema::Fact do
   end
 
   it "is visitable" do
-    visitor = mock(:visitor)
+    visitor = double(:visitor)
     fact = described_class.new(:foo)
     visitor.should_receive(:visit_fact).with(fact)
     fact.visit(visitor)

data/spec/schema/measure_spec.rb

@@ -8,7 +8,7 @@ describe Chicago::Schema::Measure do
   it "should not be semi_additive by default" do
     described_class.new(:rate, :integer).should_not be_semi_additive
   end
-  
+
   it "can be defined as semi_additive" do
     described_class.new(:rate, :integer, :semi_additive => true).
       should be_semi_additive
@@ -17,9 +17,9 @@ describe Chicago::Schema::Measure do
   it "is not indexed" do
     described_class.new(:rate, :integer).should_not be_indexed
   end
-  
+
   it "is visitable" do
-    visitor = mock(:visitor)
+    visitor = double(:visitor)
     measure = described_class.new(:foo, :integer)
     visitor.should_receive(:visit_measure).with(measure)
     measure.visit(visitor)

data/spec/schema/named_element_collection_spec.rb

@@ -2,9 +2,9 @@ require 'spec_helper'
 
 describe Chicago::Schema::NamedElementCollection do
   before :each do
-    @e = stub(:element, :name => :foo)
+    @e = double(:element, :name => :foo)
   end
-  
+
   it "supports adding an element via add" do
     subject.add(@e)
     subject.to_a.should == [@e]
@@ -35,8 +35,8 @@ describe Chicago::Schema::NamedElementCollection do
 
   it "returns true from contains? if the collection contains the same-named element" do
     subject.add @e
-    subject.contain?(stub(:element, :name => :foo)).should be_true
-    subject.contain?(stub(:element, :name => :bar)).should be_false    
+    subject.contain?(double(:element, :name => :foo)).should be_true
+    subject.contain?(double(:element, :name => :bar)).should be_false
   end
 
   it "returns the number of elements in a collection from size" do
@@ -61,7 +61,7 @@ describe Chicago::Schema::NamedElementCollection do
 
   it "has elements that are unique by name" do
     subject.add(@e)
-    subject.add(stub(:element, :name => :foo))
+    subject.add(double(:element, :name => :foo))
     subject.size.should == 1
   end
 end

data/spec/schema/pivoted_column_spec.rb

@@ -2,10 +2,10 @@ require 'spec_helper'
 
 describe Chicago::Schema::PivotedColumn do
   before :each do
-    @column = stub(:column)
-    @pivot  = stub(:pivot)
+    @column = double(:column)
+    @pivot  = double(:pivot)
   end
-  
+
   it "has a nil group name" do
     described_class.new(@column, @pivot, 0, true).group_name.should be_nil
   end

data/spec/schema/query_column_spec.rb

@@ -3,10 +3,10 @@ require 'chicago/schema/query_column'
 
 describe Chicago::Schema::QueryColumn do
   describe "a standard column" do
-    let(:owner) { stub(:owner).as_null_object }
-    let(:column) { stub(:column, :calculated? => false).as_null_object }
+    let(:owner) { double(:owner).as_null_object }
+    let(:column) { double(:column, :calculated? => false).as_null_object }
     subject { described_class.column(owner, column, "foo.bar") }
-    
+
     it "should have a column alias" do
       subject.column_alias.should == "foo.bar"
     end
@@ -38,9 +38,9 @@ describe Chicago::Schema::QueryColumn do
   end
 
   describe "a virtual column generated from calculation" do
-    let(:calculation) { stub(:calculation).as_null_object }
-    let(:owner) { stub(:owner).as_null_object }
-    let(:column) { stub(:column, :calculated? => true, :calculation => calculation).as_null_object }
+    let(:calculation) { double(:calculation).as_null_object }
+    let(:owner) { double(:owner).as_null_object }
+    let(:column) { double(:column, :calculated? => true, :calculation => calculation).as_null_object }
     subject { described_class.column(owner, column, "foo.bar") }
 
     it "should have a column alias" do
@@ -68,16 +68,16 @@ describe Chicago::Schema::QueryColumn do
   end
 
   describe "a dimension column" do
-    let(:owner) { stub(:owner).as_null_object }
-    let(:column) { stub(:column).as_null_object }
+    let(:owner) { double(:owner).as_null_object }
+    let(:column) { double(:column).as_null_object }
     subject { described_class.column(owner, column, "foo.bar") }
 
     before :each do
       column.stub(:main_identifier).and_return(:name)
-      column.stub(:original_key).and_return(stub(:name => :original_id))
+      column.stub(:original_key).and_return(double(:name => :original_id))
       column.stub(:kind_of?).with(Chicago::Schema::Dimension).and_return(true)
     end
-    
+
     it "should have a column alias" do
       subject.column_alias.should == "foo.bar"
     end
@@ -108,20 +108,20 @@ describe Chicago::Schema::QueryColumn do
   end
 
   describe "a dimension identifier column" do
-    let(:owner) { stub(:owner).as_null_object }
-    let(:column) { stub(:column).as_null_object }
+    let(:owner) { double(:owner).as_null_object }
+    let(:column) { double(:column).as_null_object }
     subject { described_class.column(owner, column, "foo.bar") }
 
     before :each do
       column.stub(:name).and_return(:bar)
 
       owner.stub(:name).and_return(:foo)
-      owner.stub(:original_key).and_return(stub(:name => :original_id))
+      owner.stub(:original_key).and_return(double(:name => :original_id))
       owner.stub(:kind_of?).with(Chicago::Schema::Dimension).and_return(true)
       owner.stub(:identifiable?).and_return(true)
       owner.stub(:identifiers).and_return([:bar])
     end
-    
+
     it "should have a column alias" do
       subject.column_alias.should == "foo.bar"
     end

data/spec/star_schema_spec.rb

@@ -61,7 +61,7 @@ describe Chicago::StarSchema do
         null_record :id => 2, :email => "Not Applicable", :original_id => -1
       end
 
-      db = stub(:db, :table_exists? => true)
+      db = double(:db, :table_exists? => true)
       db.stub_chain(:[], :insert_replace).and_return(db)
       db.should_receive(:multi_insert).with([{:id => 1, :email => "Missing"},
                                              {:id => 2, :email => "Not Applicable", :original_id => -1}])
@@ -208,7 +208,7 @@ describe Chicago::StarSchema do
   it "allows definition of a fact and a dimension with the same name" do
     @schema.define_fact(:user)
     expect { @schema.define_dimension(:user) }.
-      to_not raise_error(Chicago::DuplicateTableError)
+      to_not raise_error
   end
 
   it "returns all dimensions and facts from #tables" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chicagowarehouse
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,30 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-21 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4.7'
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.34'
+        version: '4.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4.7'
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.34'
+        version: '4.7'
 - !ruby/object:Gem::Dependency
   name: sequel_migration_builder
   requirement: !ruby/object:Gem::Requirement
@@ -243,7 +237,6 @@ files:
 - lib/chicago.rb
 - lib/chicago/core_ext/hash.rb
 - lib/chicago/core_ext/sequel/dataset.rb
-- lib/chicago/core_ext/sequel/sql.rb
 - lib/chicago/data/month.rb
 - lib/chicago/database/constants.rb
 - lib/chicago/database/dataset_builder.rb
@@ -271,7 +264,6 @@ files:
 - lib/chicago/schema/query_column.rb
 - lib/chicago/schema/table.rb
 - lib/chicago/star_schema.rb
-- spec/core_ext/sequel_extensions_spec.rb
 - spec/data/month_spec.rb
 - spec/database/db_type_converter_spec.rb
 - spec/database/migration_file_writer_spec.rb
@@ -310,7 +302,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2494131027437127772
+      hash: -4302469989561989686
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -319,7 +311,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.28
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Ruby Data Warehousing

data/lib/chicago/core_ext/sequel/sql.rb

@@ -1,62 +0,0 @@
-module Sequel
-  # @private
-  class Dataset
-    COLUMN_DISTINCT = "DISTINCT ".freeze
-    
-    def distinct_expression_sql(e)
-      s = ""
-      distinct_expression_sql_append(s, e)
-      s
-    end
-
-    def distinct_expression_sql_append(sql, e)
-      sql << COLUMN_DISTINCT
-      literal_append(sql, e.expression)
-    end
-
-    # Provide support for Sequel versions before 3.30.0
-    unless method_defined?(:literal_append)
-      def literal_append(sql, expression)
-        sql << literal(expression)
-      end
-    end
-  end
-  
-  module SQL
-    class DistinctExpression < Expression # :nodoc:
-      attr_reader :expression
-
-      def initialize(expression)
-        @expression = expression
-      end
-
-      to_s_method :distinct_expression_sql
-    end
-    
-    module DistinctMethods
-      def distinct
-        DistinctExpression.new(self)
-      end
-    end
-
-    # @private
-    class ComplexExpression
-      include DistinctMethods
-    end
-
-    # @private
-    class GenericExpression
-      include DistinctMethods
-    end
-  end
-end
-
-# @private
-class Symbol
-  include Sequel::SQL::DistinctMethods
-end
-
-# @private
-class String
-  include Sequel::SQL::DistinctMethods
-end

data/spec/core_ext/sequel_extensions_spec.rb

@@ -1,29 +0,0 @@
-require 'spec_helper'
-
-describe Symbol do
-  it "should have a distinct method" do
-    :foo.distinct.should be_kind_of(Sequel::SQL::DistinctExpression)
-  end
-end
-
-describe String do
-  it "should have a distinct method" do
-    "foo".distinct.should be_kind_of(Sequel::SQL::DistinctExpression)
-  end
-end
-
-describe Sequel::SQL::Expression do
-  it "should have a distinct method" do
-    :if.sql_function(true, 1, 0).distinct.should be_kind_of(Sequel::SQL::DistinctExpression)
-  end
-end
-
-describe Sequel::SQL::DistinctExpression do
-  it "has a reader for the wrapped expression" do
-    described_class.new(:foo).expression.should == :foo
-  end
-
-  it "is rendered as 'DISTINCT expression'" do
-    described_class.new(:foo).sql_literal(TEST_DB[:foo]).should == "DISTINCT `foo`"
-  end
-end