alf 0.14.0 → 0.15.0

data/lib/alf/loader.rb

@@ -1,3 +1,4 @@
 require "alf-core"
+require "alf-sql"
 require "alf-sequel"
 require "alf-shell"

data/lib/alf/version.rb

@@ -2,7 +2,7 @@ module Alf
   module Version
 
     MAJOR = 0
-    MINOR = 14
+    MINOR = 15
     TINY  = 0
 
     def self.to_s

data/spec/facade/test_query.rb

@@ -0,0 +1,12 @@
+require 'test_helpers'
+describe Alf, "query" do
+
+  subject{ Alf.query(adapter){ suppliers } }
+
+  it{ should be_a(Relation) }
+
+  it 'should have expected heading' do
+    subject.heading.should eq(Heading(sid: String, name: String, status: Integer, city: String))
+  end
+
+end

data/spec/key-inference/queries.yml

@@ -0,0 +1,10 @@
+- alf: |-
+    suppliers
+  keys:
+    - [ sid  ]
+    - [ name ]
+- alf: |-
+    matching(suppliers, Relation(city: ['London', 'Paris']))
+  keys:
+    - [ sid  ]
+    - [ name ]

data/spec/key-inference/test_all.rb

@@ -0,0 +1,21 @@
+require 'test_helpers'
+module Alf
+  describe "Key inference" do
+
+    subject{ expr.keys }
+
+    (Path.dir/"queries.yml").load.each do |query|
+      alf  = query['alf']
+      keys = query['keys']
+
+      describe "Key inference on '#{query}'" do
+        let(:expr){ conn.parse(alf) }
+
+        it 'should be as expected' do
+          subject.should eq(Alf::Keys.coerce(keys))
+        end
+      end
+    end
+
+  end
+end

data/{test → spec}/migrations/test_sequel_migration.rb

@@ -2,7 +2,7 @@ require 'test_helpers'
 describe "Migrations with a Sequel adapter" do
 
   let(:db){
-    Alf.database(victim.conn_spec, opts)
+    Alf.database("#{Alf::Sequel::Adapter.sqlite_protocol}:memory", opts)
   }
 
   context 'when no migration folder is set' do

data/spec/operators/ungroup/grouped.json

@@ -0,0 +1,3 @@
+[{
+  "suppliers": [ {"sid": "S1"} ]
+}]

data/spec/operators/ungroup/test_on_json_content.rb

@@ -0,0 +1,11 @@
+require 'test_helpers'
+describe Alf::Algebra::Ungroup, "on json content" do
+
+  it 'works as expected' do
+    Alf.connect(Path.dir) do |conn|
+      rel = conn.relvar{ ungroup(grouped, :suppliers) }.to_a
+      rel.should eq([{sid: "S1"}])
+    end
+  end
+
+end

data/spec/operators/unwrap/test_on_json_content.rb

@@ -0,0 +1,11 @@
+require 'test_helpers'
+describe Alf::Algebra::Unwrap, "on json content" do
+
+  it 'works as expected' do
+    Alf.connect(Path.dir) do |conn|
+      rel = conn.relvar{ unwrap(wrapped, :wrapped) }.to_a
+      rel.should eq([{sid: "S1"}])
+    end
+  end
+
+end

data/spec/operators/unwrap/wrapped.json

@@ -0,0 +1,3 @@
+[
+  { "wrapped": {"sid": "S1"} }
+]

data/spec/optimizer/project/extend.yml

@@ -0,0 +1,20 @@
+# when extension only is kept
+- alf: |-
+    project(extend(suppliers, a: "A", b: "B"), [:a, :b])
+  optimized: |-
+    project(extend(suppliers, a: "A", b: "B"), [:a, :b])
+# when extension is not at all touched
+- alf: |-
+    project(extend(suppliers, a: "A", b: "B"), [:sid, :a, :b])
+  optimized: |-
+    project(extend(suppliers, a: "A", b: "B"), [:sid, :a, :b])
+# when extension is entirely removed
+- alf: |-
+    project(extend(suppliers, a: "A", b: "B"), [:sid])
+  optimized: |-
+    project(suppliers, [:sid])
+# when extension is partially removed
+- alf: |-
+    project(extend(suppliers, a: "A", b: "B"), [:sid, :a])
+  optimized: |-
+    project(extend(suppliers, a: "A"), [:sid, :a])

data/spec/optimizer/project/intersect.yml

@@ -0,0 +1,10 @@
+- alf: |-
+    project(intersect(suppliers_in_london, suppliers_in_paris), [:name])
+  optimized: |-
+    project(intersect(suppliers_in_london, suppliers_in_paris), [:name])
+  comment: |-
+    This is NOT intersect(project, project). Indeed, no supplier is both in
+    Paris and in London, so the intersection is empty and hence the projection.
+    In contrast, two suppliers might have the same name and be one in London
+    and the other in Paris. Therefore, projecting first would return those
+    two names and the intersection would not be empty.

data/spec/optimizer/project/join.yml

@@ -0,0 +1,20 @@
+# join preserving all join attributes
+- alf: |-
+    project(join(suppliers, supplies), [:sid, :name, :pid, :qty])
+  optimized: |-
+    join(project(suppliers, [:sid, :name]), supplies)
+# join preserving all join attributes (allbut)
+- alf: |-
+    allbut(join(suppliers, supplies), [:status, :qty])
+  optimized: |-
+    join(allbut(suppliers, [:status]), allbut(supplies, [:qty]))
+# when not preserving all join attributes
+- alf: |-
+    project(join(suppliers, supplies), [:name, :qty])
+  optimized: |-
+    project(join(project(suppliers, [:sid, :name]), project(supplies, [:sid, :qty])), [:name, :qty])
+# when not preserving all join attributes (allbut)
+- alf: |-
+    allbut(join(suppliers, supplies), [:sid, :pid])
+  optimized: |-
+    allbut(join(suppliers, allbut(supplies, [:pid])), [:sid])

data/spec/optimizer/project/matching.yml

@@ -0,0 +1,21 @@
+# when matching attributes are preserved
+- alf: |-
+    project(matching(suppliers, supplies), [:sid, :name])
+  optimized: |-
+    matching(project(suppliers, [:sid, :name]), supplies)
+# when matching attributes are preserved (allbut)
+- alf: |-
+    allbut(matching(suppliers, supplies), [:city])
+  optimized: |-
+    matching(allbut(suppliers, [:city]), supplies)
+
+# when matching attributes are not preserved
+- alf: |-
+    project(matching(suppliers, supplies), [:name])
+  optimized: |-
+    project(matching(project(suppliers, [:sid, :name]), supplies), [:name])
+# when matching attributes are not preserved (allbut)
+- alf: |-
+    allbut(matching(suppliers, supplies), [:sid, :name])
+  optimized: |-
+    allbut(matching(allbut(suppliers, [:name]), supplies), [:sid])

data/spec/optimizer/project/minus.yml

@@ -0,0 +1,9 @@
+- alf: |-
+    project(minus(suppliers_in_london, suppliers_in_paris), [:name])
+  optimized: |-
+    project(minus(suppliers_in_london, suppliers_in_paris), [:name])
+  comment: |-
+    This is NOT minus(project, project). Indeed, as a supplier cannot be both
+    in Paris and in London, the minus simply returns the left operand. In
+    contrast, if we project first then the city information is lost and we
+    could restrict the left operand through common names, which is wrong.

data/spec/optimizer/project/not_matching.yml

@@ -0,0 +1,21 @@
+# when matching attributes are preserved
+- alf: |-
+    project(not_matching(suppliers, supplies), [:sid, :name])
+  optimized: |-
+    not_matching(project(suppliers, [:sid, :name]), supplies)
+# when matching attributes are preserved (allbut)
+- alf: |-
+    allbut(not_matching(suppliers, supplies), [:city])
+  optimized: |-
+    not_matching(allbut(suppliers, [:city]), supplies)
+
+# when matching attributes are not preserved
+- alf: |-
+    project(not_matching(suppliers, supplies), [:name])
+  optimized: |-
+    project(not_matching(project(suppliers, [:sid, :name]), supplies), [:name])
+# when matching attributes are not preserved (allbut)
+- alf: |-
+    allbut(not_matching(suppliers, supplies), [:sid, :name])
+  optimized: |-
+    allbut(not_matching(allbut(suppliers, [:name]), supplies), [:sid])

data/spec/optimizer/project/project.yml

@@ -0,0 +1,88 @@
+# projection on leaf operand
+- alf: |-
+    project(suppliers, [:sid])
+  optimized: |-
+    project(suppliers, [:sid])
+
+# allbut on leaf operand
+- alf: |-
+    allbut(suppliers, [:sid])
+  optimized: |-
+    allbut(suppliers, [:sid])
+
+# project(project) on different sets
+- alf: |-
+    project(project(suppliers, [:sid]), [:name])
+  optimized: |-
+    project(suppliers, [])
+# project(project) on a subset
+- alf: |-
+    project(project(suppliers, [:sid, :name]), [:sid])
+  optimized: |-
+    project(suppliers, [:sid])
+# project(project) on a superset
+- alf: |-
+    project(project(suppliers, [:sid]), [:sid, :name])
+  optimized: |-
+    project(suppliers, [:sid])
+
+# allbut(allbut) on different sets
+- alf: |-
+    allbut(allbut(suppliers, [:sid]), [:name])
+  optimized: |-
+    allbut(suppliers, [:sid, :name])
+# allbut(allbut) on a subset
+- alf: |-
+    allbut(allbut(suppliers, [:sid, :name]), [:sid])
+  optimized: |-
+    allbut(suppliers, [:sid, :name])
+# allbut(allbut) on a superset
+- alf: |-
+    allbut(allbut(suppliers, [:sid]), [:sid, :name])
+  optimized: |-
+    allbut(suppliers, [:sid, :name])
+
+# project(allbut(...)) on different sets
+- alf: |-
+    project(allbut(suppliers, [:name]), [:sid])
+  optimized: |-
+    project(suppliers, [:sid])
+# project(allbut(...)) on a subset
+- alf: |-
+    project(allbut(suppliers, [:sid, :name]), [:sid])
+  optimized: |-
+    project(suppliers, [])
+# project(allbut(...)) on a superset
+- alf: |-
+    project(allbut(suppliers, [:sid]), [:sid, :name])
+  optimized: |-
+    project(suppliers, [:name])
+
+# allbut(project(...)) on different sets
+- alf: |-
+    allbut(project(suppliers, [:name]), [:sid])
+  optimized: |-
+    project(suppliers, [:name])
+# allbut(project(...)) on a subset
+- alf: |-
+    allbut(project(suppliers, [:sid, :name]), [:sid])
+  optimized: |-
+    project(suppliers, [:name])
+# allbut(project(...)) on a superset
+- alf: |-
+    allbut(project(suppliers, [:sid]), [:sid, :name])
+  optimized: |-
+    project(suppliers, [])
+
+# project when used inside another otherator
+- alf: |-
+    rename(project(project(suppliers, [:name, :sid]), [:sid]), sid: :id)
+  optimized: |-
+    rename(project(suppliers, [:sid]), sid: :id)
+# project when should be applied recursively
+- alf: |-
+    inside = project(project(suppliers, [:sid, :name, :status]), [:name, :status])
+    project(intersect(inside, suppliers), [:sname])
+  optimized: |-
+    inside = project(suppliers, [:name, :status])
+    project(intersect(inside, suppliers), [:sname])

data/spec/optimizer/project/rename.yml

@@ -0,0 +1,30 @@
+# when renaming is preserved
+- alf: |-
+    project(rename(suppliers, :sid => :id), [:id, :name])
+  optimized: |-
+    rename(project(suppliers, [:sid, :name]), :sid => :id)
+# when renaming is preserved (allbut)
+- alf: |-
+    allbut(rename(suppliers, :sid => :id), [:city])
+  optimized: |-
+    rename(allbut(suppliers, [:city]), :sid => :id)
+# when renaming is projected away
+- alf: |-
+    project(rename(suppliers, :sid => :id), [:name])
+  optimized: |-
+    project(suppliers, [:name])
+# when renaming is partially projected away
+- alf: |-
+    project(rename(suppliers, :sid => :id, :name => :sname), [:sname])
+  optimized: |-
+    rename(project(suppliers, [:name]), :name => :sname)
+# when renaming is projected away (allbut)
+- alf: |-
+    allbut(rename(suppliers, :sid => :id), [:id, :name])
+  optimized: |-
+    allbut(suppliers, [:sid, :name])
+# when renaming is partially projected away (allbut)
+- alf: |-
+    allbut(rename(suppliers, :sid => :id, :name => :sname), [:id])
+  optimized: |-
+    rename(allbut(suppliers, [:sid]), :name => :sname)

data/spec/optimizer/project/sort.yml

@@ -0,0 +1,45 @@
+# when all sort attributes are preserved
+- alf: |-
+    project(sort(suppliers, [:name, :asc]), [:sid, :name])
+  optimized: |-
+    sort(project(suppliers, [:sid, :name]), [:name, :asc])
+# when all sort attributes are preserved (allbut)
+- alf: |-
+    allbut(sort(suppliers, [:name, :asc]), [:city])
+  optimized: |-
+    sort(allbut(suppliers, [:city]), [:name, :asc])
+# when no sort attribute is preserved
+- alf: |-
+    project(sort(suppliers, [:name, :asc]), [:sid])
+  optimized: |-
+    project(sort(project(suppliers, [:sid, :name]), [:name, :asc]), [:sid])
+# when no sort attribute is preserved (allbut)
+- alf: |-
+    allbut(sort(suppliers, [:name, :asc]), [:name])
+  optimized: |-
+    allbut(sort(suppliers, [:name, :asc]), [:name])
+# when no sort attribute is preserved (allbut II)
+- alf: |-
+    allbut(sort(suppliers, [:name, :asc]), [:name, :city])
+  optimized: |-
+    allbut(sort(allbut(suppliers, [:city]), [:name, :asc]), [:name])
+# when some sort attributes are preserved
+- alf: |-
+    project(sort(suppliers, [[:name, :asc], [:sid, :asc]]), [:sid])
+  optimized: |-
+    project(sort(project(suppliers, [:sid, :name]), [[:name, :asc], [:sid, :asc]]), [:sid])
+# when some sort attributes are preserved (II)
+- alf: |-
+    project(sort(suppliers, [[:name, :asc], [:sid, :asc]]), [:sid, :city])
+  optimized: |-
+    project(sort(project(suppliers, [:sid, :name, :city]), [[:name, :asc], [:sid, :asc]]), [:sid, :city])
+# when some sort attributes are preserved (allbut)
+- alf: |-
+    allbut(sort(suppliers, [[:name, :asc], [:sid, :asc]]), [:sid])
+  optimized: |-
+    allbut(sort(suppliers, [[:name, :asc], [:sid, :asc]]), [:sid])
+# when some sort attributes are preserved (allbut II)
+- alf: |-
+    allbut(sort(suppliers, [[:name, :asc], [:sid, :asc]]), [:sid, :city])
+  optimized: |-
+    allbut(sort(allbut(suppliers, [:city]), [[:name, :asc], [:sid, :asc]]), [:sid])

data/spec/optimizer/project/union.yml

@@ -0,0 +1,8 @@
+- alf: |-
+    project(union(suppliers_in_london, suppliers_in_paris), [:name])
+  optimized: |-
+    union(project(suppliers_in_london, [:name]), project(suppliers_in_paris, [:name]))
+- alf: |-
+    allbut(union(suppliers_in_london, suppliers_in_paris), [:name])
+  optimized: |-
+    union(allbut(suppliers_in_london, [:name]), allbut(suppliers_in_paris, [:name]))

data/spec/optimizer/restrict/clip.yml

@@ -0,0 +1,4 @@
+- alf: |-
+    restrict(clip(suppliers, [:sid, :name]), city: 'Paris')
+  optimized: |-
+    clip(restrict(suppliers, city: 'Paris'), [:sid, :name])

data/spec/optimizer/restrict/compact.yml

@@ -0,0 +1,4 @@
+- alf: |-
+    restrict(compact(suppliers), city: 'Paris')
+  optimized: |-
+    compact(restrict(suppliers, city: 'Paris'))

data/spec/optimizer/restrict/generator.yml

@@ -0,0 +1,4 @@
+- alf: |-
+    restrict(generator(10, :auto), auto: 2)
+  optimized: |-
+    restrict(generator(10, :auto), auto: 2)

data/spec/optimizer/restrict/intersect.yml

@@ -0,0 +1,4 @@
+- alf: |-
+    restrict(intersect(suppliers, suppliers), city: 'Paris')
+  optimized: |-
+    intersect(restrict(suppliers, city: 'Paris'), restrict(suppliers, city: 'Paris'))

data/spec/optimizer/restrict/leaf_operand.yml

@@ -0,0 +1,4 @@
+- alf: |-
+    restrict(suppliers, city: 'Paris')
+  optimized: |-
+    restrict(suppliers, city: 'Paris')

data/spec/optimizer/restrict/minus.yml

@@ -0,0 +1,4 @@
+- alf: |-
+    restrict(minus(suppliers, suppliers), city: 'Paris')
+  optimized: |-
+    minus(restrict(suppliers, city: 'Paris'), restrict(suppliers, city: 'Paris'))

data/spec/optimizer/restrict/page.yml

@@ -0,0 +1,12 @@
+# restrict of a page is not optimizable
+- alf: |-
+    restrict(page(suppliers, [:name], 1, page_size: 5), city: 'Paris')
+  optimized: |-
+    restrict(page(suppliers, [:name], 1, page_size: 5), city: 'Paris')
+# ... but the inner operand is
+- alf: |-
+    inside = restrict(compact(suppliers), city: 'Paris')
+    restrict(page(inside, [:name], 1, page_size: 5), city: 'Paris')
+  optimized: |-
+    inside = compact(restrict(suppliers, city: 'Paris'))
+    restrict(page(inside, [:name], 1, page_size: 5), city: 'Paris')