alf-sequel 0.14.0 → 0.15.0

data/spec/unit_of_work/update/test_run.rb

@@ -26,7 +26,7 @@ module Alf
 
         context 'when predicate is not a tautology' do
           let(:relvar_name){ :suppliers }
-          let(:predicate){ Predicate.eq(sid: 1) }
+          let(:predicate){ Predicate.eq(sid: "S1") }
 
           it 'removes only targetted tuples' do
             conn.dataset(relvar_name).where(status: 55).to_a.size.should eq(1)

data/tasks/bench.rake

@@ -0,0 +1,40 @@
+namespace :bench do
+
+  def bench_cmd
+    "ALF_TEST_ENV=postgres bundle exec ruby -Ilib bench/bench_all.rb"
+  end
+
+  def alf_cmd(tail)
+    "bundle exec alf --ff=%.6f --input-reader=rash #{tail}"
+  end
+
+  task :run do
+    cmd = bench_cmd
+    $stderr.puts cmd
+    exec(cmd)
+  end
+
+  task :summary do
+    cmd = bench_cmd
+    cmd << " | "
+    cmd << alf_cmd("summarize -- category -- min 'min{ total }' max 'max{ total }' avg 'avg{ total }' stddev 'stddev{ total }'")
+    $stderr.puts cmd
+    exec(cmd)
+  end
+
+  task :rank do
+    cmd = bench_cmd
+    cmd << " | "
+    cmd << alf_cmd("summarize -- category alf -- parsing 'avg{ parsing }' compiling 'avg{ compiling }' printing 'avg{ printing }' total 'avg{ total }'")
+    cmd << " | "
+    cmd << alf_cmd("rank -- total desc -- position")
+    cmd << " | "
+    cmd << alf_cmd("project -- position category alf parsing compiling printing total")
+    cmd << " | "
+    cmd << alf_cmd("restrict -- 'position < 10'")
+    $stderr.puts cmd
+    exec(cmd)
+  end
+
+end
+task :bench => :"bench:run"

data/tasks/test.rake

@@ -1,6 +1,6 @@
 require "rspec/core/rake_task"
-desc "Run tests"
-RSpec::Core::RakeTask.new(:test => :fixtures) do |t|
+desc "Run unit tests"
+RSpec::Core::RakeTask.new(:test) do |t|
   t.pattern = "spec/**/test_*.rb"
-  t.rspec_opts = ["--color"]
+  t.rspec_opts = ["--color", "--backtrace", "-Ilib", "-Ispec"]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alf-sequel
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-01 00:00:00.000000000 Z
+date: 2013-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.15.0
+- !ruby/object:Gem::Dependency
+  name: alf-sql
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.15.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.48'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.48'
+        version: '4.2'
 description: This project implements an Alf adapter on top of the awesome sequel toolkit.
 email:
 - blambeau at gmail.com
@@ -87,13 +103,13 @@ files:
 - Gemfile.lock
 - lib/alf/sequel/adapter.rb
 - lib/alf/sequel/cog.rb
-- lib/alf/sequel/compiler/predicate.rb
 - lib/alf/sequel/compiler.rb
 - lib/alf/sequel/connection/connection_methods.rb
 - lib/alf/sequel/connection/schema_methods.rb
 - lib/alf/sequel/connection/update_methods.rb
 - lib/alf/sequel/connection.rb
 - lib/alf/sequel/loader.rb
+- lib/alf/sequel/translator.rb
 - lib/alf/sequel/unit_of_work/atomic.rb
 - lib/alf/sequel/unit_of_work/delete.rb
 - lib/alf/sequel/unit_of_work/insert.rb
@@ -107,24 +123,6 @@ files:
 - Rakefile
 - README.md
 - spec/adapter/test_recognize.rb
-- spec/alf.db
-- spec/compiler/test_clip.rb
-- spec/compiler/test_compact.rb
-- spec/compiler/test_extend.rb
-- spec/compiler/test_frame.rb
-- spec/compiler/test_intersect.rb
-- spec/compiler/test_join.rb
-- spec/compiler/test_leaf_operand.rb
-- spec/compiler/test_matching.rb
-- spec/compiler/test_not_matching.rb
-- spec/compiler/test_page.rb
-- spec/compiler/test_predicate.rb
-- spec/compiler/test_project.rb
-- spec/compiler/test_rename.rb
-- spec/compiler/test_restrict.rb
-- spec/compiler/test_sort.rb
-- spec/compiler/test_union.rb
-- spec/compiler_helper.rb
 - spec/connection/test_connection_uri.rb
 - spec/connection/test_delete.rb
 - spec/connection/test_heading.rb
@@ -134,8 +132,7 @@ files:
 - spec/connection/test_ping.rb
 - spec/connection/test_relvar.rb
 - spec/connection/test_update.rb
-- spec/fixtures/sap.db
-- spec/fixtures/sap.rb
+- spec/sap.db
 - spec/spec_helper.rb
 - spec/test_assumptions.rb
 - spec/test_sequel.rb
@@ -143,7 +140,7 @@ files:
 - spec/unit_of_work/delete/test_delete.rb
 - spec/unit_of_work/insert/test_run.rb
 - spec/unit_of_work/update/test_run.rb
-- tasks/fixtures.rake
+- tasks/bench.rake
 - tasks/gem.rake
 - tasks/test.rake
 homepage: http://github.com/blambeau/alf-sequel
@@ -160,13 +157,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3191817765128165623
+      hash: -1889341604392820910
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1889341604392820910
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25

data/lib/alf/sequel/compiler/predicate.rb

@@ -1,76 +0,0 @@
-module Alf
-  module Sequel
-    class Compiler
-      class Predicate < Sexpr::Processor
-
-        def call(predicate)
-          super(predicate.expr)
-        end
-
-        def on_missing(sexpr)
-          throw :pass
-        end
-        alias :on_native :on_missing
-
-        def on_tautology(sexpr)
-          ::Sequel::SQL::BooleanConstant.new(true)
-        end
-
-        def on_contradiction(sexpr)
-          ::Sequel::SQL::BooleanConstant.new(false)
-        end
-
-        def on_var_ref(sexpr)
-          if qualifier = options[:qualifier]
-            ::Sequel.qualify(qualifier, sexpr.last)
-          else
-            ::Sequel.expr(sexpr.last)
-          end
-        end
-
-        def on_literal(sexpr)
-          sexpr.last.nil? ? nil : ::Sequel.expr(sexpr.last)
-        end
-
-        def on_eq(sexpr)
-          left, right = apply(sexpr.left), apply(sexpr.right)
-          ::Sequel.expr(left => right)
-        end
-
-        def on_neq(sexpr)
-          left, right = apply(sexpr.left), apply(sexpr.right)
-          ~::Sequel.expr(left => right)
-        end
-
-        def on_dyadic_comp(sexpr)
-          left, right = apply(sexpr.left), apply(sexpr.right)
-          left.send(sexpr.operator_symbol, right)
-        end
-        alias :on_lt  :on_dyadic_comp
-        alias :on_lte :on_dyadic_comp
-        alias :on_gt  :on_dyadic_comp
-        alias :on_gte :on_dyadic_comp
-
-        def on_in(sexpr)
-          left = apply(sexpr.var_ref)
-          ::Sequel.expr(left => sexpr.values)
-        end
-
-        def on_not(sexpr)
-          ~apply(sexpr.last)
-        end
-
-        def on_and(sexpr)
-          body = sexpr.sexpr_body
-          body[1..-1].inject(apply(body.first)){|f,t| f & apply(t) }
-        end
-
-        def on_or(sexpr)
-          body = sexpr.sexpr_body
-          body[1..-1].inject(apply(body.first)){|f,t| f | apply(t) }
-        end
-
-      end # class Predicate
-    end # class Compiler
-  end # module Sequel
-end # module Alf

data/spec/compiler/test_clip.rb

@@ -1,40 +0,0 @@
-require 'compiler_helper'
-module Alf
-  module Sequel
-    describe Compiler, "clip" do
-
-      subject{ compile(expr) }
-
-      context 'when the operand is fully compilable' do
-        let(:expr){ clip(suppliers, [:sid, :name]) }
-
-        specify{
-          subject.sql.should eq("SELECT `t1`.`sid`, `t1`.`name` FROM `suppliers` AS 't1'")
-        }
-      end
-
-      context 'when the operand is fully compilable (distinct normally needed)' do
-        let(:expr){ clip(suppliers, [:city]) }
-
-        specify{
-          subject.sql.should eq("SELECT `t1`.`city` FROM `suppliers` AS 't1'")
-        }
-      end
-
-      context 'when the operand is fully compilable (allbut, distinct)' do
-        let(:expr){ clip(suppliers, [:sid, :name, :status], :allbut => true) }
-
-        specify{
-          subject.sql.should eq("SELECT `t1`.`city` FROM `suppliers` AS 't1'")
-        }
-      end
-
-      context 'when the operand is not compilable' do
-        let(:expr){ clip(an_operand, [:sid, :name]) }
-
-        it{ should be_a(Engine::Cog) }
-      end
-
-    end
-  end
-end

data/spec/compiler/test_compact.rb

@@ -1,18 +0,0 @@
-require 'compiler_helper'
-module Alf
-  module Sequel
-    describe Compiler, "compact" do
-
-      subject{ compile(expr) }
-
-      context 'when the operand is fully compilable' do
-        let(:expr){ compact(suppliers) }
-
-        specify{
-          subject.sql.should eq("SELECT DISTINCT * FROM `suppliers` AS 't1'")
-        }
-      end
-
-    end
-  end
-end

data/spec/compiler/test_extend.rb

@@ -1,16 +0,0 @@
-require 'compiler_helper'
-module Alf
-  module Sequel
-    describe Compiler, "extend" do
-
-      subject{ compile(expr) }
-
-      context 'with a native predicate' do
-        let(:expr){ extend(suppliers, :big => lambda{}) }
-      
-        it{ should be_a(Engine::SetAttr) }
-      end
-      
-    end
-  end
-end

data/spec/compiler/test_frame.rb

@@ -1,89 +0,0 @@
-require 'compiler_helper'
-module Alf
-  module Sequel
-    describe Compiler, "frame" do
-
-      subject{ compile(expr) }
-
-      let(:expr){
-        frame(operand, ordering, offset, limit)
-      }
-
-      context 'when fully compilable' do
-        let(:operand){ suppliers }
-
-        [
-          [ [[:name, :asc]],  0, 8, "SELECT * FROM `suppliers` AS 't1' ORDER BY `t1`.`name` ASC LIMIT 8 OFFSET 0" ],
-          [ [[:name, :asc]],  2, 8, "SELECT * FROM `suppliers` AS 't1' ORDER BY `t1`.`name` ASC LIMIT 8 OFFSET 2" ],
-          [ [[:city, :asc]],  0, 8, "SELECT * FROM `suppliers` AS 't1' ORDER BY `t1`.`city` ASC, `t1`.`sid` ASC LIMIT 8 OFFSET 0" ],
-          [ [[:city, :desc]],  2, 8, "SELECT * FROM `suppliers` AS 't1' ORDER BY `t1`.`city` DESC, `t1`.`sid` ASC LIMIT 8 OFFSET 2" ],
-        ].each do |(ordering,offset,limit,expected)|
-
-          context "frame(#{ordering}, #{offset}, #{limit})" do
-            let(:ordering){ ordering }
-            let(:offset)  { offset   }
-            let(:limit)   { limit    }
-
-            it 'should compile as expected' do
-              subject.sql.should eq(expected)
-            end
-          end
-
-        end
-      end # fully compilable
-
-      context 'when immediately uncompilable yet known keys' do
-        let(:operand){
-          Algebra::Operand::Fake.new.with_keys([:sid], [:name])
-        }
-
-        [
-          [ [[:name, :asc]], 2, 8, [[:name, :asc]] ],
-          [ [[:city, :asc]], 2, 8, [[:city, :asc], [:sid, :asc]] ]
-        ].each do |ordering, offset, limit, expected|
-
-          context "frame(#{ordering}, #{offset}, #{limit})" do
-            let(:ordering){ ordering }
-            let(:offset)  { offset   }
-            let(:limit)   { limit    }
-
-            it{ should be_a(Engine::Take) }
-
-            it 'should have sort with good ordering' do
-              subject.operand.should be_a(Engine::Sort)
-              subject.operand.ordering.should eq(Ordering.new(expected))
-            end
-          end
-
-        end
-      end
-
-      context 'when immediately uncompilable yet unknown keys' do
-        let(:operand){
-          Algebra::Operand::Fake.new
-        }
-
-        [
-          [ [[:name, :asc]], 2, 8, [[:name, :asc]] ],
-          [ [[:city, :asc]], 2, 8, [[:city, :asc]] ]
-        ].each do |ordering, offset, limit, expected|
-
-          context "frame(#{ordering}, #{offset}, #{limit})" do
-            let(:ordering){ ordering }
-            let(:offset)  { offset   }
-            let(:limit)   { limit    }
-
-            it{ should be_a(Engine::Take) }
-
-            it 'should have sort with good ordering' do
-              subject.operand.should be_a(Engine::Sort)
-              subject.operand.ordering.should eq(Ordering.new(expected))
-            end
-          end
-
-        end
-      end
-
-    end
-  end
-end