cohort_analysis 1.0.0 → 1.0.1

data/CHANGELOG

@@ -1,4 +1,10 @@
-1.0.0 / 2012-05-30
+1.0.1 / 2012-06-05
+
+* Bug fixes
+
+  * Properly test on mysql and postgres - you'll need a table alias. You may also need to `require 'arel/nodes/table_alias'`
+
+1.0.0 / 2012-06-05
 
 * Breaking changes
 

data/Rakefile

@@ -9,7 +9,17 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-task :default => :test
+task :test_each_db_adapter do
+  %w{ mysql sqlite postgresql }.each do |database|
+    puts
+    puts "#{'*'*10} Running tests with #{database}"
+    puts
+    puts `rake test DATABASE=#{database}`
+  end
+end
+
+task :default => :test_each_db_adapter
+task :spec => :test_each_db_adapter
 
 require 'yard'
 YARD::Rake::YardocTask.new

data/cohort_analysis.gemspec

@@ -30,9 +30,14 @@ Gem::Specification.new do |gem|
     gem.add_development_dependency 'factory_girl', '~>2'
   end
   if RUBY_PLATFORM == 'java'
+    gem.add_development_dependency 'jruby-openssl'
     gem.add_development_dependency 'activerecord-jdbcsqlite3-adapter'
+    gem.add_development_dependency 'activerecord-jdbcmysql-adapter'
+    gem.add_development_dependency 'activerecord-jdbcpostgresql-adapter'
   else
     gem.add_development_dependency 'sqlite3'
+    gem.add_development_dependency 'mysql2'
+    gem.add_development_dependency 'pg'
   end
 
   # gem.add_development_dependency 'debugger'

data/lib/cohort_analysis/strategy.rb

@@ -90,13 +90,16 @@ module CohortAnalysis
       end
     end
 
+    def other_constraints
+      select_manager.constraints.reject do |constraint|
+        self == constraint
+      end
+    end
+
     def count(subset)
       constraints = grasp subset
 
-      select_manager.constraints.each do |constraint|
-        if self == constraint
-          next
-        end
+      other_constraints.each do |constraint|
         if constraint.is_a? String
           constraint = Arel::Nodes::Grouping.new constraint
         end

data/lib/cohort_analysis/version.rb

@@ -1,3 +1,3 @@
 module CohortAnalysis
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/test/helper.rb

@@ -14,6 +14,8 @@ require 'active_record_inline_schema'
 
 require 'cohort_analysis'
 
+require 'arel/nodes/table_alias' # strange
+
 if ::Bundler.definition.specs['debugger'].first
   require 'debugger'
 elsif ::Bundler.definition.specs['ruby-debug'].first
@@ -23,7 +25,47 @@ end
 # require 'logger'
 # ActiveRecord::Base.logger = Logger.new($stdout)
 
-ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
+case ENV['DATABASE']
+when /mysql/i
+  bin = ENV['TEST_MYSQL_BIN'] || 'mysql'
+  username = ENV['TEST_MYSQL_USERNAME'] || 'root'
+  password = ENV['TEST_MYSQL_PASSWORD'] || 'password'
+  database = ENV['TEST_MYSQL_DATABASE'] || 'test_cohort_analysis'
+  cmd = "#{bin} -u #{username} -p#{password}"
+  `#{cmd} -e 'show databases'`
+  unless $?.success?
+    $stderr.puts "Skipping mysql tests because `#{cmd}` doesn't work"
+    exit 0
+  end
+  system %{#{cmd} -e "drop database #{database}"}
+  system %{#{cmd} -e "create database #{database}"}
+  ActiveRecord::Base.establish_connection(
+    'adapter' => (RUBY_PLATFORM == 'java' ? 'mysql' : 'mysql2'),
+    'encoding' => 'utf8',
+    'database' => database,
+    'username' => username,
+    'password' => password
+  )
+when /postgr/i
+  createdb_bin = ENV['TEST_CREATEDB_BIN'] || 'createdb'
+  dropdb_bin = ENV['TEST_DROPDB_BIN'] || 'dropdb'
+  username = ENV['TEST_POSTGRES_USERNAME'] || `whoami`.chomp
+  # password = ENV['TEST_POSTGRES_PASSWORD'] || 'password'
+  database = ENV['TEST_POSTGRES_DATABASE'] || 'test_cohort_analysis'
+  system %{#{dropdb_bin} #{database}}
+  system %{#{createdb_bin} #{database}}
+  ActiveRecord::Base.establish_connection(
+    'adapter' => 'postgresql',
+    'encoding' => 'utf8',
+    'database' => database,
+    'username' => username
+    # 'password' => password
+  )
+when /sqlite/i
+  ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
+else
+  raise "don't know how to test against #{ENV['DATABASE']}"
+end
 
 Arel::Table.engine = ActiveRecord::Base
 

data/test/test_cohort_analysis.rb

@@ -183,7 +183,7 @@ shared_examples_for 'an adapter the provides #cohort' do
     it "can get where sql" do
       FactoryGirl.create(:lax_ord)
       FactoryGirl.create(:lax_sfo)
-      model.cohort(:origin => 'LAX').where_sql.must_equal %{WHERE ("flights"."origin" = 'LAX')}
+      model.cohort(:origin => 'LAX').where_sql.delete('"`').must_equal %{WHERE (flights.origin = 'LAX')}
     end
 
     it "will resolve independently from other cohorts" do
@@ -230,31 +230,35 @@ shared_examples_for 'an adapter the provides #cohort' do
 
       # sanity check!
       it "has tests that use unions properly" do
-        ord = model.where(f_t[:dest].eq('ORD')).project(Arel.star)
-        sfo = model.where(f_t[:dest].eq('SFO')).project(Arel.star)
-        Flight.find_by_sql("SELECT * FROM #{ord.union(sfo).to_sql}").must_equal [@ord, @sfo]
+        ord = model.where(f_t[:dest].eq('ORD'))
+        sfo = model.where(f_t[:dest].eq('SFO'))
+        ord.projections = [Arel.star]
+        sfo.projections = [Arel.star]
+        Flight.find_by_sql("SELECT * FROM #{Arel::Nodes::TableAlias.new(ord.union(sfo), 't1').to_sql}").must_equal [@ord, @sfo]
       end
         
       it "builds successful cohorts" do
         ord = model.cohort(:dest => 'ORD').project(Arel.star)
         sfo = model.cohort(:dest => 'SFO').project(Arel.star)
-        Flight.find_by_sql("SELECT * FROM #{ord.union(sfo).to_sql}").must_equal [@ord, @sfo]
+        Flight.find_by_sql("SELECT * FROM #{Arel::Nodes::TableAlias.new(ord.union(sfo), 't1').to_sql}").must_equal [@ord, @sfo]
 
         msn = model.cohort(:origin => 'LAX', :dest => 'MSN').project(Arel.star)
         lhr = model.cohort(:origin => 'LAX', :dest => 'LHR').project(Arel.star)
-        Flight.find_by_sql("SELECT * FROM #{msn.union(lhr).to_sql}").must_equal [@ord, @sfo]
+        Flight.find_by_sql("SELECT * FROM #{Arel::Nodes::TableAlias.new(msn.union(lhr), 't1').to_sql}").must_equal [@ord, @sfo]
       end
 
       it "doesn't somehow create unions with false positives" do
         msn = model.cohort(:dest => 'MSN').project(Arel.star)
         lhr = model.cohort(:dest => 'LHR').project(Arel.star)
-        ActiveRecord::Base.connection.select_value("SELECT COUNT(*) FROM #{msn.union(lhr).to_sql}").must_equal 0
+        count = ActiveRecord::Base.connection.select_value("SELECT COUNT(*) FROM #{Arel::Nodes::TableAlias.new(msn.union(lhr), 't1').to_sql}")
+        flunk "count was nil" if count.nil?
+        count.to_i.must_equal 0
       end
 
       it "builds unions where only one side has rows" do
         msn = model.cohort(:dest => 'MSN').project(Arel.star)
         ord = model.cohort(:dest => 'ORD').project(Arel.star)
-        Flight.find_by_sql("SELECT * FROM #{msn.union(ord).to_sql}").must_equal [@ord]
+        Flight.find_by_sql("SELECT * FROM #{Arel::Nodes::TableAlias.new(msn.union(ord), 't1').to_sql}").must_equal [@ord]
       end
     end
   end
@@ -265,7 +269,9 @@ describe CohortAnalysis do
     relation = relation.clone
     relation.projections = [Arel.sql('COUNT(*)')]
     sql = relation.to_sql
-    ActiveRecord::Base.connection.select_value(sql).must_equal expected_count
+    count = ActiveRecord::Base.connection.select_value(sql)
+    flunk "count was nil" if count.nil?
+    count.to_i.must_equal expected_count
   end
 
   def assert_members(expected_members, relation)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cohort_analysis
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -158,6 +158,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! 'Lets you do cohort analysis based on two strategies: "big", which
   discards characteristics for the maximum cohort result, and "strict", which discards
   characteristics in order until a minimum cohort size is reached.'