twowaysql 0.3.0 → 0.4.0

data/History.txt

@@ -1,3 +1,9 @@
+== release_0_4 / 2008-09-29
+* line number support on parse error
+* integrate coverage report into website
+* integrate ditz to 'push-button release'
+* Change ambiguous class name TwoWaySQL::Result to TwoWaySQL::MergeResult
+
 == release_0_3 / 2008-09-10
 * better whitespace handling
 * Whitespace compaction mode

data/Manifest.skip

@@ -0,0 +1,7 @@
+^pkg
+^doc
+^coverage
+^script
+^website
+^\.git
+.*\.output

data/Manifest.txt

@@ -1,5 +1,6 @@
 History.txt
 License.txt
+Manifest.skip
 Manifest.txt
 README.txt
 Rakefile
@@ -10,6 +11,7 @@ issues/issue-1cee7e821865a216674832b0186bd92792680571.yaml
 issues/issue-25efcfc383f3b0f6c0e2730ae7c2975bb2b3de26.yaml
 issues/issue-279105dd0d9f03514d318f5eab5e99c4c2d47fda.yaml
 issues/issue-28cde89ed3eb306957edc90595b1d16bf43daf42.yaml
+issues/issue-2a172da16d3a59adc8448f2e36ec48b36951e02d.yaml
 issues/issue-39023ea09e17e2d64bcef03aa59cdfe38b78ad5b.yaml
 issues/issue-4bc308d55ae91f266e656162a4147d356de1166c.yaml
 issues/issue-5c973ef5bb074eacca0c6c84f7d27c4267773ea8.yaml
@@ -17,6 +19,7 @@ issues/issue-664986b219202ff1948cab717b56e7540f493561.yaml
 issues/issue-6daccddf089d11d42bf016897da98f70cf5ab46c.yaml
 issues/issue-897995fa10377eabdf597e8e7692f17087c76923.yaml
 issues/issue-901f65630639507c8b05b466790e9f22256c6450.yaml
+issues/issue-a185b4247f64c1104bc49ebf823b57b5de3d06f8.yaml
 issues/issue-bd38c1cdc965d73dd629a81db2de1bcdcf4b10b8.yaml
 issues/issue-dca4b19aa13de59838b33e03252bf824670a2d12.yaml
 issues/issue-f1bd40de5458397d9b142ea3e197e5264e0dcdbf.yaml
@@ -30,10 +33,6 @@ lib/twowaysql/parser.rb
 lib/twowaysql/parser.y
 lib/twowaysql/template.rb
 lib/twowaysql/version.rb
-script/console
-script/destroy
-script/generate
-script/txt2html
 setup.rb
 spec/large_sql_spec.rb
 spec/learning_regex_spec.rb
@@ -44,5 +43,6 @@ tasks/deployment.rake
 tasks/ditz.rake
 tasks/environment.rake
 tasks/racc.rake
+tasks/rcov.rake
 tasks/rspec.rake
 tasks/website.rake

data/README.txt

@@ -375,10 +375,10 @@ Default is true. When true, parser preserves original whitespaces. When false, p
   EOS
     template = TwoWaySQL::Template.parse(sql, :preserve_space => false)
     
-    result = template.merge(:job => 'MANAGER', :deptno => 30)
+    merged = template.merge(:job => 'MANAGER', :deptno => 30)
     
-    result.sql                 #=> "SELECT * FROM emp WHERE job = ? AND deptno = ? "
-    result.bound_variables     #=> ["MANAGER", 30]
+    merged.sql                 #=> "SELECT * FROM emp WHERE job = ? AND deptno = ? "
+    merged.bound_variables     #=> ["MANAGER", 30]
 
 
 ==== :preserve_comment (default is false)
@@ -400,7 +400,7 @@ Default is false. When true, parser preserves original actual comments. When fal
   EOS
     template = TwoWaySQL::Template.parse(sql, :preserve_comment => true)
     
-    result = template.merge(:job => 'MANAGER', :deptno => 30)
+    merged = template.merge(:job => 'MANAGER', :deptno => 30)
     
     expected = <<-EOS
   SELECT
@@ -415,8 +415,8 @@ Default is false. When true, parser preserves original actual comments. When fal
     job    =   ?
     AND   deptno   =   ?
   EOS
-    result.sql == expected     #=> true
-    result.bound_variables     #=> ["MANAGER", 30]
+    merged.sql == expected     #=> true
+    merged.bound_variables     #=> ["MANAGER", 30]
 
 
 

data/issues/issue-2a172da16d3a59adc8448f2e36ec48b36951e02d.yaml

@@ -0,0 +1,30 @@
+--- !ditz.rubyforge.org,2008-03-06/issue 
+title: integrate coverage report into website
+desc: integrate rcov coverage report into website
+type: :task
+component: twowaysql
+release: release_0_4
+reporter: takuto <takuto.wada@gmail.com>
+status: :closed
+disposition: :fixed
+creation_time: 2008-09-29 09:44:41.700346 Z
+references: []
+
+id: 2a172da16d3a59adc8448f2e36ec48b36951e02d
+log_events: 
+- - 2008-09-29 09:44:42.828987 Z
+  - takuto <takuto.wada@gmail.com>
+  - created
+  - ""
+- - 2008-09-29 17:34:57.206684 Z
+  - takuto <takuto.wada@gmail.com>
+  - changed status from unstarted to in_progress
+  - ""
+- - 2008-09-29 17:40:10.806903 Z
+  - takuto <takuto.wada@gmail.com>
+  - assigned to release release_0_4 from unassigned
+  - ""
+- - 2008-09-29 17:40:53.649456 Z
+  - takuto <takuto.wada@gmail.com>
+  - closed with disposition fixed
+  - ""

data/issues/issue-664986b219202ff1948cab717b56e7540f493561.yaml

@@ -5,8 +5,8 @@ type: :feature
 component: twowaysql
 release: release_0_4
 reporter: takuto <takuto.wada@gmail.com>
-status: :unstarted
-disposition: 
+status: :closed
+disposition: :fixed
 creation_time: 2008-09-06 07:38:16.872853 Z
 references: []
 
@@ -24,3 +24,11 @@ log_events:
   - takuto <takuto.wada@gmail.com>
   - assigned to release release_0_4 from release_0_3
   - ""
+- - 2008-09-29 10:12:48.697610 Z
+  - takuto <takuto.wada@gmail.com>
+  - changed status from unstarted to in_progress
+  - ""
+- - 2008-09-29 16:07:05.605087 Z
+  - takuto <takuto.wada@gmail.com>
+  - closed with disposition fixed
+  - simple implementation. now scanner passes token position with token itself.

data/issues/issue-6daccddf089d11d42bf016897da98f70cf5ab46c.yaml

@@ -3,10 +3,10 @@ title: integrate ditz to 'push-button release'
 desc: integrate 'ditz release' and 'ditz changelog' into rake task
 type: :task
 component: twowaysql
-release: 
+release: release_0_4
 reporter: takuto <takuto.wada@gmail.com>
-status: :unstarted
-disposition: 
+status: :closed
+disposition: :fixed
 creation_time: 2008-09-07 17:34:42.830046 Z
 references: []
 
@@ -16,3 +16,15 @@ log_events:
   - takuto <takuto.wada@gmail.com>
   - created
   - ""
+- - 2008-09-29 18:11:54.103095 Z
+  - takuto <takuto.wada@gmail.com>
+  - assigned to release release_0_4 from unassigned
+  - ""
+- - 2008-09-29 18:13:04.946986 Z
+  - takuto <takuto.wada@gmail.com>
+  - changed status from unstarted to in_progress
+  - ""
+- - 2008-09-29 18:20:38.750419 Z
+  - takuto <takuto.wada@gmail.com>
+  - closed with disposition fixed
+  - ""

data/issues/issue-a185b4247f64c1104bc49ebf823b57b5de3d06f8.yaml

@@ -0,0 +1,26 @@
+--- !ditz.rubyforge.org,2008-03-06/issue 
+title: Change ambiguous class name TwoWaySQL::Result to TwoWaySQL::MergeResult
+desc: it is merge result, not a result of db execution.
+type: :task
+component: twowaysql
+release: release_0_4
+reporter: takuto <takuto.wada@gmail.com>
+status: :closed
+disposition: :fixed
+creation_time: 2008-09-19 18:14:34.843930 Z
+references: []
+
+id: a185b4247f64c1104bc49ebf823b57b5de3d06f8
+log_events: 
+- - 2008-09-19 18:14:36.258181 Z
+  - takuto <takuto.wada@gmail.com>
+  - created
+  - ""
+- - 2008-09-19 18:16:09.295390 Z
+  - takuto <takuto.wada@gmail.com>
+  - changed status from unstarted to in_progress
+  - ""
+- - 2008-09-19 18:17:35.545561 Z
+  - takuto <takuto.wada@gmail.com>
+  - closed with disposition fixed
+  - ""

data/issues/project.yaml

@@ -46,10 +46,14 @@ releases:
     - 0.2.1 release
 - !ditz.rubyforge.org,2008-03-06/release 
   name: release_0_4
-  status: :unreleased
-  release_time: 
+  status: :released
+  release_time: 2008-09-29 18:30:36.862798 Z
   log_events: 
   - - 2008-09-10 06:27:14.808896 Z
     - takuto <takuto.wada@gmail.com>
     - created
     - ""
+  - - 2008-09-29 18:30:36.862808 Z
+    - takuto <takuto.wada@gmail.com>
+    - released
+    - ""

data/lib/twowaysql/parser.rb

@@ -11,7 +11,7 @@ module TwoWaySQL
 
   class Parser < Racc::Parser
 
-module_eval <<'..end lib/twowaysql/parser.y modeval..idd0cee34b5c', 'lib/twowaysql/parser.y', 134
+module_eval <<'..end lib/twowaysql/parser.y modeval..id30c07c2d1a', 'lib/twowaysql/parser.y', 134
 
 require 'strscan'
 
@@ -57,64 +57,91 @@ OR_PATTERN              = /\A(\ *OR)\b/i
 def parse( io )
   @q = []
   io.each_line(nil) do |whole|
-    s = StringScanner.new(whole)
-    until s.eos? do
-      case
-      when s.scan(AND_PATTERN)
-        @q.push [ :AND, s[1] ]
-      when s.scan(OR_PATTERN)
-        @q.push [ :OR, s[1] ]
-      when s.scan(SPACES_PATTERN)
-        @q.push [ :SPACES, s[1] ]
-      when s.scan(QUESTION_PATTERN)
-        @q.push [ :QUESTION, nil ]
-      when s.scan(COMMA_PATTERN)
-        @q.push [ :COMMA, ',' ]
-      when s.scan(LPAREN_PATTERN)
-        @q.push [ :LPAREN, '(' ]
-      when s.scan(RPAREN_PATTERN)
-        @q.push [ :RPAREN, ')' ]
-      when s.scan(ELSE_PATTERN)
-        @q.push [ :ELSE, nil ]
-      when s.scan(ACTUAL_COMMENT_PATTERN)
-        @q.push [ :ACTUAL_COMMENT, [s[1], s[2]] ] if @preserve_comment
-      when s.scan(BEGIN_END_PATTERN)
-        @q.push [ s[2].intern, nil ]
-      when s.scan(CONDITIONAL_PATTERN)
-        @q.push [ s[2].intern, s[3] ]
-      when s.scan(EMBED_VARIABLE_PATTERN)
-        @q.push [ :EMBED_VARIABLE, s[2] ]
-      when s.scan(PAREN_BIND_VARIABLE_PATTERN)
-        @q.push [ :PAREN_BIND_VARIABLE, s[2] ]
-      when s.scan(BIND_VARIABLE_PATTERN)
-        @q.push [ :BIND_VARIABLE, s[2] ]
-      when s.scan(STRING_LITERAL_PATTERN)
-        @q.push [ :STRING_LITERAL, s[1] ]
-      when s.scan(SPLIT_TOKEN_PATTERN)
-        @q.push [ :IDENT, s[1] ]
-      when s.scan(UNMATCHED_COMMENT_START_PATTERN)   ## unmatched comment start, '/*','#*'
-        raise Racc::ParseError, "## unmatched comment. cannot parse [#{s.rest}]"
-      when s.scan(LITERAL_PATTERN)   ## other string token
-        @q.push [ :IDENT, s[1] ]
-      when s.scan(SEMICOLON_AT_INPUT_END_PATTERN)
-        #drop semicolon at input end
-      else
-        raise Racc::ParseError, "## cannot parse [#{s.rest}]"
-      end
-    end
-      
+    @s = StringScanner.new(whole)
   end
-    
-  @q.push [ false, nil ]
+  scan_str
+
+  # @q.push [ false, nil ]
+  @q.push [ false, [@s.pos, nil] ]
     
   ## cal racc's private parse method
   do_parse
 end
 
+## called by racc
 def next_token
   @q.shift
 end
-..end lib/twowaysql/parser.y modeval..idd0cee34b5c
+
+
+def scan_str
+  until @s.eos? do
+    case
+    when @s.scan(AND_PATTERN)
+      @q.push [ :AND, [@s.pos, @s[1]] ]
+    when @s.scan(OR_PATTERN)
+      @q.push [ :OR, [@s.pos, @s[1]] ]
+    when @s.scan(SPACES_PATTERN)
+      @q.push [ :SPACES, [@s.pos, @s[1]] ]
+    when @s.scan(QUESTION_PATTERN)
+      @q.push [ :QUESTION, [@s.pos, nil] ]
+    when @s.scan(COMMA_PATTERN)
+      @q.push [ :COMMA, [@s.pos, ','] ]
+    when @s.scan(LPAREN_PATTERN)
+      @q.push [ :LPAREN, [@s.pos, '('] ]
+    when @s.scan(RPAREN_PATTERN)
+      @q.push [ :RPAREN, [@s.pos, ')'] ]
+    when @s.scan(ELSE_PATTERN)
+      @q.push [ :ELSE, [@s.pos, nil] ]
+    when @s.scan(ACTUAL_COMMENT_PATTERN)
+      @q.push [ :ACTUAL_COMMENT, [@s.pos, @s[1], @s[2]] ] if @preserve_comment
+    when @s.scan(BEGIN_END_PATTERN)
+      @q.push [ @s[2].intern, [@s.pos, nil] ]
+    when @s.scan(CONDITIONAL_PATTERN)
+      @q.push [ @s[2].intern, [@s.pos, @s[3]] ]
+    when @s.scan(EMBED_VARIABLE_PATTERN)
+      @q.push [ :EMBED_VARIABLE, [@s.pos, @s[2]] ]
+    when @s.scan(PAREN_BIND_VARIABLE_PATTERN)
+      @q.push [ :PAREN_BIND_VARIABLE, [@s.pos, @s[2]] ]
+    when @s.scan(BIND_VARIABLE_PATTERN)
+      @q.push [ :BIND_VARIABLE, [@s.pos, @s[2]] ]
+    when @s.scan(STRING_LITERAL_PATTERN)
+      @q.push [ :STRING_LITERAL, [@s.pos, @s[1]] ]
+    when @s.scan(SPLIT_TOKEN_PATTERN)
+      @q.push [ :IDENT, [@s.pos, @s[1]] ]
+    when @s.scan(UNMATCHED_COMMENT_START_PATTERN)   ## unmatched comment start, '/*','#*'
+      raise Racc::ParseError, "unmatched comment. line:[#{line_no(@s.pos)}], str:[#{@s.rest}]"
+    when @s.scan(LITERAL_PATTERN)   ## other string token
+      @q.push [ :IDENT, [@s.pos, @s[1]] ]
+    when @s.scan(SEMICOLON_AT_INPUT_END_PATTERN)
+      #drop semicolon at input end
+    else
+      raise Racc::ParseError, "syntax error near line:[#{line_no(@s.pos)}], str:[#{@s.rest}]"
+    end
+  end
+end
+
+
+def on_error(t, v, vstack)
+  ## cursor in value-stack is an array of two items,
+  ## that have position value as 0th item. like [731, "ctx[:limit] "]
+  cursor = vstack.find do |tokens|
+    tokens.size == 2 and tokens[0].kind_of?(Fixnum)
+  end
+  pos = cursor[0]
+  line = line_no(pos)
+  rest = @s.string[pos .. -1]
+  raise Racc::ParseError, "syntax error near line:[#{line}], str:[#{rest}]"
+end
+
+
+def line_no(pos)
+  lines = 0
+  scanned = @s.string[0..(pos)]
+  scanned.each_line { lines += 1 }
+  lines
+end
+..end lib/twowaysql/parser.y modeval..id30c07c2d1a
 
 ##### racc 1.4.5 generates ###
 
@@ -334,7 +361,7 @@ module_eval <<'.,.,', 'lib/twowaysql/parser.y', 26
 
 module_eval <<'.,.,', 'lib/twowaysql/parser.y', 31
   def _reduce_8( val, _values, result )
-                  result = IfNode.new( val[0], val[1], val[2] )
+                  result = IfNode.new( val[0][1], val[1], val[2] )
    result
   end
 .,.,
@@ -361,70 +388,70 @@ module_eval <<'.,.,', 'lib/twowaysql/parser.y', 40
 
 module_eval <<'.,.,', 'lib/twowaysql/parser.y', 49
   def _reduce_14( val, _values, result )
-                  result = SubStatementNode.new( val[0], val[1] )
+                  result = SubStatementNode.new( val[0][1], val[1] )
    result
   end
 .,.,
 
 module_eval <<'.,.,', 'lib/twowaysql/parser.y', 54
   def _reduce_15( val, _values, result )
-                  result = SubStatementNode.new( val[0], val[1] )
+                  result = SubStatementNode.new( val[0][1], val[1] )
    result
   end
 .,.,
 
 module_eval <<'.,.,', 'lib/twowaysql/parser.y', 59
   def _reduce_16( val, _values, result )
-                  result = LiteralNode.new( val[0] )
+                  result = LiteralNode.new( val[0][1] )
    result
   end
 .,.,
 
 module_eval <<'.,.,', 'lib/twowaysql/parser.y', 63
   def _reduce_17( val, _values, result )
-                  result = LiteralNode.new( val[0] )
+                  result = LiteralNode.new( val[0][1] )
    result
   end
 .,.,
 
 module_eval <<'.,.,', 'lib/twowaysql/parser.y', 67
   def _reduce_18( val, _values, result )
-                  result = LiteralNode.new( val[0] )
+                  result = LiteralNode.new( val[0][1] )
    result
   end
 .,.,
 
 module_eval <<'.,.,', 'lib/twowaysql/parser.y', 71
   def _reduce_19( val, _values, result )
-                  result = LiteralNode.new( val[0] )
+                  result = LiteralNode.new( val[0][1] )
    result
   end
 .,.,
 
 module_eval <<'.,.,', 'lib/twowaysql/parser.y', 75
   def _reduce_20( val, _values, result )
-                  result = WhiteSpaceNode.new( val[0], @preserve_space )
+                  result = WhiteSpaceNode.new( val[0][1], @preserve_space )
    result
   end
 .,.,
 
 module_eval <<'.,.,', 'lib/twowaysql/parser.y', 79
   def _reduce_21( val, _values, result )
-                  result = LiteralNode.new( val[0] )
+                  result = LiteralNode.new( val[0][1] )
    result
   end
 .,.,
 
 module_eval <<'.,.,', 'lib/twowaysql/parser.y', 83
   def _reduce_22( val, _values, result )
-                  result = LiteralNode.new( val[0] )
+                  result = LiteralNode.new( val[0][1] )
    result
   end
 .,.,
 
 module_eval <<'.,.,', 'lib/twowaysql/parser.y', 87
   def _reduce_23( val, _values, result )
-                  result = LiteralNode.new( val[0] )
+                  result = LiteralNode.new( val[0][1] )
    result
   end
 .,.,
@@ -439,7 +466,7 @@ module_eval <<'.,.,', 'lib/twowaysql/parser.y', 92
 
 module_eval <<'.,.,', 'lib/twowaysql/parser.y', 96
   def _reduce_25( val, _values, result )
-                  result = ActualCommentNode.new( val[0][0] , val[0][1] )
+                  result = ActualCommentNode.new( val[0][1] , val[0][2] )
    result
   end
 .,.,
@@ -450,49 +477,49 @@ module_eval <<'.,.,', 'lib/twowaysql/parser.y', 96
 
 module_eval <<'.,.,', 'lib/twowaysql/parser.y', 103
   def _reduce_28( val, _values, result )
-                  result = BindVariableNode.new( val[0] )
+                  result = BindVariableNode.new( val[0][1] )
    result
   end
 .,.,
 
 module_eval <<'.,.,', 'lib/twowaysql/parser.y', 107
   def _reduce_29( val, _values, result )
-                  result = BindVariableNode.new( val[0] )
+                  result = BindVariableNode.new( val[0][1] )
    result
   end
 .,.,
 
 module_eval <<'.,.,', 'lib/twowaysql/parser.y', 111
   def _reduce_30( val, _values, result )
-                  result = BindVariableNode.new( val[0] )
+                  result = BindVariableNode.new( val[0][1] )
    result
   end
 .,.,
 
 module_eval <<'.,.,', 'lib/twowaysql/parser.y', 115
   def _reduce_31( val, _values, result )
-                  result = BindVariableNode.new( val[0] )
+                  result = BindVariableNode.new( val[0][1] )
    result
   end
 .,.,
 
 module_eval <<'.,.,', 'lib/twowaysql/parser.y', 119
   def _reduce_32( val, _values, result )
-                  result = ParenBindVariableNode.new( val[0] )
+                  result = ParenBindVariableNode.new( val[0][1] )
    result
   end
 .,.,
 
 module_eval <<'.,.,', 'lib/twowaysql/parser.y', 124
   def _reduce_33( val, _values, result )
-                  result = EmbedVariableNode.new( val[0] )
+                  result = EmbedVariableNode.new( val[0][1] )
    result
   end
 .,.,
 
 module_eval <<'.,.,', 'lib/twowaysql/parser.y', 128
   def _reduce_34( val, _values, result )
-                  result = EmbedVariableNode.new( val[0] )
+                  result = EmbedVariableNode.new( val[0][1] )
    result
   end
 .,.,

data/lib/twowaysql/parser.y

@@ -27,7 +27,7 @@ begin_stmt     : BEGIN stmt_list END
 
 if_stmt        : IF sub_stmt else_stmt END
                 {
-                  result = IfNode.new( val[0], val[1], val[2] )
+                  result = IfNode.new( val[0][1], val[1], val[2] )
                 }
 
 else_stmt      : ELSE sub_stmt
@@ -45,45 +45,45 @@ sub_stmt       : and_stmt
 
 and_stmt       : AND stmt_list
                 {
-                  result = SubStatementNode.new( val[0], val[1] )
+                  result = SubStatementNode.new( val[0][1], val[1] )
                 }
 
 or_stmt        : OR stmt_list
                 {
-                  result = SubStatementNode.new( val[0], val[1] )
+                  result = SubStatementNode.new( val[0][1], val[1] )
                 }
 
 primary        : IDENT
                 {
-                  result = LiteralNode.new( val[0] )
+                  result = LiteralNode.new( val[0][1] )
                 }
                | STRING_LITERAL
                 {
-                  result = LiteralNode.new( val[0] )
+                  result = LiteralNode.new( val[0][1] )
                 }
                | AND
                 {
-                  result = LiteralNode.new( val[0] )
+                  result = LiteralNode.new( val[0][1] )
                 }
                | OR
                 {
-                  result = LiteralNode.new( val[0] )
+                  result = LiteralNode.new( val[0][1] )
                 }
                | SPACES
                 {
-                  result = WhiteSpaceNode.new( val[0], @preserve_space )
+                  result = WhiteSpaceNode.new( val[0][1], @preserve_space )
                 }
                | COMMA
                 {
-                  result = LiteralNode.new( val[0] )
+                  result = LiteralNode.new( val[0][1] )
                 }
                | LPAREN
                 {
-                  result = LiteralNode.new( val[0] )
+                  result = LiteralNode.new( val[0][1] )
                 }
                | RPAREN
                 {
-                  result = LiteralNode.new( val[0] )
+                  result = LiteralNode.new( val[0][1] )
                 }
                | QUESTION
                 {
@@ -92,39 +92,39 @@ primary        : IDENT
                 }
                | ACTUAL_COMMENT
                 {
-                  result = ActualCommentNode.new( val[0][0] , val[0][1] )
+                  result = ActualCommentNode.new( val[0][1] , val[0][2] )
                 }
                | bind_var
                | embed_var
 
 bind_var       : BIND_VARIABLE STRING_LITERAL
                 {
-                  result = BindVariableNode.new( val[0] )
+                  result = BindVariableNode.new( val[0][1] )
                 }
                | BIND_VARIABLE SPACES STRING_LITERAL
                 {
-                  result = BindVariableNode.new( val[0] )
+                  result = BindVariableNode.new( val[0][1] )
                 }
                | BIND_VARIABLE IDENT
                 {
-                  result = BindVariableNode.new( val[0] )
+                  result = BindVariableNode.new( val[0][1] )
                 }
                | BIND_VARIABLE SPACES IDENT
                 {
-                  result = BindVariableNode.new( val[0] )
+                  result = BindVariableNode.new( val[0][1] )
                 }
                | PAREN_BIND_VARIABLE
                 {
-                  result = ParenBindVariableNode.new( val[0] )
+                  result = ParenBindVariableNode.new( val[0][1] )
                 }
 
 embed_var      : EMBED_VARIABLE IDENT
                 {
-                  result = EmbedVariableNode.new( val[0] )
+                  result = EmbedVariableNode.new( val[0][1] )
                 }
                | EMBED_VARIABLE SPACES IDENT
                 {
-                  result = EmbedVariableNode.new( val[0] )
+                  result = EmbedVariableNode.new( val[0][1] )
                 }
 
 end
@@ -176,60 +176,87 @@ OR_PATTERN              = /\A(\ *OR)\b/i
 def parse( io )
   @q = []
   io.each_line(nil) do |whole|
-    s = StringScanner.new(whole)
-    until s.eos? do
-      case
-      when s.scan(AND_PATTERN)
-        @q.push [ :AND, s[1] ]
-      when s.scan(OR_PATTERN)
-        @q.push [ :OR, s[1] ]
-      when s.scan(SPACES_PATTERN)
-        @q.push [ :SPACES, s[1] ]
-      when s.scan(QUESTION_PATTERN)
-        @q.push [ :QUESTION, nil ]
-      when s.scan(COMMA_PATTERN)
-        @q.push [ :COMMA, ',' ]
-      when s.scan(LPAREN_PATTERN)
-        @q.push [ :LPAREN, '(' ]
-      when s.scan(RPAREN_PATTERN)
-        @q.push [ :RPAREN, ')' ]
-      when s.scan(ELSE_PATTERN)
-        @q.push [ :ELSE, nil ]
-      when s.scan(ACTUAL_COMMENT_PATTERN)
-        @q.push [ :ACTUAL_COMMENT, [s[1], s[2]] ] if @preserve_comment
-      when s.scan(BEGIN_END_PATTERN)
-        @q.push [ s[2].intern, nil ]
-      when s.scan(CONDITIONAL_PATTERN)
-        @q.push [ s[2].intern, s[3] ]
-      when s.scan(EMBED_VARIABLE_PATTERN)
-        @q.push [ :EMBED_VARIABLE, s[2] ]
-      when s.scan(PAREN_BIND_VARIABLE_PATTERN)
-        @q.push [ :PAREN_BIND_VARIABLE, s[2] ]
-      when s.scan(BIND_VARIABLE_PATTERN)
-        @q.push [ :BIND_VARIABLE, s[2] ]
-      when s.scan(STRING_LITERAL_PATTERN)
-        @q.push [ :STRING_LITERAL, s[1] ]
-      when s.scan(SPLIT_TOKEN_PATTERN)
-        @q.push [ :IDENT, s[1] ]
-      when s.scan(UNMATCHED_COMMENT_START_PATTERN)   ## unmatched comment start, '/*','#*'
-        raise Racc::ParseError, "## unmatched comment. cannot parse [#{s.rest}]"
-      when s.scan(LITERAL_PATTERN)   ## other string token
-        @q.push [ :IDENT, s[1] ]
-      when s.scan(SEMICOLON_AT_INPUT_END_PATTERN)
-        #drop semicolon at input end
-      else
-        raise Racc::ParseError, "## cannot parse [#{s.rest}]"
-      end
-    end
-      
+    @s = StringScanner.new(whole)
   end
-    
-  @q.push [ false, nil ]
+  scan_str
+
+  # @q.push [ false, nil ]
+  @q.push [ false, [@s.pos, nil] ]
     
   ## cal racc's private parse method
   do_parse
 end
 
+## called by racc
 def next_token
   @q.shift
 end
+
+
+def scan_str
+  until @s.eos? do
+    case
+    when @s.scan(AND_PATTERN)
+      @q.push [ :AND, [@s.pos, @s[1]] ]
+    when @s.scan(OR_PATTERN)
+      @q.push [ :OR, [@s.pos, @s[1]] ]
+    when @s.scan(SPACES_PATTERN)
+      @q.push [ :SPACES, [@s.pos, @s[1]] ]
+    when @s.scan(QUESTION_PATTERN)
+      @q.push [ :QUESTION, [@s.pos, nil] ]
+    when @s.scan(COMMA_PATTERN)
+      @q.push [ :COMMA, [@s.pos, ','] ]
+    when @s.scan(LPAREN_PATTERN)
+      @q.push [ :LPAREN, [@s.pos, '('] ]
+    when @s.scan(RPAREN_PATTERN)
+      @q.push [ :RPAREN, [@s.pos, ')'] ]
+    when @s.scan(ELSE_PATTERN)
+      @q.push [ :ELSE, [@s.pos, nil] ]
+    when @s.scan(ACTUAL_COMMENT_PATTERN)
+      @q.push [ :ACTUAL_COMMENT, [@s.pos, @s[1], @s[2]] ] if @preserve_comment
+    when @s.scan(BEGIN_END_PATTERN)
+      @q.push [ @s[2].intern, [@s.pos, nil] ]
+    when @s.scan(CONDITIONAL_PATTERN)
+      @q.push [ @s[2].intern, [@s.pos, @s[3]] ]
+    when @s.scan(EMBED_VARIABLE_PATTERN)
+      @q.push [ :EMBED_VARIABLE, [@s.pos, @s[2]] ]
+    when @s.scan(PAREN_BIND_VARIABLE_PATTERN)
+      @q.push [ :PAREN_BIND_VARIABLE, [@s.pos, @s[2]] ]
+    when @s.scan(BIND_VARIABLE_PATTERN)
+      @q.push [ :BIND_VARIABLE, [@s.pos, @s[2]] ]
+    when @s.scan(STRING_LITERAL_PATTERN)
+      @q.push [ :STRING_LITERAL, [@s.pos, @s[1]] ]
+    when @s.scan(SPLIT_TOKEN_PATTERN)
+      @q.push [ :IDENT, [@s.pos, @s[1]] ]
+    when @s.scan(UNMATCHED_COMMENT_START_PATTERN)   ## unmatched comment start, '/*','#*'
+      raise Racc::ParseError, "unmatched comment. line:[#{line_no(@s.pos)}], str:[#{@s.rest}]"
+    when @s.scan(LITERAL_PATTERN)   ## other string token
+      @q.push [ :IDENT, [@s.pos, @s[1]] ]
+    when @s.scan(SEMICOLON_AT_INPUT_END_PATTERN)
+      #drop semicolon at input end
+    else
+      raise Racc::ParseError, "syntax error near line:[#{line_no(@s.pos)}], str:[#{@s.rest}]"
+    end
+  end
+end
+
+
+def on_error(t, v, vstack)
+  ## cursor in value-stack is an array of two items,
+  ## that have position value as 0th item. like [731, "ctx[:limit] "]
+  cursor = vstack.find do |tokens|
+    tokens.size == 2 and tokens[0].kind_of?(Fixnum)
+  end
+  pos = cursor[0]
+  line = line_no(pos)
+  rest = @s.string[pos .. -1]
+  raise Racc::ParseError, "syntax error near line:[#{line}], str:[#{rest}]"
+end
+
+
+def line_no(pos)
+  lines = 0
+  scanned = @s.string[0..(pos)]
+  scanned.each_line { lines += 1 }
+  lines
+end

data/lib/twowaysql/template.rb

@@ -44,12 +44,12 @@ module TwoWaySQL
     #
     # === Return
     #
-    # TwoWaySQL::Result object that represents merge result
+    # TwoWaySQL::MergeResult object that represents merge result
     #
     def merge(data)
       c = Context.new(data)
       @root.accept(c)
-      Result.new(c)
+      MergeResult.new(c)
     end
     alias mungle merge
 
@@ -60,7 +60,7 @@ module TwoWaySQL
   end
 
 
-  # TwoWaySQL::Result represents merge result of template and data.
+  # TwoWaySQL::MergeResult represents merge result of template and data.
   # it contains SQL string with placeholders, and bound variables associated with placeholders.
   #
   # === Usage
@@ -69,7 +69,7 @@ module TwoWaySQL
   #   merged.sql                #=> "SELECT * FROM emp WHERE job = ? AND deptno = ?"
   #   merged.bound_variables    #=> ["HOGE", 30]
   #
-  class Result
+  class MergeResult
     def initialize(context)
       @context = context
     end
@@ -84,9 +84,10 @@ module TwoWaySQL
     end
 
     # return array of variables which indices are corresponding to placeholders.
+    # alias 'vars' is available for short-hand.
     #
     # === Return
-    # merge result SQL with placeholders
+    # array of bound variables
     #
     def bound_variables
       @context.bound_variables

data/lib/twowaysql/version.rb

@@ -1,7 +1,7 @@
 module TwoWaySQL
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 3
+    MINOR = 4
     TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')

data/spec/large_sql_spec.rb

@@ -236,4 +236,94 @@ EOS
     end
   end
 
+
+
+
+  describe "guess line number on multi-line SQL syntax error" do
+
+    it "non-nested unmatched IF-END" do
+      sql = <<-EOS
+SELECT
+  i.id AS item_id
+  ,d.display_name AS display_name
+
+FROM
+  some_schema.item i
+  INNER JOIN some_schema.item_detail d
+    ON i.id = d.item_id
+
+/*IF ctx[:order_by] */ ORDER BY /*$ctx[:order_by]*/i.id /*$ctx[:order]*/ASC   /* no END comment */
+/*IF ctx[:limit] */ LIMIT /*ctx[:limit]*/10/*END*/
+/*IF ctx[:offset] */ OFFSET /*ctx[:offset]*/0/*END*/
+EOS
+      begin
+        TwoWaySQL::Template.parse(sql)
+      rescue Racc::ParseError => e
+        e.to_s.should match(/line:\[10\]/)
+      end
+    end
+
+
+    it "no-END on input end" do
+      sql = <<-EOS
+SELECT
+  i.id AS item_id
+  ,d.display_name AS display_name
+
+FROM
+  some_schema.item i
+  INNER JOIN some_schema.item_detail d
+    ON i.id = d.item_id
+
+/*IF ctx[:order_by] */ ORDER BY /*$ctx[:order_by]*/i.id /*$ctx[:order]*/ASC/*END*/
+/*IF ctx[:limit] */ LIMIT /*ctx[:limit]*/10/*END*/
+/*IF ctx[:offset] */ OFFSET /*ctx[:offset]*/0
+EOS
+      begin
+        TwoWaySQL::Template.parse(sql)
+      rescue Racc::ParseError => e
+        e.to_s.should match(/line:\[12\]/)
+        e.to_s.should match(/OFFSET \/\*ctx\[:offset\]\*\/0/)
+        
+      end
+    end
+
+
+    it "unmatched BEGIN-END" do
+      sql = <<-EOS
+SELECT DISTINCT
+  i.id AS item_id
+  ,d.display_name AS display_name
+  ,h.status AS status_id
+  ,i.unique_name AS unique_name
+  ,i.created_on
+FROM
+  some_schema.item i
+  INNER JOIN some_schema.item_detail d
+    ON i.id = d.item_id
+  INNER JOIN some_schema.item_history h
+    ON i.id = h.item_id
+
+/*BEGIN*/WHERE  /* line:14 */
+  /*IF ctx[:name] */i.name ILIKE /*ctx[:name]*/'hoge%'/*END*/
+  /*IF ctx[:display_name] */AND d.display_name ILIKE /*ctx[:display_name]*/'hoge%'/*END*/
+  /*IF ctx[:status] */AND h.status IN /*ctx[:status]*/(3, 4, 9)  /* no-END at line:17 */
+  /*IF ctx[:ignore_status] */AND h.status NOT IN /*ctx[:ignore_status]*/(4, 9)/*END*/
+/*END*/
+
+/*IF ctx[:order_by] */ ORDER BY /*$ctx[:order_by]*/i.id /*$ctx[:order]*/ASC /*END*/
+/*IF ctx[:limit] */ LIMIT /*ctx[:limit]*/10/*END*/
+/*IF ctx[:offset] */ OFFSET /*ctx[:offset]*/0/*END*/
+EOS
+      begin
+        TwoWaySQL::Template.parse(sql)
+      rescue Racc::ParseError => e
+        # unmatched END is at line 17 but value stack indicates open BEGIN statement
+        e.to_s.should match(/line:\[14\]/)
+      end
+    end
+
+  end
+
+
 end

data/spec/twowaysql_spec.rb

@@ -609,6 +609,23 @@ describe TwoWaySQL::Template do
   end
 
 
+  describe "show line number of SQL when parse error has occurred" do
+    it "single line" do
+      begin
+        TwoWaySQL::Template.parse("SELECT * FROM emp/*hoge")
+      rescue Racc::ParseError => e
+        e.to_s.should match(/line:\[1\]/)
+      end
+    end
+    it "multiple lines" do
+      begin
+        TwoWaySQL::Template.parse("SELECT\n *\n FROM\n emp\n/*hoge")
+      rescue Racc::ParseError => e
+        e.to_s.should match(/line:\[5\]/)
+      end
+    end
+  end
+
 
   describe "when parsed from '/*BEGIN*/'" do
     it "should cause parse error" do

data/tasks/deployment.rake

@@ -1,5 +1,5 @@
 desc 'Release the website and new gem version'
-task :deploy => [:check_version, :website, :release] do
+task :deploy => [:check_version, :ditz_release, :website, :release] do
   puts "Remember to create SVN tag:"
   puts "svn copy svn+ssh://#{rubyforge_username}@rubyforge.org/var/svn/#{PATH}/trunk " +
     "svn+ssh://#{rubyforge_username}@rubyforge.org/var/svn/#{PATH}/tags/REL-#{VERS} "
@@ -33,13 +33,12 @@ namespace :manifest do
 
     # this task is inspired by http://d.hatena.ne.jp/bellbind/20070605/1180979599
     glob_pattern = File.join("**", "*")
-    exclude_patterns = [
-                        /^pkg/,
-                        /^doc/,
-                        /^website/,
-                        /^\.git/,
-                        /.*\.output/
-                       ]
+    exclude_patterns = []
+    File.open('Manifest.skip') do |file|
+      while line = file.gets
+        exclude_patterns << Regexp.new(line.chomp)
+      end
+    end
 
     files = Dir.glob(glob_pattern).delete_if do |fname|
       File.directory?(fname) or

data/tasks/ditz.rake

@@ -3,3 +3,22 @@ task :ditz_report do
   puts 'generate ditz report'
   `ditz -i issues html website/issues`
 end
+
+desc 'ditz release'
+task :ditz_release do
+  unless ENV['DITZ_REL']
+    puts 'Must pass a DITZ_REL=release_name'
+    exit
+  end
+
+  release = ENV['DITZ_REL']
+  puts "ditz release #{release}"
+  `ditz -n -i issues release #{release}`
+
+  mv 'History.txt', 'History.txt.tmp'
+  puts "generate changelog for #{release}"
+  `ditz -i issues changelog #{release} > History.txt`
+  `echo '' >> History.txt`
+  `cat History.txt.tmp >> History.txt`
+  rm 'History.txt.tmp'
+end

data/tasks/rcov.rake

@@ -0,0 +1,5 @@
+desc 'generate RCov html report'
+task :rcov_report do
+  puts 'generate RCov coverage report'
+  `rcov -o website/coverage --exclude spec spec/*_spec.rb`
+end

data/tasks/website.rake

@@ -1,5 +1,5 @@
 desc 'Generate website files'
-task :website_generate => [:ruby_env,:ditz_report] do
+task :website_generate => [:ruby_env,:rcov_report,:ditz_report] do
   (Dir['website/**/*.txt'] - Dir['website/version*.txt']).each do |txt|
     sh %{ #{RUBY_APP} script/txt2html #{txt} > #{txt.gsub(/txt$/,'html')} }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: twowaysql
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Takuto Wada
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-10 00:00:00 +09:00
+date: 2008-09-30 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,6 +37,7 @@ extra_rdoc_files:
 files: 
 - History.txt
 - License.txt
+- Manifest.skip
 - Manifest.txt
 - README.txt
 - Rakefile
@@ -47,6 +48,7 @@ files:
 - issues/issue-25efcfc383f3b0f6c0e2730ae7c2975bb2b3de26.yaml
 - issues/issue-279105dd0d9f03514d318f5eab5e99c4c2d47fda.yaml
 - issues/issue-28cde89ed3eb306957edc90595b1d16bf43daf42.yaml
+- issues/issue-2a172da16d3a59adc8448f2e36ec48b36951e02d.yaml
 - issues/issue-39023ea09e17e2d64bcef03aa59cdfe38b78ad5b.yaml
 - issues/issue-4bc308d55ae91f266e656162a4147d356de1166c.yaml
 - issues/issue-5c973ef5bb074eacca0c6c84f7d27c4267773ea8.yaml
@@ -54,6 +56,7 @@ files:
 - issues/issue-6daccddf089d11d42bf016897da98f70cf5ab46c.yaml
 - issues/issue-897995fa10377eabdf597e8e7692f17087c76923.yaml
 - issues/issue-901f65630639507c8b05b466790e9f22256c6450.yaml
+- issues/issue-a185b4247f64c1104bc49ebf823b57b5de3d06f8.yaml
 - issues/issue-bd38c1cdc965d73dd629a81db2de1bcdcf4b10b8.yaml
 - issues/issue-dca4b19aa13de59838b33e03252bf824670a2d12.yaml
 - issues/issue-f1bd40de5458397d9b142ea3e197e5264e0dcdbf.yaml
@@ -67,10 +70,6 @@ files:
 - lib/twowaysql/parser.y
 - lib/twowaysql/template.rb
 - lib/twowaysql/version.rb
-- script/console
-- script/destroy
-- script/generate
-- script/txt2html
 - setup.rb
 - spec/large_sql_spec.rb
 - spec/learning_regex_spec.rb
@@ -81,6 +80,7 @@ files:
 - tasks/ditz.rake
 - tasks/environment.rake
 - tasks/racc.rake
+- tasks/rcov.rake
 - tasks/rspec.rake
 - tasks/website.rake
 has_rdoc: true

data/script/console

@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-# File: script/console
-irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
-
-libs =  " -r irb/completion"
-# Perhaps use a console_lib to store any extra methods I may want available in the cosole
-# libs << " -r #{File.dirname(__FILE__) + '/../lib/console_lib/console_logger.rb'}"
-libs <<  " -r #{File.dirname(__FILE__) + '/../lib/twowaysql.rb'}"
-puts "Loading twowaysql gem"
-exec "#{irb} #{libs} --simple-prompt"

data/script/destroy

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/destroy'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
-RubiGen::Scripts::Destroy.new.run(ARGV)

data/script/generate

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/generate'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
-RubiGen::Scripts::Generate.new.run(ARGV)

data/script/txt2html

@@ -1,82 +0,0 @@
-#!/usr/bin/env ruby
-
-GEM_NAME = 'twowaysql' # what ppl will type to install your gem
-RUBYFORGE_PROJECT = 'twowaysql'
-
-require 'rubygems'
-begin
-  require 'newgem'
-  require 'rubyforge'
-rescue LoadError
-  puts "\n\nGenerating the website requires the newgem RubyGem"
-  puts "Install: gem install newgem\n\n"
-  exit(1)
-end
-require 'redcloth'
-require 'syntax/convertors/html'
-require 'erb'
-require File.dirname(__FILE__) + "/../lib/#{GEM_NAME}/version.rb"
-
-version  = TwoWaySQL::VERSION::STRING
-download = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
-
-def rubyforge_project_id
-  RubyForge.new.autoconfig["group_ids"][RUBYFORGE_PROJECT]
-end
-
-class Fixnum
-  def ordinal
-    # teens
-    return 'th' if (10..19).include?(self % 100)
-    # others
-    case self % 10
-    when 1: return 'st'
-    when 2: return 'nd'
-    when 3: return 'rd'
-    else    return 'th'
-    end
-  end
-end
-
-class Time
-  def pretty
-    return "#{mday}#{mday.ordinal} #{strftime('%B')} #{year}"
-  end
-end
-
-def convert_syntax(syntax, source)
-  return Syntax::Convertors::HTML.for_syntax(syntax).convert(source).gsub(%r!^<pre>|</pre>$!,'')
-end
-
-if ARGV.length >= 1
-  src, template = ARGV
-  template ||= File.join(File.dirname(__FILE__), '/../website/template.html.erb')
-else
-  puts("Usage: #{File.split($0).last} source.txt [template.html.erb] > output.html")
-  exit!
-end
-
-template = ERB.new(File.open(template).read)
-
-title = nil
-body = nil
-File.open(src) do |fsrc|
-  title_text = fsrc.readline
-  body_text_template = fsrc.read
-  body_text = ERB.new(body_text_template).result(binding)
-  syntax_items = []
-  body_text.gsub!(%r!<(pre|code)[^>]*?syntax=['"]([^'"]+)[^>]*>(.*?)</\1>!m){
-    ident = syntax_items.length
-    element, syntax, source = $1, $2, $3
-    syntax_items << "<#{element} class='syntax'>#{convert_syntax(syntax, source)}</#{element}>"
-    "syntax-temp-#{ident}"
-  }
-  title = RedCloth.new(title_text).to_html.gsub(%r!<.*?>!,'').strip
-  body = RedCloth.new(body_text).to_html
-  body.gsub!(%r!(?:<pre><code>)?syntax-temp-(\d+)(?:</code></pre>)?!){ syntax_items[$1.to_i] }
-end
-stat = File.stat(src)
-created = stat.ctime
-modified = stat.mtime
-
-$stdout << template.result(binding)