bmg 0.16.3 → 0.16.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44191e2a6c44d59b2965f540cfc406ddf8ac1086cdea394631a9bded9f7d31a7
-  data.tar.gz: ab2dbc754e795d947fe3ed7a38276b91f591c9bb8d5c2349b62ca47022cfc9c2
+  metadata.gz: ec6ef6942310f94d0893f99b34c0d131bed54e0b0d3bee033b10998e09f5b1ef
+  data.tar.gz: a8fe62d1d072c78c96d9e171f17f8e8f039bd12714c443d7b3921e40d696ef6c
 SHA512:
-  metadata.gz: fbf38052a71a818d4746973e302b17190074e7d2b570dced929efd6e792c6ee92d39d021ef262db9d4ac616fed25e54a0798974cbe305756d23cd3e6be03838d
-  data.tar.gz: 87831c2a9c650ee5ad86eb9753a3f3f26fbfa775c52879504ddb36c5b0a869e213a367cbda3572c241061a1af5722786ba7e861ee25de2f64dac4c1681c7ad89
+  metadata.gz: 973a0716b0602f10175eec3eff15cd3515b36f58fd2021d65eb1e6a307808534b58f4fc514bac8d742fd82115ba757b99401a6f50314a899331019f2bc3d961f
+  data.tar.gz: b0f7fb3dba7d8d3810b45b2b0342cacd100ba857969c423f88d28e6c076d1d11879b7a72ced07434ecd88088be93a2dfecb7572cda1a9f396aff4813018c8971

data/lib/bmg/sequel.rb

@@ -28,7 +28,7 @@ module Bmg
     module_function :sequel_params
 
     def infer_type(sequel_db, source)
-      TypeInference.new(sequel_db).call(source) if source.is_a?(Symbol)
+      TypeInference.new(sequel_db).call(source) if source.is_a?(Symbol) || source.is_a?(::Sequel::SQL::QualifiedIdentifier)
     end
     module_function :infer_type
 

data/lib/bmg/sequel/relation.rb

@@ -13,24 +13,24 @@ module Bmg
       end
 
       def delete
-        dataset.delete
+        base_table.delete
       end
 
       def insert(arg)
         case arg
         when Hash then
-          dataset.insert(arg.merge(type.predicate.constants))
+          base_table.insert(arg.merge(type.predicate.constants))
         when Enumerable then
-          dataset.multi_insert(arg.map { |x|
+          base_table.multi_insert(arg.map { |x|
             x.merge(type.predicate.constants)
           })
         else
-          dataset.insert(arg.merge(type.predicate.constants))
+          base_table.insert(arg.merge(type.predicate.constants))
         end
       end
 
       def update(arg)
-        dataset.update(arg)
+        base_table.update(arg)
       end
 
       def to_ast
@@ -52,6 +52,12 @@ module Bmg
         @dataset ||= Translator.new(sequel_db).call(self.expr)
       end
 
+      def base_table
+        raise InvalidUpdateError unless self.expr.respond_to?(:table_spec)
+        raise InvalidUpdateError unless self.expr.table_spec.first == :table_as
+        sequel_db[self.expr.table_spec.table_name.to_sym]
+      end
+
       def _instance(type, builder, expr)
         Relation.new(type, builder, expr, sequel_db)
       end

data/lib/bmg/sequel/translator.rb

@@ -119,7 +119,13 @@ module Bmg
       end
 
       def on_table_as(sexpr)
-        ::Sequel.as(::Sequel.expr(sexpr.table_name.to_sym), ::Sequel.identifier(sexpr.as_name))
+        table_name = case sexpr.table_name
+        when String, Symbol then ::Sequel.expr(sexpr.table_name.to_sym)
+        when ::Sequel::SQL::QualifiedIdentifier then sexpr.table_name
+        else
+          raise ArgumentError, "Invalid table name `#{sexpr.table_name}`"
+        end
+        ::Sequel.as(table_name, ::Sequel.identifier(sexpr.as_name))
       end
 
       def on_subquery_as(sexpr)

data/lib/bmg/sql/builder.rb

@@ -89,6 +89,7 @@ module Bmg
       def from_clause(table, qualifier)
         arg = case table
         when String, Symbol  then table_as(table, qualifier)
+        when ::Sequel::SQL::QualifiedIdentifier then table_as(table, qualifier)
         when Expr            then subquery_as(table, qualifier)
         else                      native_table_as(table, qualifier)
         end
@@ -98,9 +99,10 @@ module Bmg
 
       def table_as(table, qualifier)
         table = case table
-                when String, Symbol then table_name(table)
-                else table
-                end
+        when String, Symbol then table_name(table)
+        when ::Sequel::SQL::QualifiedIdentifier then table_name(table)
+        else table
+        end
         [:table_as,
           table,
           range_var_name(qualifier) ]

data/lib/bmg/version.rb

@@ -2,7 +2,7 @@ module Bmg
   module Version
     MAJOR = 0
     MINOR = 16
-    TINY  = 3
+    TINY  = 4
   end
   VERSION = "#{Version::MAJOR}.#{Version::MINOR}.#{Version::TINY}"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bmg
 version: !ruby/object:Gem::Version
-  version: 0.16.3
+  version: 0.16.4
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-09 00:00:00.000000000 Z
+date: 2019-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: predicate