jungle_path 0.0.33 → 0.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7a8ea6e5e533ddeed4046ae19001ce4a7b154c0
-  data.tar.gz: dd6b1b094a6349d5941142bf0035f7f49f94bd39
+  metadata.gz: dc6c3ad9b71be6cd071db13a1726cfa0b336e1c7
+  data.tar.gz: ad5741fe9a3777d634fff6716b7d421c27ddd7b7
 SHA512:
-  metadata.gz: 5132fe030e382f59d05204ccdb1a65900b8b139a6fe2f6c3159d197e84b13ddc3a0a43df4cec94b273cb9701e87d9709b4f70488e98c67aae7820b9d7f7bfd6e
-  data.tar.gz: c75b6f2b87ef3806bd17ddd92cdfb84580efa56bb0a6c5926e1e8641d9d9905caeb09d1160887fa6c80665889988a18ee449f93b88e65d8f666287be5c66e311
+  metadata.gz: 24970eb2794d323b8819a4a6ce4edfa08a91becb840fb455caf44d5f03ddc4f5ebcd849fb94b6f86e6ab58fdbee760e130ee43fe071c3bab46d79642c526935a
+  data.tar.gz: ca8b18f4e3ba3cec0b55ca3b5c5281de69e1b2f799653fbdbd1f93f241685172f04ee798e95ad3c880aca820b9d2aa85643c439ec4b1bfeafe47a6a4c7e77b13

data/lib/jungle_path/query/engine.rb

@@ -111,12 +111,14 @@ module JunglePath
             else
               raise "Expected token to be an entity name. Token: #{token}"
             end
-          elsif expect_offset and token.start_with? "["
+          elsif expect_offset and token == "[" #token.start_with? "["
             expect_offset = false
-            entity.offset = JunglePath::Query::Limit.parse(token) #same format as Limit.
-          elsif expect_limit and token.start_with? "["
+            #entity.offset = JunglePath::Query::Limit.parse(token) #same format as Limit.
+            entity.offset = process_limit(tokens) # same as limit
+          elsif expect_limit and token == "[" #token.start_with? "["
             expect_limit = false
-            entity.limit = JunglePath::Query::Limit.parse(token)
+            #entity.limit = JunglePath::Query::Limit.parse(token)
+            entity.limit = process_limit(tokens)
             expect_offset = true
           elsif expect_sort and token == "("
             if in_fields
@@ -134,7 +136,7 @@ module JunglePath
             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)
+            entity.parameters = process_parameters(tokens)
           elsif expect_fields and token == "("
             expect_fields = false
             entity.fields = process_fields(entity, tokens, aliases, values, root_entity)
@@ -152,7 +154,23 @@ module JunglePath
         entity
       end
 
-      def process_parameters(entity, tokens)
+      def process_limit(tokens)
+        limit = nil
+        limit_contents = []
+        token = next_token(tokens)
+        while token
+          if token == "]"
+            limit = JunglePath::Query::Limit.parse(limit_contents.join(' '))
+            break
+          else
+            limit_contents << token
+          end
+          token = next_token(tokens)
+        end
+        limit
+      end
+
+      def process_parameters(tokens)
         parameters = []
         token = next_token(tokens)
         while token
@@ -507,6 +525,7 @@ module JunglePath
         query.each_char do |c|
           i += 1
           next_char = query[i]
+          #puts "i: #{i}, c: #{c}, tokens: #{tokens}"
           if in_escape and c == "\\"
             in_escape = false
             token << "\\"
@@ -556,13 +575,13 @@ module JunglePath
               token = ""
             end
             in_single_line_comment = true
-          elsif in_bracket and c == "]"
-            in_bracket = false
-            token << c
-            tokens << token
-            token = ""
-          elsif in_bracket
-            token << c
+          #elsif in_bracket and c == "]"
+          #  in_bracket = false
+          #  token << c
+          #  tokens << token
+          #  token = ""
+          #elsif in_bracket
+          #	token << c
           elsif c == "\""
             if token.length > 0
               tokens << token
@@ -611,7 +630,15 @@ module JunglePath
               tokens << token
               token = ""
             end
-            token << c
+            #token << c
+            tokens << "["
+          elsif in_bracket and c == "]"
+            in_bracket = false
+            if token.length > 0
+              tokens << token
+              token = ""
+            end
+            tokens << "]"
           else
             token << c
           end

data/lib/jungle_path/query/sql_string.rb

@@ -135,7 +135,7 @@ module JunglePath
               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)
+                replacement_table.view.pre_query_hook(engine.identity, replacement_table, engine.db, frm.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.33'
+	VERSION = '0.0.34'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jungle_path
 version: !ruby/object:Gem::Version
-  version: 0.0.33
+  version: 0.0.34
 platform: ruby
 authors:
 - Michael VanZant