alf 0.14.0 → 0.15.0

data/spec/sql/queries/16-wrap.yml

@@ -0,0 +1,3 @@
+- alf: |-
+    wrap(suppliers, [:name, :city, :status], :attributes)
+  sql: ~

data/spec/sql/queries/91-reuse.yml

@@ -0,0 +1,28 @@
+# reusing base case
+- alf: |-
+    union(
+      matching(suppliers_in_paris, cities),
+      not_matching(suppliers_in_paris, cities))
+  sql: |-
+    (SELECT t1.sid, t1.name, t1.status, t1.city 
+       FROM suppliers AS t1
+      WHERE t1.city = 'Paris'
+        AND t1.city IN (SELECT t2.city FROM cities AS t2))
+    UNION
+    (SELECT t3.sid, t3.name, t3.status, t3.city
+       FROM suppliers AS t3
+      WHERE t3.city = 'Paris'
+        AND NOT(t3.city IN (SELECT t4.city FROM cities AS t4)))
+  sql: |-
+    WITH t2 AS (
+      SELECT t1.sid, t1.name, t1.status, t1.city
+        FROM suppliers AS t1
+       WHERE t1.city = 'Paris'
+    )
+    (SELECT t2.sid, t2.name, t2.status, t2.city
+       FROM t2 AS t2
+      WHERE t2.city IN (SELECT t3.city FROM cities AS t3))
+    UNION
+    (SELECT t4.sid, t4.name, t4.status, t4.city
+       FROM t2 AS t4
+      WHERE NOT(t4.city IN (SELECT t5.city FROM cities AS t5)))

data/spec/sql/test_sequel_compiler.rb

@@ -0,0 +1,41 @@
+require_relative 'helpers'
+module Alf
+  module Sequel
+    describe Compiler do
+
+      def compiler
+        @compiler ||= Compiler.new
+      end
+
+      subject{ compiler.call(expr) }
+
+      each_query do |query|
+        context "Sequel-based SQL compilation of '#{query}'" do
+          let(:expr){ conn.parse(query['alf']) }
+
+          it 'to_cog should lead to a Sequel::Cog' do
+            expr.to_cog.should be_a(Cog)
+          end if query['sql']
+
+          it 'sexpr.to_sql should be valid SQL for the DBMS considered' do
+            begin
+              sql = expr.to_cog.sexpr.to_sql
+              adapter[sql].to_a
+            rescue => ex
+              $stderr.print('x')
+              # $stderr.puts strip(query['sql'])
+              # $stderr.puts ex.message
+            end
+          end if query['sql']
+
+          it 'to_cog.to_a should run without problem' do
+            lambda{
+              expr.to_cog.to_a
+            }.should_not(raise_error)
+          end
+        end
+      end
+
+    end
+  end
+end

data/spec/sql/test_sql_compiler.rb

@@ -0,0 +1,52 @@
+require_relative 'helpers'
+module Alf
+  module Sql
+    describe Compiler do
+
+      shared_examples_for "a SQL compiled" do
+
+        it{ should be_a(Alf::Sql::Cog) }
+
+        it 'has correct traceability' do
+          subject.expr.should be(expr)
+        end
+
+        it 'has correct compiler' do
+          subject.compiler.should be(compiler)
+        end
+
+      end
+
+      def compiler
+        @compiler ||= Compiler.new
+      end
+
+      subject{ compiler.call(expr) }
+
+      each_query do |query|
+        next unless query['sql']
+
+        describe "SQL compilation of '#{query}'" do
+          let(:expr){ conn.parse(query['alf']) }
+
+          it_should_behave_like "a SQL compiled"
+
+          it 'should have expected SQL' do
+            strip(subject.to_sql).should eq(strip(query['sql']))
+          end
+
+          it 'should lead a flattenable result' do
+            sexpr = subject.sexpr
+            flattened = Processor::Flatten.new(Builder.new).call(sexpr)
+            if sexpr.first == :with_exp
+              flattened.first.should eq(sexpr.select_exp.first)
+            else
+              flattened.should eq(sexpr)
+            end
+          end
+        end
+      end
+
+    end
+  end
+end

data/spec/test_helpers.rb

@@ -0,0 +1,54 @@
+require 'alf'
+require 'rspec'
+require 'sap'
+
+ENV['DATABASE'] ||= 'postgres'
+
+FIXTURES_FOLDER = Path.backfind('fixtures')
+
+class Adapters
+
+  def fake
+    @fake ||= Alf.examples_adapter
+  end
+
+  def sqlite
+    @sqlite ||= begin
+      url = FIXTURES_FOLDER/"suppliers-and-parts/suppliers-and-parts.db"
+      Alf::Sequel::Adapter.sequel_db(url)
+    end
+  end
+
+  def postgres
+    @postgres ||= begin
+      url = "postgres://alf@localhost/suppliers_and_parts"
+      Alf::Sequel::Adapter.sequel_db(url)
+    end
+  end
+
+end
+ADAPTERS = Adapters.new
+
+module AlfIntegrationHelpers
+
+  def fixtures_folder
+    FIXTURES_FOLDER
+  end
+
+  def adapter
+    ADAPTERS.send ENV['DATABASE']
+  end
+
+  def db
+    @db ||= Alf::Database.new(adapter, viewpoint: Sap::Views[])
+  end
+
+  def conn
+    @conn ||= db.connection
+  end
+
+end
+
+RSpec.configure do |c|
+  c.include(AlfIntegrationHelpers)
+end

data/tasks/doc.rake

@@ -0,0 +1,10 @@
+desc "Ensure documentation is synchronized"
+task :doc do
+  ["alf-doc", "alf-shell", "../try-alf"].each do |dir|
+    clean_env do
+      chdir(dir) do
+        system("rake doc")
+      end
+    end
+  end
+end

data/tasks/fixtures.rake

@@ -0,0 +1,52 @@
+namespace :fixtures do
+
+  task :sap do
+    require 'alf'
+    require 'alf-sequel'
+    adapter = Path.dir/"../fixtures/suppliers-and-parts/suppliers-and-parts.db"
+    adapter.unlink
+    adapter = Alf::Adapter.sequel("sqlite://#{adapter}")
+    options = {
+      migrations_folder: Path.dir/"../fixtures/suppliers-and-parts/migrations"
+    }
+    Alf.connect(adapter, options) do |conn|
+      conn.migrate!
+      conn.relvar(:suppliers).affect([
+        {:sid => 'S1', :name => 'Smith', :status => 20, :city => 'London'},
+        {:sid => 'S2', :name => 'Jones', :status => 10, :city => 'Paris'},
+        {:sid => 'S3', :name => 'Blake', :status => 30, :city => 'Paris'},
+        {:sid => 'S4', :name => 'Clark', :status => 20, :city => 'London'},
+        {:sid => 'S5', :name => 'Adams', :status => 30, :city => 'Athens'}
+      ])
+      conn.relvar(:parts).affect([
+        {:pid => 'P1', :name => 'Nut',   :color => 'Red',   :weight => 12.0, :city => 'London'},
+        {:pid => 'P2', :name => 'Bolt',  :color => 'Green', :weight => 17.0, :city => 'Paris'},
+        {:pid => 'P3', :name => 'Screw', :color => 'Blue',  :weight => 17.0, :city => 'Oslo'},
+        {:pid => 'P4', :name => 'Screw', :color => 'Red',   :weight => 14.0, :city => 'London'},
+        {:pid => 'P5', :name => 'Cam',   :color => 'Blue',  :weight => 12.0, :city => 'Paris'},
+        {:pid => 'P6', :name => 'Cog',   :color => 'Red',   :weight => 19.0, :city => 'London'}
+      ])
+      conn.relvar(:supplies).affect([
+        {:sid => 'S1', :pid => 'P1', :qty => 300},
+        {:sid => 'S1', :pid => 'P2', :qty => 200},
+        {:sid => 'S1', :pid => 'P3', :qty => 400},
+        {:sid => 'S1', :pid => 'P4', :qty => 200},
+        {:sid => 'S1', :pid => 'P5', :qty => 100},
+        {:sid => 'S1', :pid => 'P6', :qty => 100},
+        {:sid => 'S2', :pid => 'P1', :qty => 300},
+        {:sid => 'S2', :pid => 'P2', :qty => 400},
+        {:sid => 'S3', :pid => 'P2', :qty => 200},
+        {:sid => 'S4', :pid => 'P2', :qty => 200},
+        {:sid => 'S4', :pid => 'P4', :qty => 300},
+        {:sid => 'S4', :pid => 'P5', :qty => 400}
+      ])
+      conn.relvar(:cities).affect([
+        {:city => 'London',   :country => 'England'},
+        {:city => 'Paris',    :country => 'France'},
+        {:city => 'Athens',   :country => 'Greece'},
+        {:city => 'Brussels', :country => 'Belgium'}
+      ])
+    end
+  end
+
+end

data/tasks/mod.rake

@@ -0,0 +1,50 @@
+namespace :mod do
+
+  desc "Initialize sub-modules"
+  task :init do
+    `git submodule init`
+  end
+
+  desc "Update sub-modules"
+  task :update do
+    `git submodule update`
+  end
+
+  desc "Pull from origin on every sub-modules"
+  task :pull do
+    in_each_sub_module("Refreshing") do |sub|
+      system "git pull origin"
+    end
+  end
+
+  desc "Push to origin on every sub-modules"
+  task :push do
+    in_each_sub_module("Pushing") do |sub|
+      system "git push origin"
+    end
+  end
+
+  desc "Run bundle-update on each submodule"
+  task :"bundle-update" do
+    in_each_sub_module("'bundle update' in") do |sub|
+      system "bundle update"
+      system "BUNDLE_GEMFILE=Gemfile.ci bundle update"
+    end
+  end
+
+  desc "Run bundle-install on each submodule"
+  task :bundle do
+    in_each_sub_module("'bundle install' in") do |sub|
+      system "bundle install"
+      system "BUNDLE_GEMFILE=Gemfile.ci bundle install"
+    end
+  end
+
+  desc "Test sub-modules"
+  task :test do
+    in_each_sub_module("Test") do |sub|
+      system "bundle exec rake"
+    end
+  end
+
+end

data/tasks/release.rake

@@ -0,0 +1,34 @@
+namespace :release do
+
+  desc "Create all gems, including in sub-modules"
+  task :gem do
+    cmd = "rm -rf pkg && rake gem"
+    in_each_sub_module("'rake gem' in") do |sub|
+      system(cmd)
+    end
+    system(cmd)
+  end
+
+  desc "Try the release by installing all gems locally"
+  task :try => :gem do
+    cmd = "gem install --no-rdoc --no-ri --local pkg/*.gem"
+    in_each_sub_module("'gem install' in") do |sub|
+      system(cmd)
+    end
+    system(cmd)
+  end
+
+  desc "Release it!"
+  task :go => :gem do
+    require 'alf/version'
+    version = Alf::VERSION
+    cmd = "gem push pkg/*.gem && git tag v#{version} && git push origin --tags"
+    in_each_sub_module("'gem push & git tag' in") do |sub|
+      system(cmd)
+    end
+    system(cmd)
+  end
+
+end
+desc "Release alf"
+task :release => :"release:go"

data/tasks/test.rake

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alf
 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: alf-sequel
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +82,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
@@ -74,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: alf-shell
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +98,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        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: alf-rack
+  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
@@ -90,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.15.0
 description: Alf brings a beautiful yet powerful relational algebra to the Shell and
   to Ruby.
 email:
@@ -114,13 +146,63 @@ files:
 - Manifest.txt
 - Rakefile
 - README.md
+- spec/facade/test_query.rb
+- spec/key-inference/queries.yml
+- spec/key-inference/test_all.rb
+- spec/migrations/test_folder_migration.rb
+- spec/migrations/test_sequel_migration.rb
+- spec/operators/ungroup/grouped.json
+- spec/operators/ungroup/test_on_json_content.rb
+- spec/operators/unwrap/test_on_json_content.rb
+- spec/operators/unwrap/wrapped.json
+- spec/optimizer/project/extend.yml
+- spec/optimizer/project/intersect.yml
+- spec/optimizer/project/join.yml
+- spec/optimizer/project/matching.yml
+- spec/optimizer/project/minus.yml
+- spec/optimizer/project/not_matching.yml
+- spec/optimizer/project/project.yml
+- spec/optimizer/project/rename.yml
+- spec/optimizer/project/sort.yml
+- spec/optimizer/project/union.yml
+- spec/optimizer/restrict/clip.yml
+- spec/optimizer/restrict/compact.yml
+- spec/optimizer/restrict/generator.yml
+- spec/optimizer/restrict/intersect.yml
+- spec/optimizer/restrict/leaf_operand.yml
+- spec/optimizer/restrict/minus.yml
+- spec/optimizer/restrict/page.yml
+- spec/optimizer/restrict/project.yml
+- spec/optimizer/restrict/sort.yml
+- spec/optimizer/restrict/union.yml
+- spec/optimizer/test_all.rb
+- spec/sql/helpers.rb
+- spec/sql/queries/01-leaf-operand.yml
+- spec/sql/queries/02-clip.yml
+- spec/sql/queries/03-sort.yml
+- spec/sql/queries/04-frame.yml
+- spec/sql/queries/05-intersect.yml
+- spec/sql/queries/06-join.yml
+- spec/sql/queries/07-matching.yml
+- spec/sql/queries/08-minus.yml
+- spec/sql/queries/09-not-matching.yml
+- spec/sql/queries/10-page.yml
+- spec/sql/queries/11-project.yml
+- spec/sql/queries/12-rename.yml
+- spec/sql/queries/13-restrict.yml
+- spec/sql/queries/15-union.yml
+- spec/sql/queries/16-wrap.yml
+- spec/sql/queries/91-reuse.yml
+- spec/sql/test_sequel_compiler.rb
+- spec/sql/test_sql_compiler.rb
+- spec/test_alf.rb
+- spec/test_helpers.rb
+- tasks/doc.rake
+- tasks/fixtures.rake
 - tasks/gem.rake
+- tasks/mod.rake
+- tasks/release.rake
 - tasks/test.rake
-- test/migrations/test_folder_migration.rb
-- test/migrations/test_sequel_migration.rb
-- test/seeding/test_seeding.rb
-- test/test_alf.rb
-- test/test_helpers.rb
 homepage: http://blambeau.github.com/alf
 licenses: []
 post_install_message: 
@@ -135,13 +217,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3204366250414489882
+      hash: 825147625363283130
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 825147625363283130
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -149,8 +234,54 @@ signing_key:
 specification_version: 3
 summary: Relational Algebra at your fingertips
 test_files:
-- test/migrations/test_folder_migration.rb
-- test/migrations/test_sequel_migration.rb
-- test/seeding/test_seeding.rb
-- test/test_alf.rb
-- test/test_helpers.rb
+- spec/facade/test_query.rb
+- spec/key-inference/queries.yml
+- spec/key-inference/test_all.rb
+- spec/migrations/test_folder_migration.rb
+- spec/migrations/test_sequel_migration.rb
+- spec/operators/ungroup/grouped.json
+- spec/operators/ungroup/test_on_json_content.rb
+- spec/operators/unwrap/test_on_json_content.rb
+- spec/operators/unwrap/wrapped.json
+- spec/optimizer/project/extend.yml
+- spec/optimizer/project/intersect.yml
+- spec/optimizer/project/join.yml
+- spec/optimizer/project/matching.yml
+- spec/optimizer/project/minus.yml
+- spec/optimizer/project/not_matching.yml
+- spec/optimizer/project/project.yml
+- spec/optimizer/project/rename.yml
+- spec/optimizer/project/sort.yml
+- spec/optimizer/project/union.yml
+- spec/optimizer/restrict/clip.yml
+- spec/optimizer/restrict/compact.yml
+- spec/optimizer/restrict/generator.yml
+- spec/optimizer/restrict/intersect.yml
+- spec/optimizer/restrict/leaf_operand.yml
+- spec/optimizer/restrict/minus.yml
+- spec/optimizer/restrict/page.yml
+- spec/optimizer/restrict/project.yml
+- spec/optimizer/restrict/sort.yml
+- spec/optimizer/restrict/union.yml
+- spec/optimizer/test_all.rb
+- spec/sql/helpers.rb
+- spec/sql/queries/01-leaf-operand.yml
+- spec/sql/queries/02-clip.yml
+- spec/sql/queries/03-sort.yml
+- spec/sql/queries/04-frame.yml
+- spec/sql/queries/05-intersect.yml
+- spec/sql/queries/06-join.yml
+- spec/sql/queries/07-matching.yml
+- spec/sql/queries/08-minus.yml
+- spec/sql/queries/09-not-matching.yml
+- spec/sql/queries/10-page.yml
+- spec/sql/queries/11-project.yml
+- spec/sql/queries/12-rename.yml
+- spec/sql/queries/13-restrict.yml
+- spec/sql/queries/15-union.yml
+- spec/sql/queries/16-wrap.yml
+- spec/sql/queries/91-reuse.yml
+- spec/sql/test_sequel_compiler.rb
+- spec/sql/test_sql_compiler.rb
+- spec/test_alf.rb
+- spec/test_helpers.rb