bmg 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7cf04c07c2f88598d086c9eb174c857995a3646
-  data.tar.gz: 368fdda422f043d57c7da57f5019b4682e9d37eb
+  metadata.gz: e9b2b82ef90b6ca136323d9ef107a1e94733c1b6
+  data.tar.gz: 4fdf4e423a73779e03a4870da5d647c6d2c6f403
 SHA512:
-  metadata.gz: 9ef7574e4dfe6e30619310daf922e16ca20f5721f2d4f339a13fd8077520316215d8306f6b7150a3df5648944163fc5bb9329d40663b6ccf4be1eeba7d26af4c
-  data.tar.gz: a5c71d8cfb1b9e52ab360b3deaffc6c9986b7388154b78141256a83b949300b329c433f7a265cf97d6ab1ba7433ebd08f15e0a549fb39f2b02f19cb2d5cd5a7b
+  metadata.gz: 6c692d1ae8b5146b96e117621721a69880a82fa6f58292fd4d8b3fe709e0189b194701acefb17244201af3a15dcfc284d746e009a4b11a16207ba64195aee68c
+  data.tar.gz: 45cdc9e8479d8e1c30cf733339cbc60a08bf36c64fd388002fcd96c3aa52b2b5e7810869c3587246a25d8f620d6a381cfaec33e6735317e6a99244f6b45214c0

data/lib/bmg/algebra.rb

@@ -57,7 +57,7 @@ module Bmg
     protected :_group
 
     def image(right, as = :image, on = [], options = {})
-      _image self.type.image(right, as, on, options), right, as, on, options
+      _image self.type.image(right.type, as, on, options), right, as, on, options
     end
 
     def _image(type, right, as, on, options)
@@ -75,7 +75,7 @@ module Bmg
     protected :_join
 
     def matching(right, on = [])
-      _matching self.type.matching(right, on), right, on
+      _matching self.type.matching(right.type, on), right, on
     end
 
     def _matching(type, right, on)
@@ -84,7 +84,7 @@ module Bmg
     protected :_matching
 
     def not_matching(right, on = [])
-      _not_matching self.type.not_matching(right, on), right, on
+      _not_matching self.type.not_matching(right.type, on), right, on
     end
 
     def _not_matching(type, right, on)

data/lib/bmg/error.rb

@@ -9,4 +9,7 @@ module Bmg
   # Raised when an update is invalid for some reason
   class InvalidUpdateError < Error; end
 
+  # Raised when violating types
+  class TypeError < Error; end
+
 end

data/lib/bmg/operator.rb

@@ -2,6 +2,10 @@ module Bmg
   module Operator
     include Relation
 
+    attr_reader :type
+    attr_writer :type
+    protected   :type=
+
     def to_s
       str = "(#{self.class.name.split('::').last.downcase}\n"
       str << operands.map{|op| op.to_s.gsub(/^/m, "  ") }.join("\n")
@@ -23,7 +27,7 @@ module Bmg
     module Unary
       include Operator
 
-      attr_reader :type, :operand
+      attr_reader :operand
 
       def _visit(parent, visitor)
         visitor.call(self, parent)
@@ -39,7 +43,7 @@ module Bmg
     module Binary
       include Operator
 
-      attr_reader :type, :left, :right
+      attr_reader :left, :right
 
       def _visit(parent, visitor)
         visitor.call(self, parent)
@@ -55,7 +59,7 @@ module Bmg
     module Nary
       include Operator
 
-      attr_reader :type, :operands
+      attr_reader :operands
 
       def _visit(parent, visitor)
         visitor.call(self, parent)

data/lib/bmg/operator/group.rb

@@ -80,7 +80,7 @@ module Bmg
       end
 
       def group_type
-        type.project(attrs)
+        operand.type.project(attrs)
       end
 
     end # class Extend

data/lib/bmg/reader.rb

@@ -2,7 +2,8 @@ module Bmg
   module Reader
     include Relation
 
-    attr_reader :type
+    attr_accessor :type
+    protected :type=
 
   end
 end

data/lib/bmg/relation.rb

@@ -13,6 +13,18 @@ module Bmg
       Relation::Empty.new(type)
     end
 
+    def with_typecheck
+      dup.tap{|r|
+        r.type = r.type.with_typecheck
+      }
+    end
+
+    def without_typecheck
+      dup.tap{|r|
+        r.type = r.type.with_typecheck
+      }
+    end
+
     def empty?
       each{|t| return false }
       true

data/lib/bmg/relation/empty.rb

@@ -13,7 +13,8 @@ module Bmg
       def initialize(type)
         @type = type
       end
-      attr_reader :type
+      attr_accessor :type
+      protected :type=
 
       def each(&bl)
       end

data/lib/bmg/relation/in_memory.rb

@@ -7,7 +7,9 @@ module Bmg
         @operand = operand
         @type = type
       end
-      attr_reader :type, :operand
+      attr_accessor :type
+      protected :type=
+      attr_reader :operand
 
     public
 

data/lib/bmg/relation/spied.rb

@@ -18,6 +18,11 @@ module Bmg
         operand.type
       end
 
+      def type=(type)
+        operand.type = type
+      end
+      protected :type=
+
       def each(&bl)
         spy.call(self)
         operand.each(&bl)

data/lib/bmg/sequel/translator.rb

@@ -134,10 +134,8 @@ module Bmg
 
     public ### Predicate hack
 
-      def on_in(sexpr)
-        left, right = apply(sexpr.identifier), sexpr.last
-        right = apply(right) if sexpr.subquery?
-        ::Sequel.expr(left => right)
+      def on_opaque(sexpr)
+        apply(sexpr.last)
       end
 
       def on_exists(sexpr)

data/lib/bmg/sql/processor/semi_join.rb

@@ -41,7 +41,7 @@ module Bmg
               builder.exists(subquery)
             elsif commons.size == 1
               identifier = left.desaliaser(true)[commons.to_a.first]
-              Predicate::Factory.in(identifier, subquery)
+              Predicate::Factory.in(identifier, Predicate::Factory.opaque(subquery))
             else
               join_pre  = join_predicate(left, subquery, commons)
               subquery  = expand_where_clause(subquery, join_pre)

data/lib/bmg/sql/relation.rb

@@ -8,7 +8,9 @@ module Bmg
         @builder = builder
         @expr = expr
       end
-      attr_reader :type
+
+      attr_accessor :type
+      protected :type=
 
     protected
 

data/lib/bmg/type.rb

@@ -3,11 +3,33 @@ module Bmg
 
     def initialize(predicate = Predicate.tautology)
       @predicate = predicate
+      @typechecked = false
       raise ArgumentError if @predicate.nil?
     end
 
     ANY = Type.new
 
+  public ## type checking
+
+    attr_writer :typechecked
+    protected :typechecked=
+
+    def typechecked?
+      @typechecked
+    end
+
+    def with_typecheck
+      dup.tap{|x|
+        x.typechecked = true
+      }
+    end
+
+    def without_typecheck
+      dup.tap{|x|
+        x.typechecked = false
+      }
+    end
+
   public ## predicate
 
     attr_accessor :predicate
@@ -69,6 +91,7 @@ module Bmg
   public ### algebra
 
     def allbut(butlist)
+      known_attributes!(butlist) if typechecked? && knows_attrlist?
       dup.tap{|x|
         x.attrlist  = self.attrlist - butlist if knows_attrlist?
         x.predicate = Predicate.tautology
@@ -89,10 +112,16 @@ module Bmg
     end
 
     def autosummarize(by, summarization)
-      ANY
+      known_attributes!(by + summarization.keys) if typechecked? && knows_attrlist?
+      dup.tap{|x|
+        x.attrlist = nil
+        x.predicate = Predicate.tautology
+        x.keys = nil
+      }
     end
 
     def constants(cs)
+      unknown_attributes!(cs.keys) if typechecked? && knows_attrlist?
       dup.tap{|x|
         x.attrlist  = self.attrlist + cs.keys if knows_attrlist?
         x.predicate = self.predicate & Predicate.eq(cs)
@@ -101,6 +130,7 @@ module Bmg
     end
 
     def extend(extension)
+      unknown_attributes!(extension.keys) if typechecked? && knows_attrlist?
       dup.tap{|x|
         x.attrlist  = self.attrlist + extension.keys if knows_attrlist?
         x.predicate = Predicate.tautology
@@ -109,6 +139,10 @@ module Bmg
     end
 
     def group(attrs, as)
+      if typechecked? && knows_attrlist?
+        known_attributes!(attrs)
+        unknown_attributes!([as])
+      end
       dup.tap{|x|
         x.attrlist  = self.attrlist - attrs + [as] if knows_attrlist?
         x.predicate = Predicate.tautology
@@ -117,6 +151,10 @@ module Bmg
     end
 
     def image(right, as, on, options)
+      if typechecked? && knows_attrlist?
+        join_compatible!(right, on)
+        unknown_attributes!([as])
+      end
       dup.tap{|x|
         x.attrlist  = self.attrlist + [as] if knows_attrlist?
         x.predicate = Predicate.tautology
@@ -125,6 +163,7 @@ module Bmg
     end
 
     def join(right, on)
+      join_compatible!(right, on) if typechecked? && knows_attrlist?
       dup.tap{|x|
         x.attrlist  = (knows_attrlist? and right.knows_attrlist?) ? (self.attrlist + right.attrlist).uniq : nil
         x.predicate = self.predicate & right.predicate
@@ -133,18 +172,22 @@ module Bmg
     end
 
     def matching(right, on)
+      join_compatible!(right, on) if typechecked? && knows_attrlist?
       self
     end
 
     def not_matching(right, on)
+      join_compatible!(right, on) if typechecked? && knows_attrlist?
       self
     end
 
     def page(ordering, page_size, options)
+      known_attributes!(ordering.map{|(k,v)| k}) if typechecked? && knows_attrlist?
       self
     end
 
     def project(attrlist)
+      known_attributes!(attrlist) if typechecked? && knows_attrlist?
       dup.tap{|x|
         x.attrlist  = attrlist
         x.predicate = Predicate.tautology
@@ -153,6 +196,10 @@ module Bmg
     end
 
     def rename(renaming)
+      if typechecked? && knows_attrlist?
+        known_attributes!(renaming.keys)
+        unknown_attributes!(renaming.values)
+      end
       dup.tap{|x|
         x.attrlist  = self.attrlist.map{|a| renaming[a] || a } if knows_attrlist?
         x.predicate = self.predicate.rename(renaming)
@@ -161,6 +208,7 @@ module Bmg
     end
 
     def restrict(predicate)
+      known_attributes!(predicate.free_variables) if typechecked? && knows_attrlist?
       dup.tap{|x|
         ### attrlist stays the same
         x.predicate = self.predicate & predicate
@@ -169,6 +217,12 @@ module Bmg
     end
 
     def union(other)
+      if typechecked? && knows_attrlist? && other.knows_attrlist?
+        missing = self.attrlist - other.attrlist
+        raise TypeError, "Union incompatible: missing right attributes #{missing.join(', ')}" unless missing.empty?
+        extra = other.attrlist - self.attrlist
+        raise TypeError, "Union incompatible: missing left attributes #{extra.join(', ')}" unless extra.empty?
+      end
       dup.tap{|x|
         ### attrlist stays the same
         x.predicate = self.predicate | predicate
@@ -176,5 +230,26 @@ module Bmg
       }
     end
 
+  private
+
+    def known_attributes!(attrs)
+      extra = attrs - self.attrlist
+      raise TypeError, "Unknown attributes #{extra.join(', ')}" unless extra.empty?
+    end
+
+    def unknown_attributes!(attrs)
+      clash = self.attrlist & attrs
+      raise TypeError, "Existing attributes #{clash.join(', ')}" unless clash.empty?
+    end
+
+    def join_compatible!(right, on)
+      extra = on - self.attrlist
+      raise TypeError, "Unknow attributes #{extra.join(', ')}" unless extra.empty?
+      if right.knows_attrlist?
+        extra = on - right.attrlist
+        raise TypeError, "Unknow attributes #{extra.join(', ')}" unless extra.empty?
+      end
+    end
+
   end # class Type
 end # module Bmg

data/lib/bmg/version.rb

@@ -1,7 +1,7 @@
 module Bmg
   module Version
     MAJOR = 0
-    MINOR = 13
+    MINOR = 14
     TINY  = 0
   end
   VERSION = "#{Version::MAJOR}.#{Version::MINOR}.#{Version::TINY}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bmg
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-31 00:00:00.000000000 Z
+date: 2018-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: predicate
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement