redata 1.1.5 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a976331f30dc7e730906d9693f75626828a484cd
-  data.tar.gz: a743b61b55f2b6f2aa9c43dc142bae7f131a41e7
+  metadata.gz: e6e1de52d263974cc4da4464f9a26dcebdcba333
+  data.tar.gz: a49643f43494b8aae5ebf9863e0b3d64680c8a09
 SHA512:
-  metadata.gz: f268047d184ded7f878df370944388469f6afa56a0ee2e44622b7875241e19d1fefae340c050b0c09e29ecc076320b46ac0fe8a66ec005be586641a149f9daf7
-  data.tar.gz: 4cebe76f7b08e4a675e7bcc43da1395fe99e638f36ce623bde075391b95552394a74e92c0723e8243cd4536695ce11c54598a4964130cd9b0e0f0cae144e83ae
+  metadata.gz: f02a0898b34172272c8a2920d805a23bfb8c572d3b1e1edd11b1821af6bdd8cc4c0fe946ec161b5ea834a61ebfacbf60935e5aa4842e1301b58b675ae8601ce2
+  data.tar.gz: 6eecdd93c35af246598885510459f8804669e59e96bb6d0dfafce4baedffbec98cc93079f6b60b185cb20f9405d63f70c4378ca5c9049559b40cbcd8e3042799

data/lib/redata/parser.rb

@@ -1,7 +1,8 @@
 module Redata
 	class Parser
 		COMMENT_REGEX = /-{2}.*/
-		LOAD_REGEX = /#load (.*)->(.*)/
+		LOAD_REGEX = /#load (.*)->([^,]*),?/
+		LOAD_PARAMS_REGEX = /,([^,>]*)>([^,>]*)/
 		IF_REGEX = /\[\s*if ([^\s]*) is ([^\]]*)\]/
 		IFNUL_REGEX = /\[\s*if ([^\s]*) is null\s*\]/
 		ENDIF_REGEX = /\[\s*endif\s*\]/
@@ -134,6 +135,13 @@ module Redata
 						name = res[1].gsub /[\s|:]+/, ''
 						Log.error! "QUERY ERROR: syntax error for load query: #{line}" if sub.empty? || name.empty?
 						
+						local_params = {}
+						line.scan(LOAD_PARAMS_REGEX).each do |res|
+							key = res[0].gsub(/\s/, '').to_sym
+							val = res[1].gsub /\s/, ''
+							local_params[key] = RED.locals[key]
+							RED.locals[key] = val
+						end
 						sub_file = in_file.parent.join "_#{sub}.red.sql"
 						sub_file = RED.root.join 'red_query', 'shared', "_#{sub}.rea.sql" unless sub_file.exist?
 						sub_temp_tables = self.parse sub_file, out_file.dirname.join("#{name}.resql")
@@ -141,7 +149,11 @@ module Redata
 							temp_tables.push n unless temp_tables.include? n
 						end
 						temp_tables.push name unless temp_tables.include? name
-						next  # load query line can not contain other content
+						local_params.each do |key, val|
+							RED.locals[key] = val
+						end
+						local_params = {}
+						next  # load query line, can not contain other content
 					end
 
 					# parse [start_time] syntax

data/lib/redata/version.rb

@@ -1,3 +1,3 @@
 module Redata
-  VERSION = "1.1.5"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redata
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0
 platform: ruby
 authors:
 - goshan