bmg 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b43a1cda1c1650f7678db8e4a9213e7065d26a5
-  data.tar.gz: 6f130fa599d6d24b4eaa0450883cfef539b95e6f
+  metadata.gz: 381472a4bb34f2a614c0520261508fb2c6ff6032
+  data.tar.gz: 562ca2c457720e0b7a12a5e9b9ccd33e1609b778
 SHA512:
-  metadata.gz: 0ac9c79f0c348dbd7685a5c922a28a315192a72ce6b42da708b3233f1fb53da1b64da97659ddb3935aad39a4bdf3141d06be24ff102d202be0e7d8677fbb9f8a
-  data.tar.gz: 40aea311e6e4d372ca07ffd91fd5c6ad102f3dd67da5443287121233848e3470ccded49eea97ef4e1f9d4a01afebeb4b43425e7426081ee2472cb0b8a95833ed
+  metadata.gz: 195468c7f66d2aa11d49678effe9dc5122e67aec2fbe3161549f6a351835a11f8957aaca4004143bc00256c121d4638c68d466f6267623d35ac5288855e5d7df
+  data.tar.gz: 1590b7723bec6a826e88a0eef3e1e659c80c355f41de3d61c5d31d4a6c872398f6698290ac464ea795e8bd67e1e5a4eebaaa4052468e61933a6a36b79df81db7

data/Gemfile

@@ -1,2 +1,4 @@
 source "https://rubygems.org"
 gemspec
+
+gem 'predicate', path: '../predicate'

data/lib/bmg.rb

@@ -15,6 +15,7 @@ module Bmg
 end
 require_relative 'bmg/version'
 require_relative 'bmg/error'
+require_relative 'bmg/support'
 require_relative 'bmg/algebra'
 require_relative 'bmg/type'
 require_relative 'bmg/relation'

data/lib/bmg/error.rb

@@ -6,4 +6,7 @@ module Bmg
   # Raised by Relation#one when the relation is not a singleton
   class OneError < Error; end
 
+  # Raised when an update is invalid for some reason
+  class InvalidUpdateError < Error; end
+
 end

data/lib/bmg/operator/allbut.rb

@@ -41,6 +41,23 @@ module Bmg
         end
       end
 
+      def insert(arg)
+        case arg
+        when Hash       then operand.insert(valid_tuple!(arg))
+        when Enumerable then operand.insert(arg.map{|t| valid_tuple!(t) })
+        else
+          super
+        end
+      end
+
+      def update(tuple)
+        operand.update(valid_tuple!(tuple))
+      end
+
+      def delete
+        operand.delete
+      end
+
       def to_ast
         [:allbut, operand.to_ast, butlist.dup]
       end
@@ -54,7 +71,13 @@ module Bmg
     private
 
       def tuple_allbut(tuple)
-        tuple.delete_if{|k,_| @butlist.include?(k) }
+        TupleAlgebra.allbut(tuple, @butlist)
+      end
+
+      def valid_tuple!(tuple)
+        offending = tuple.keys & butlist
+        raise InvalidUpdateError, "#{offending.inspect} cannot be updated" unless offending.empty?
+        tuple
       end
 
     end # class Allbut

data/lib/bmg/operator/autosummarize.rb

@@ -42,6 +42,21 @@ module Bmg
         [:autosummarize, operand.to_ast, by.dup, sums.dup]
       end
 
+    protected
+
+      def _restrict(type, predicate)
+        top, bottom = predicate.and_split(sums.keys)
+        if top == predicate
+          super
+        else
+          op = operand
+          op = op.restrict(bottom)
+          op = op.autosummarize(by, sums)
+          op = op.restrict(top)
+          op
+        end
+      end
+
     private
 
       # Returns the tuple determinant.

data/lib/bmg/operator/constants.rb

@@ -29,6 +29,28 @@ module Bmg
         end
       end
 
+      def insert(arg)
+        case arg
+        when Hash       then operand.insert(allbut_constants(arg))
+        when Relation   then operand.insert(arg.allbut(constants.keys))
+        when Enumerable then operand.insert(arg.map{|t| allbut_constants(t) })
+        else
+          super
+        end
+      end
+
+      def update(tuple)
+        shared = tuple.keys & constants.keys
+        on_tuple = TupleAlgebra.project(tuple, shared)
+        on_const = TupleAlgebra.project(constants, shared)
+        raise InvalidUpdateError, "Cannot violate relvar predicate" unless on_tuple == on_const
+        operand.update(allbut_constants(tuple))
+      end
+
+      def delete
+        operand.delete
+      end
+
       def to_ast
         [ :constants, operand.to_ast, constants.dup ]
       end
@@ -78,6 +100,10 @@ module Bmg
         tuple.merge(@constants)
       end
 
+      def allbut_constants(tuple)
+        TupleAlgebra.allbut(tuple, constants.keys)
+      end
+
     end # class Constants
   end # module Operator
 end # module Bmg

data/lib/bmg/operator/extend.rb

@@ -32,10 +32,43 @@ module Bmg
         end
       end
 
+      def insert(arg)
+        case arg
+        when Hash       then operand.insert(allbut_extkeys(arg))
+        when Relation   then operand.insert(arg.allbut(extension.keys))
+        when Enumerable then operand.insert(arg.map{|t| allbut_extkeys(t) })
+        else
+          super
+        end
+      end
+
+      def update(tuple)
+        operand.update(allbut_extkeys(tuple))
+      end
+
+      def delete
+        operand.delete
+      end
+
       def to_ast
         [ :extend, operand.to_ast, extension.dup ]
       end
 
+    protected ### optimization
+
+      def _restrict(type, predicate)
+        top, bottom = predicate.and_split(extension.keys)
+        if top == predicate
+          super
+        else
+          op = operand
+          op = op.restrict(bottom)
+          op = op.extend(extension)
+          op = op.restrict(top)
+          op
+        end
+      end
+
     private
 
       def extend_it(tuple)
@@ -45,6 +78,10 @@ module Bmg
         }
       end
 
+      def allbut_extkeys(tuple)
+        TupleAlgebra.allbut(tuple, extension.keys)
+      end
+
     end # class Extend
   end # module Operator
 end # module Bmg

data/lib/bmg/operator/image.rb

@@ -96,11 +96,11 @@ module Bmg
     private
 
       def tuple_project(tuple, on)
-        on.each_with_object({}){|k,t| t[k] = tuple[k] }
+        TupleAlgebra.project(tuple, on)
       end
 
       def tuple_image(tuple, on)
-        tuple.dup.delete_if{|k,_| on.include?(k) }
+        TupleAlgebra.allbut(tuple, on)
       end
 
       def image_type

data/lib/bmg/operator/project.rb

@@ -40,6 +40,23 @@ module Bmg
         end
       end
 
+      def insert(arg)
+        case arg
+        when Hash       then operand.insert(valid_tuple!(arg))
+        when Enumerable then operand.insert(arg.map{|t| valid_tuple!(t) })
+        else
+          super
+        end
+      end
+
+      def update(tuple)
+        operand.update(valid_tuple!(tuple))
+      end
+
+      def delete
+        operand.delete
+      end
+
       def to_ast
         [ :project, operand.to_ast, attrlist ]
       end
@@ -56,6 +73,12 @@ module Bmg
         tuple.delete_if{|k,_| !@attrlist.include?(k) }
       end
 
+      def valid_tuple!(tuple)
+        offending = tuple.keys - attrlist
+        raise InvalidUpdateError, "#{offending.inspect} cannot be updated" unless offending.empty?
+        tuple
+      end
+
     end # class Project
   end # module Operator
 end # module Bmg

data/lib/bmg/operator/rename.rb

@@ -31,25 +31,53 @@ module Bmg
 
       def each
         @operand.each do |tuple|
-          yield rename(tuple)
+          yield rename(tuple, renaming)
         end
       end
 
+      def insert(arg)
+        case arg
+        when Hash       then operand.insert(rename(arg, reverse_renaming))
+        when Relation   then operand.insert(arg.rename(reverse_renaming))
+        when Enumerable then operand.insert(arg.map{|t| rename(t, reverse_renaming) })
+        else
+          super
+        end
+      end
+
+      def update(arg)
+        case arg
+        when Hash then operand.update(rename(arg, reverse_renaming))
+        else
+          super
+        end
+      end
+
+      def delete
+        operand.delete
+      end
+
       def to_ast
         [ :rename, operand.to_ast, renaming.dup ]
       end
 
+    protected ### optimization
+
+      def _restrict(type, predicate)
+        operand.restrict(predicate.rename(reverse_renaming)).rename(renaming)
+      end
+
     private
 
-      def rename(tuple)
+      def rename(tuple, renaming)
         tuple.each_with_object({}){|(k,v),h|
-          h[rename_key(k)] = v
+          h[renaming[k] || k] = v
           h
         }
       end
 
-      def rename_key(k)
-        @renaming[k] || k
+      def reverse_renaming
+        renaming.each_with_object({}){|(k,v),h| h[v] = k }
       end
 
     end # class Rename

data/lib/bmg/relation.rb

@@ -35,6 +35,23 @@ module Bmg
       one_or_yield{ nil }
     end
 
+    def insert(arg)
+      raise InvalidUpdateError, "Cannot insert into this Relvar"
+    end
+
+    def update(arg)
+      raise InvalidUpdateError, "Cannot update this Relvar"
+    end
+
+    def delete
+      raise InvalidUpdateError, "Cannot delete from this Relvar"
+    end
+
+    # Returns a json representation
+    def to_json(*args, &bl)
+      to_a.to_json(*args, &bl)
+    end
+
     # Converts to an sexpr expression.
     def to_ast
       raise "Bmg is missing a feature!"

data/lib/bmg/sequel/relation.rb

@@ -19,6 +19,18 @@ module Bmg
         @dataset.each(&bl)
       end
 
+      def delete
+        dataset.delete
+      end
+
+      def insert(arg)
+        dataset.insert(arg)
+      end
+
+      def update(arg)
+        dataset.update(arg)
+      end
+
       def to_ast
         [:sequel, @dataset.sql]
       end

data/lib/bmg/support.rb

@@ -0,0 +1 @@
+require_relative 'support/tuple_algebra'

data/lib/bmg/support/tuple_algebra.rb

@@ -0,0 +1,15 @@
+module Bmg
+  module TupleAlgebra
+
+    def allbut(tuple, butlist)
+      tuple.reject{|k,v| butlist.include?(k) }
+    end
+    module_function :allbut
+
+    def project(tuple, attrlist)
+      tuple.reject{|k,v| !attrlist.include?(k) }
+    end
+    module_function :project
+
+  end # module TupleAlgebra
+end # module Bmg

data/lib/bmg/version.rb

@@ -1,8 +1,8 @@
 module Bmg
   module Version
     MAJOR = 0
-    MINOR = 4
-    TINY  = 1
+    MINOR = 5
+    TINY  = 0
   end
   VERSION = "#{Version::MAJOR}.#{Version::MINOR}.#{Version::TINY}"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bmg
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Bernard Lambeau
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -141,6 +141,8 @@ files:
 - lib/bmg/relation/empty.rb
 - lib/bmg/sequel.rb
 - lib/bmg/sequel/relation.rb
+- lib/bmg/support.rb
+- lib/bmg/support/tuple_algebra.rb
 - lib/bmg/type.rb
 - lib/bmg/version.rb
 - tasks/gem.rake