vorax 0.1.2 → 0.1.3

data/Rakefile

@@ -18,7 +18,7 @@ end
 
 desc 'Builds and installs the gem'
 task :install => :build do
-  sh "gem install vorax-#{Vorax::VERSION}"
+  sh "gem install vorax-#{Vorax::VERSION} --no-rdoc --no-ri"
 end
 
 desc 'Tags version, pushes to remote, and pushes gem'

data/lib/vorax/parser/parser.rb

@@ -303,14 +303,38 @@ module Vorax
       if opts[:sqlplus_commands]
         walker.register_spot(Parser::SQLPLUS_TERMINATOR) do |scanner|
           type = Parser.statement_type(scanner.string[(start_pos..scanner.pos)])
-          if type && type == 'SQLPLUS' && (start_pos..scanner.pos).include?(position)
-            end_pos = scanner.pos - scanner.matched.length
-            scanner.terminate
+          if type
+          	if type == 'SQLPLUS'
+							if (start_pos..scanner.pos-1).include?(position)
+								end_pos = scanner.pos - scanner.matched.length
+								scanner.terminate
+							else
+								start_pos = scanner.pos
+							end
+						else
+							if opts[:plsql_blocks]
+								#this is a plsql block, eat till the slash terminator
+								if scanner.scan_until(Parser::SLASH_TERMINATOR)
+									if (start_pos..scanner.pos-1).include?(position)
+										end_pos = scanner.pos
+										scanner.terminate
+									else
+										start_pos = scanner.pos
+									end
+								else
+									#it's an invalid statement
+									scanner.terminate
+								end
+							end
+						end
+					#else
+            #start_pos = scanner.pos
           end
         end
       end
 
       walker.walk
+			end_pos = script_content.length if end_pos == 0 #partial statement
       {:statement => script_content[(start_pos...end_pos)], :range => (start_pos...end_pos)}
 
     end

data/lib/vorax/version.rb

@@ -2,6 +2,6 @@
 
 module Vorax
 
-  VERSION = '0.1.2' unless defined?(VERSION)
+  VERSION = '0.1.3' unless defined?(VERSION)
 
 end

data/spec/parser_spec.rb

@@ -294,6 +294,30 @@ STRING
     Parser.current_statement(text, 71, :sqlplus_commands => true, :plsql_blocks => false)[:statement].should eq("\nbegin\n  null;")
     Parser.current_statement(text, 71, :sqlplus_commands => true, :plsql_blocks => true)[:statement].should eq("\nbegin\n  null;\nend;\n/\n")
     Parser.current_statement(text, 88, :sqlplus_commands => true, :plsql_blocks => true)[:statement].should eq("select c2 from t1\n/\n")
+
+  	text = <<STRING
+select * from all_objects where rownum <= 1000;
+
+set serveroutput on
+begin
+	dbms_output.put_line('Hello Vorax!');
+end;
+/
+
+with
+  x as (select * 
+  	      from (select file_id, file_name from dba_data_files) t,
+  	           (select * from (select 'abc' col1, 'xyz' col2 from dual) x)
+  	   )
+select *
+  from x;
+STRING
+    Parser.current_statement(text, 90, :sqlplus_commands => true, :plsql_blocks => true).
+    	should eq({:statement=>"begin\n\tdbms_output.put_line('Hello Vorax!');\nend;\n/\n", :range=>69...121})
+
+  	text = "exec dbms_crypto.encrypt("
+  	Parser.current_statement(text, 10, :plslq_blocks => true, :sqlplus_commands => true).
+  		should eq({:statement=>"exec dbms_crypto.encrypt(", :range=>0...25})
   end# }}}
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vorax
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors: