jungle_path 0.0.32 → 0.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5c94ae2bcbe07ca5a4b5aee5b3b429493bc2be9
-  data.tar.gz: 379998afb149f25d92e864d6954ce9f357df2518
+  metadata.gz: c7a8ea6e5e533ddeed4046ae19001ce4a7b154c0
+  data.tar.gz: dd6b1b094a6349d5941142bf0035f7f49f94bd39
 SHA512:
-  metadata.gz: d9099cc6e1d1bd5455f3fc4c379bcd5a137aaf9f5bdb1ddb8ec11306643b535b0871a62cbbaca5559e377d81f97f8b1644396571d2cc91f2e53125e9384819bd
-  data.tar.gz: 16c69cf42849b4b4236612dd9cc217691d07db33a669944be416aae0b18aee565dc22ee2ddd8c64e643819cc38d91119232fc0ccd2293cacfb8e22567579c7c9
+  metadata.gz: 5132fe030e382f59d05204ccdb1a65900b8b139a6fe2f6c3159d197e84b13ddc3a0a43df4cec94b273cb9701e87d9709b4f70488e98c67aae7820b9d7f7bfd6e
+  data.tar.gz: c75b6f2b87ef3806bd17ddd92cdfb84580efa56bb0a6c5926e1e8641d9d9905caeb09d1160887fa6c80665889988a18ee449f93b88e65d8f666287be5c66e311

data/lib/jungle_path/db_model/view.rb

@@ -3,25 +3,37 @@ require 'set'
 module JunglePath
 	module DBModel
 		class View
-			attr_reader :create, :drop, :references, :parameters
-			def initialize create=nil, drop=nil, references=nil, parameters=nil
+			attr_reader :create, :drop, :references, :parameters, :pre_query_hook
+			def initialize create=nil, drop=nil, references=nil, parameters=nil, pre_query_hook=nil
 				@create = create
 				@drop = drop
 				@references = references || []
 				@references = Set.new(@references)
 				@parameters = parameters || []
+				@pre_query_hook = pre_query_hook
 			end
 			def has_reference_to?(table_name)
 				@references.member?(table_name)
 			end
-			def build_call(identity, table)
-				parameters = identity.alternative_user_keys.select{|k, v| @parameters.include?(k)}.values.map{|n| convert_to_parameter(n)}.join(', ')
+			def build_call(identity, table, from_clause_parameters=nil)
+				# user identity parameters take precedence, then parameters coming with query. This prevents user supplied parameterss
+				# from being used to set identity parameters!
+				parameters = identity.alternative_user_keys.select{|k, v| @parameters.include?(k)}.values.map{|n| convert_to_parameter(n)}
+				if from_clause_parameters and from_clause_parameters.length > 0
+					from_clause_parameters.each do |p|
+						parmeters << p
+					end
+				end
+				parameters = parameters.join(', ')
 				if parameters.length > 0
 					"#{table.table_name}(#{parameters})"
 				else
 					"#{table.table_name}"
 				end
 			end
+			def run_pre_query_hook(identity, table, db, parameters=nil)
+				@pre_query_hook.call(identity, table, db) if @pre_query_hook
+			end
 			def convert_to_parameter(value)
 				return value if value.class == Fixnum
 				return "'#{value}'" if value.class == String

data/lib/jungle_path/query/engine.rb

@@ -7,13 +7,14 @@ require 'jungle_path/query/nested_hash_sorter'
 module JunglePath
   module Query
     class Engine
-      attr_reader :root, :tables, :identity, :apply_limit_offset_to_sql
+      attr_reader :root, :tables, :identity, :apply_limit_offset_to_sql, :db
 
       #def initialize(tables_hash, identity=nil, apply_limit_offset_to_sql=true)
-      def initialize(node_tree, identity=nil, apply_limit_offset_to_sql=true)
+      def initialize(node_tree, identity=nil, apply_limit_offset_to_sql=true, db=nil)
         @tables = node_tree.tables_hash
         @identity = identity
         @apply_limit_offset_to_sql = apply_limit_offset_to_sql
+        @db = db
         #@root = Gen.gen_node_tree(tables_hash)
         @root = node_tree
       end
@@ -132,6 +133,8 @@ module JunglePath
               break
             end
             expect_sort = true
+          elsif expect_fields and token == "[" # got parameters which should be passed to the entity in sql as a table function.
+            entity.parameters = process_parameters(entity, tokens)
           elsif expect_fields and token == "("
             expect_fields = false
             entity.fields = process_fields(entity, tokens, aliases, values, root_entity)
@@ -149,6 +152,36 @@ module JunglePath
         entity
       end
 
+      def process_parameters(entity, tokens)
+        parameters = []
+        token = next_token(tokens)
+        while token
+          if token == "]"
+            break
+          elsif token == ','
+            # ignore a comma
+          elsif token == 'null'
+            parameters << nil
+          elsif token =~ /^[0-9]/ # starts with number
+            if token.include? "."
+              parameters << JunglePath::Query::FloatValue.parse(token)
+            else
+              parameters << JunglePath::Query::IntValue.parse(token)
+            end
+          elsif token =~ /^["']/ # starts with quote
+            parameters << JunglePath::Query::StringValue.parse(token)
+          elsif token.downcase == "true"
+            parameters << true
+          elsif token.downcase == "false"
+            parameters << false
+          else
+            raise "unexpected token: #{token}"
+          end
+          token = next_token(tokens)
+        end
+        parameters
+      end
+
       def process_fields(entity, tokens, aliases, values, root_entity)
         #puts "process_fields - entity.name: #{entity.name}."
         fields = []

data/lib/jungle_path/query/entity.rb

@@ -7,7 +7,7 @@ require 'set'
 module JunglePath
   module Query
     class Entity
-      attr_accessor :name, :alias_, :node, :parent, :symbol, :fields, :filter, :sort, :limit, :offset, :field_node, :join_field_override
+      attr_accessor :name, :alias_, :node, :parent, :symbol, :fields, :filter, :sort, :limit, :offset, :field_node, :join_field_override, :parameters
       attr_reader :left_join
       def initialize(token, alias_, node, parent, symbol)
         @name = Entity.get_name_from_token(token)

data/lib/jungle_path/query/from.rb

@@ -7,9 +7,9 @@ require 'set'
 module JunglePath
   module Query
     class From
-      attr_reader :join_text, :table_name, :table_alias, :on_a_column_name, :on_b_alias, :on_b_column_name
+      attr_reader :join_text, :table_name, :table_alias, :on_a_column_name, :on_b_alias, :on_b_column_name, :parameters
       attr_accessor :table_replacement_text
-      def initialize join_text, table_name, table_alias, on_a_column_name=nil, on_b_alias=nil, on_b_column_name=nil
+      def initialize join_text, table_name, table_alias, on_a_column_name=nil, on_b_alias=nil, on_b_column_name=nil, parameters=nil
         @join_text = join_text
         @table_name = table_name.to_sym
         @table_alias = table_alias
@@ -17,6 +17,7 @@ module JunglePath
         @on_b_alias = on_b_alias
         @on_b_column_name = on_b_column_name
         @table_replacement_text = nil
+        @parameters = parameters
       end
 
       def to_s

data/lib/jungle_path/query/sql_string.rb

@@ -38,7 +38,7 @@ module JunglePath
 
       def self.generate_from(from, entity, aliases, tables, symbols)
         if from.length == 0
-          from << From.new(nil, entity.node.name, entity.alias_)
+          from << From.new(nil, entity.node.name, entity.alias_, nil, nil, nil, entity.parameters)
           aliases[entity.alias_.to_sym] = AliasInfo.new(entity.name, entity.alias_.to_sym, nil, tables[entity.node.name.to_sym].primary_key_columns.count)
         else
           if entity.left_join
@@ -46,7 +46,7 @@ module JunglePath
           else
             join_text = "join"
           end
-          from << From.new(join_text, entity.node.child_table_name, entity.alias_, entity.node.child_table_join_column_name, entity.parent.alias_, entity.node.parent_table_join_column_name)
+          from << From.new(join_text, entity.node.child_table_name, entity.alias_, entity.node.child_table_join_column_name, entity.parent.alias_, entity.node.parent_table_join_column_name, entity.parameters)
           aliases[entity.alias_.to_sym] = AliasInfo.new(entity.name, entity.alias_.to_sym, entity.find_parent_alias, tables[entity.node.child_table_name.to_sym].primary_key_columns.count)
             #puts "aliases: #{aliases}."
           if entity.fields.count > entity.fields_that_are_entities_count
@@ -134,6 +134,8 @@ module JunglePath
               table_replacement_text = nil
               if replacement_table.view
                 puts "has view"
+                #also run any pre query hook for view:
+                replacement_table.view.pre_query_hook(engine.identity, replacement_table, engine.db, from.parameters)
                 table_replacement_text = replacement_table.view.build_call(engine.identity, replacement_table)
               else
                 puts "no view"

data/lib/jungle_path/version.rb

@@ -1,3 +1,3 @@
 module JunglePath
-	VERSION = '0.0.32'
+	VERSION = '0.0.33'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jungle_path
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.33
 platform: ruby
 authors:
 - Michael VanZant
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-20 00:00:00.000000000 Z
+date: 2017-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler