twowaysql 0.2.1 → 0.3.0

data/lib/twowaysql/parser.rb

@@ -11,21 +11,19 @@ module TwoWaySQL
 
   class Parser < Racc::Parser
 
-module_eval <<'..end lib/twowaysql/parser.y modeval..id33db4a3791', 'lib/twowaysql/parser.y', 138
+module_eval <<'..end lib/twowaysql/parser.y modeval..idd0cee34b5c', 'lib/twowaysql/parser.y', 134
 
 require 'strscan'
 
 def initialize(opts={})
   opts = {
-    :debug => true,
+    :debug => false,
     :preserve_space => true,
-    :preserve_comment => true,
-    :preserve_eol => true
+    :preserve_comment => false
   }.merge(opts)
   @yydebug = opts[:debug]
   @preserve_space = opts[:preserve_space]
   @preserve_comment = opts[:preserve_comment]
-  @preserve_eol = opts[:preserve_eol]
   @num_questions = 0
 end
 
@@ -36,28 +34,30 @@ BIND_VARIABLE_PATTERN        = /\A#{BEGIN_BIND_VARIABLE}\s*/
 PAREN_BIND_VARIABLE_PATTERN  = /\A#{BEGIN_BIND_VARIABLE}\s*#{PAREN_EXAMPLE}/
 EMBED_VARIABLE_PATTERN       = /\A(\/|\#)\*\$([^\*]+)\*\1\s*/
 
-CONDITIONAL_PATTERN   = /\A(\/|\#)\*(IF)\s+([^\*]+)\s*\*\1/
-BEGIN_END_PATTERN     = /\A(\/|\#)\*(BEGIN|END)\s*\*\1/
-STRING_LITERAL_PATTERN = /\A(\'(?:[^\']+|\'\')*\')/   ## quoted string
-SPLIT_TOKEN_PATTERN   = /\A(\S+?)(?=\s*(?:(?:\/|\#)\*|-{2,}|\(|\)|\,))/  ## stop on delimiters --,/*,#*,',',(,)
-ELSE_PATTERN          = /\A\-{2,}\s*ELSE\s*/
-AND_PATTERN           = /\A(\s*AND\s+)/i
-OR_PATTERN            = /\A(\s*OR\s+)/i
-LITERAL_PATTERN       = /\A([^;\s]+)/
-SPACES_PATTERN        = /\A(\s+)/
-QUESTION_PATTERN      = /\A\?/
-COMMA_PATTERN         = /\A\,/
-LPAREN_PATTERN        = /\A\(/
-RPAREN_PATTERN        = /\A\)/
-ACTUAL_COMMENT_PATTERN          = /\A(\/|\#)\*\s+(.+)\s*\*\1/  ## start with spaces
+CONDITIONAL_PATTERN     = /\A(\/|\#)\*(IF)\s+([^\*]+)\s*\*\1/
+BEGIN_END_PATTERN       = /\A(\/|\#)\*(BEGIN|END)\s*\*\1/
+STRING_LITERAL_PATTERN  = /\A(\'(?:[^\']+|\'\')*\')/   ## quoted string
+SPLIT_TOKEN_PATTERN     = /\A(\S+?)(?=\s*(?:(?:\/|\#)\*|-{2,}|\(|\)|\,))/  ## stop on delimiters --,/*,#*,',',(,)
+LITERAL_PATTERN         = /\A([^;\s]+)/
+SPACES_PATTERN          = /\A(\s+)/
+QUESTION_PATTERN        = /\A\?/
+COMMA_PATTERN           = /\A\,/
+LPAREN_PATTERN          = /\A\(/
+RPAREN_PATTERN          = /\A\)/
+ACTUAL_COMMENT_PATTERN          = /\A(\/|\#)\*(\s{1,}(?:.*?))\*\1/m  ## start with spaces
 SEMICOLON_AT_INPUT_END_PATTERN  = /\A\;\s*\Z/
 UNMATCHED_COMMENT_START_PATTERN = /\A(?:(?:\/|\#)\*)/
 
+#TODO: remove trailing spaces for S2Dao compatibility, but this spec sometimes causes SQL bugs...
+ELSE_PATTERN            = /\A\-{2,}\s*ELSE\s*/
+AND_PATTERN             = /\A(\ *AND)\b/i
+OR_PATTERN              = /\A(\ *OR)\b/i
+
 
 def parse( io )
   @q = []
-  io.each_line do |line|
-    s = StringScanner.new(line.rstrip)
+  io.each_line(nil) do |whole|
+    s = StringScanner.new(whole)
     until s.eos? do
       case
       when s.scan(AND_PATTERN)
@@ -65,7 +65,7 @@ def parse( io )
       when s.scan(OR_PATTERN)
         @q.push [ :OR, s[1] ]
       when s.scan(SPACES_PATTERN)
-        @q.push [ :SPACES, s[1] ] if @preserve_space
+        @q.push [ :SPACES, s[1] ]
       when s.scan(QUESTION_PATTERN)
         @q.push [ :QUESTION, nil ]
       when s.scan(COMMA_PATTERN)
@@ -77,7 +77,7 @@ def parse( io )
       when s.scan(ELSE_PATTERN)
         @q.push [ :ELSE, nil ]
       when s.scan(ACTUAL_COMMENT_PATTERN)
-        @q.push [ :ACTUAL_COMMENT, s[2] ] if @preserve_comment
+        @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)
@@ -103,7 +103,6 @@ def parse( io )
       end
     end
       
-    @q.push [ :EOL, nil ] if @preserve_eol
   end
     
   @q.push [ false, nil ]
@@ -115,109 +114,108 @@ end
 def next_token
   @q.shift
 end
-..end lib/twowaysql/parser.y modeval..id33db4a3791
+..end lib/twowaysql/parser.y modeval..idd0cee34b5c
 
 ##### racc 1.4.5 generates ###
 
 racc_reduce_table = [
  0, 0, :racc_error,
- 1, 21, :_reduce_1,
- 0, 22, :_reduce_2,
- 2, 22, :_reduce_3,
- 1, 23, :_reduce_none,
+ 1, 20, :_reduce_1,
+ 0, 21, :_reduce_2,
+ 2, 21, :_reduce_3,
+ 1, 22, :_reduce_none,
+ 1, 22, :_reduce_none,
+ 1, 22, :_reduce_none,
+ 3, 25, :_reduce_7,
+ 4, 24, :_reduce_8,
+ 2, 27, :_reduce_9,
+ 0, 27, :_reduce_10,
+ 1, 26, :_reduce_none,
+ 1, 26, :_reduce_none,
+ 1, 26, :_reduce_none,
+ 2, 28, :_reduce_14,
+ 2, 29, :_reduce_15,
+ 1, 23, :_reduce_16,
+ 1, 23, :_reduce_17,
+ 1, 23, :_reduce_18,
+ 1, 23, :_reduce_19,
+ 1, 23, :_reduce_20,
+ 1, 23, :_reduce_21,
+ 1, 23, :_reduce_22,
+ 1, 23, :_reduce_23,
+ 1, 23, :_reduce_24,
+ 1, 23, :_reduce_25,
  1, 23, :_reduce_none,
  1, 23, :_reduce_none,
- 3, 26, :_reduce_7,
- 4, 25, :_reduce_8,
- 2, 28, :_reduce_9,
- 0, 28, :_reduce_10,
- 1, 27, :_reduce_none,
- 1, 27, :_reduce_none,
- 1, 27, :_reduce_none,
- 2, 29, :_reduce_14,
- 2, 30, :_reduce_15,
- 1, 24, :_reduce_16,
- 1, 24, :_reduce_17,
- 1, 24, :_reduce_18,
- 1, 24, :_reduce_19,
- 1, 24, :_reduce_20,
- 1, 24, :_reduce_21,
- 1, 24, :_reduce_22,
- 1, 24, :_reduce_23,
- 1, 24, :_reduce_24,
- 1, 24, :_reduce_25,
- 1, 24, :_reduce_26,
- 1, 24, :_reduce_none,
- 1, 24, :_reduce_none,
- 2, 31, :_reduce_29,
- 3, 31, :_reduce_30,
- 2, 31, :_reduce_31,
- 3, 31, :_reduce_32,
- 1, 31, :_reduce_33,
- 2, 32, :_reduce_34,
- 3, 32, :_reduce_35 ]
-
-racc_reduce_n = 36
-
-racc_shift_n = 49
+ 2, 30, :_reduce_28,
+ 3, 30, :_reduce_29,
+ 2, 30, :_reduce_30,
+ 3, 30, :_reduce_31,
+ 1, 30, :_reduce_32,
+ 2, 31, :_reduce_33,
+ 3, 31, :_reduce_34 ]
+
+racc_reduce_n = 35
+
+racc_shift_n = 48
 
 racc_action_table = [
-     7,    36,    12,    37,    16,    18,    20,    22,    24,     3,
-     4,     6,     9,    11,    14,    15,    17,    19,     7,    46,
-    12,    40,    16,    18,    20,    22,    24,     3,     4,     6,
-     9,    11,    14,    15,    17,    19,     7,    48,    12,    38,
-    16,    18,    20,    22,    24,     3,     4,     6,     9,    11,
-    14,    15,    17,    19,     7,    39,    12,    25,    16,    18,
-    20,    22,    24,     3,     4,     6,     9,    11,    14,    15,
-    17,    19,     7,   nil,    12,   nil,    16,    18,    20,    22,
-    24,     3,     4,     6,     9,    11,    14,    15,    17,    19,
-    33,    34,    35,    29,    30,    29,    30,    44,    45 ]
+     9,    36,    14,    37,    17,    19,    21,    23,    24,     4,
+     6,     8,    11,    13,    15,    16,    18,     9,    39,    14,
+    45,    17,    19,    21,    23,    24,     4,     6,     8,    11,
+    13,    15,    16,    18,     9,    47,    14,    25,    17,    19,
+    21,    23,    24,     4,     6,     8,    11,    13,    15,    16,
+    18,     9,    38,    14,     3,    17,    19,    21,    23,    24,
+     4,     6,     8,    11,    13,    15,    16,    18,     9,   nil,
+    14,   nil,    17,    19,    21,    23,    24,     4,     6,     8,
+    11,    13,    15,    16,    18,    33,    34,    35,    28,    30,
+    28,    30,    43,    44 ]
 
 racc_action_check = [
-     1,    19,     1,    19,     1,     1,     1,     1,     1,     1,
-     1,     1,     1,     1,     1,     1,     1,     1,    43,    37,
-    43,    28,    43,    43,    43,    43,    43,    43,    43,    43,
-    43,    43,    43,    43,    43,    43,    42,    41,    42,    25,
-    42,    42,    42,    42,    42,    42,    42,    42,    42,    42,
-    42,    42,    42,    42,    26,    26,    26,     2,    26,    26,
-    26,    26,    26,    26,    26,    26,    26,    26,    26,    26,
-    26,    26,    27,   nil,    27,   nil,    27,    27,    27,    27,
-    27,    27,    27,    27,    27,    27,    27,    27,    27,    27,
-    15,    15,    15,    12,    12,    40,    40,    35,    35 ]
+    42,    18,    42,    18,    42,    42,    42,    42,    42,    42,
+    42,    42,    42,    42,    42,    42,    42,     2,    27,     2,
+    37,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,    41,    40,    41,     3,    41,    41,
+    41,    41,    41,    41,    41,    41,    41,    41,    41,    41,
+    41,    26,    26,    26,     1,    26,    26,    26,    26,    26,
+    26,    26,    26,    26,    26,    26,    26,    26,    32,   nil,
+    32,   nil,    32,    32,    32,    32,    32,    32,    32,    32,
+    32,    32,    32,    32,    32,    15,    15,    15,    39,    39,
+    14,    14,    35,    35 ]
 
 racc_action_pointer = [
-   nil,    -2,    57,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    87,   nil,   nil,    82,   nil,   nil,   nil,    -7,
-   nil,   nil,   nil,   nil,   nil,    39,    52,    70,    16,   nil,
-   nil,   nil,   nil,   nil,   nil,    89,   nil,    11,   nil,   nil,
-    89,    34,    34,    16,   nil,   nil,   nil,   nil,   nil ]
+   nil,    54,    15,    37,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    84,    77,   nil,   nil,    -7,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    49,    13,   nil,   nil,
+   nil,   nil,    66,   nil,   nil,    84,   nil,    12,   nil,    82,
+    32,    32,    -2,   nil,   nil,   nil,   nil,   nil ]
 
 racc_action_default = [
-    -2,    -1,   -36,   -21,   -22,    -3,   -23,    -2,    -4,   -24,
-    -5,   -25,    -2,    -6,   -26,   -36,   -18,   -33,   -19,   -36,
-   -16,   -27,   -17,   -28,   -20,   -36,   -36,   -13,   -10,    -2,
-    -2,   -11,   -12,   -31,   -29,   -36,   -34,   -36,    49,    -7,
-    -2,   -36,   -14,   -15,   -32,   -30,   -35,    -9,    -8 ]
+    -2,   -35,    -1,   -35,   -21,    -3,   -22,    -4,   -23,    -2,
+    -5,   -24,    -6,   -25,    -2,   -35,   -32,   -18,   -35,   -19,
+   -26,   -16,   -27,   -17,   -20,    48,   -35,   -10,    -2,   -11,
+    -2,   -12,   -13,   -30,   -28,   -35,   -33,   -35,    -7,    -2,
+   -35,   -14,   -15,   -31,   -29,   -34,    -9,    -8 ]
 
 racc_goto_table = [
-     1,     2,    41,    28,   nil,   nil,   nil,    26,   nil,   nil,
+     2,    27,     1,    40,   nil,   nil,   nil,   nil,   nil,    26,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    42,
-    43,    47 ]
+   nil,   nil,   nil,   nil,   nil,   nil,    46,   nil,    41,   nil,
+    42 ]
 
 racc_goto_check = [
-     2,     1,     8,     7,   nil,   nil,   nil,     2,   nil,   nil,
+     2,     7,     1,     8,   nil,   nil,   nil,   nil,   nil,     2,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     2,
-     2,     7 ]
+   nil,   nil,   nil,   nil,   nil,   nil,     7,   nil,     2,   nil,
+     2 ]
 
 racc_goto_pointer = [
-   nil,     1,     0,   nil,   nil,   nil,   nil,    -9,   -26,   nil,
+   nil,     2,     0,   nil,   nil,   nil,   nil,   -13,   -24,   nil,
    nil,   nil,   nil ]
 
 racc_goto_default = [
-   nil,   nil,    27,     5,     8,    10,    13,   nil,   nil,    31,
-    32,    21,    23 ]
+   nil,   nil,    32,     5,     7,    10,    12,   nil,   nil,    29,
+    31,    20,    22 ]
 
 racc_token_table = {
  false => 0,
@@ -236,14 +234,13 @@ racc_token_table = {
  :RPAREN => 13,
  :QUESTION => 14,
  :ACTUAL_COMMENT => 15,
- :EOL => 16,
- :BIND_VARIABLE => 17,
- :PAREN_BIND_VARIABLE => 18,
- :EMBED_VARIABLE => 19 }
+ :BIND_VARIABLE => 16,
+ :PAREN_BIND_VARIABLE => 17,
+ :EMBED_VARIABLE => 18 }
 
 racc_use_result_var = true
 
-racc_nt_base = 20
+racc_nt_base = 19
 
 Racc_arg = [
  racc_action_table,
@@ -278,7 +275,6 @@ Racc_token_to_s_table = [
 'RPAREN',
 'QUESTION',
 'ACTUAL_COMMENT',
-'EOL',
 'BIND_VARIABLE',
 'PAREN_BIND_VARIABLE',
 'EMBED_VARIABLE',
@@ -407,7 +403,7 @@ module_eval <<'.,.,', 'lib/twowaysql/parser.y', 71
 
 module_eval <<'.,.,', 'lib/twowaysql/parser.y', 75
   def _reduce_20( val, _values, result )
-                  result = LiteralNode.new( val[0] )
+                  result = WhiteSpaceNode.new( val[0], @preserve_space )
    result
   end
 .,.,
@@ -443,21 +439,21 @@ module_eval <<'.,.,', 'lib/twowaysql/parser.y', 92
 
 module_eval <<'.,.,', 'lib/twowaysql/parser.y', 96
   def _reduce_25( val, _values, result )
-                  result = CommentNode.new( val[0] )
+                  result = ActualCommentNode.new( val[0][0] , val[0][1] )
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/twowaysql/parser.y', 100
-  def _reduce_26( val, _values, result )
-                  result = EolNode.new
-   result
-  end
-.,.,
+ # reduce 26 omitted
 
  # reduce 27 omitted
 
- # reduce 28 omitted
+module_eval <<'.,.,', 'lib/twowaysql/parser.y', 103
+  def _reduce_28( val, _values, result )
+                  result = BindVariableNode.new( val[0] )
+   result
+  end
+.,.,
 
 module_eval <<'.,.,', 'lib/twowaysql/parser.y', 107
   def _reduce_29( val, _values, result )
@@ -482,14 +478,14 @@ module_eval <<'.,.,', 'lib/twowaysql/parser.y', 115
 
 module_eval <<'.,.,', 'lib/twowaysql/parser.y', 119
   def _reduce_32( val, _values, result )
-                  result = BindVariableNode.new( val[0] )
+                  result = ParenBindVariableNode.new( val[0] )
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/twowaysql/parser.y', 123
+module_eval <<'.,.,', 'lib/twowaysql/parser.y', 124
   def _reduce_33( val, _values, result )
-                  result = ParenBindVariableNode.new( val[0] )
+                  result = EmbedVariableNode.new( val[0] )
    result
   end
 .,.,
@@ -501,13 +497,6 @@ module_eval <<'.,.,', 'lib/twowaysql/parser.y', 128
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/twowaysql/parser.y', 132
-  def _reduce_35( val, _values, result )
-                  result = EmbedVariableNode.new( val[0] )
-   result
-  end
-.,.,
-
  def _reduce_none( val, _values, result )
   result
  end

data/lib/twowaysql/parser.y

@@ -71,7 +71,7 @@ primary        : IDENT
                 }
                | SPACES
                 {
-                  result = LiteralNode.new( val[0] )
+                  result = WhiteSpaceNode.new( val[0], @preserve_space )
                 }
                | COMMA
                 {
@@ -92,11 +92,7 @@ primary        : IDENT
                 }
                | ACTUAL_COMMENT
                 {
-                  result = CommentNode.new( val[0] )
-                }
-               | EOL
-                {
-                  result = EolNode.new
+                  result = ActualCommentNode.new( val[0][0] , val[0][1] )
                 }
                | bind_var
                | embed_var
@@ -140,15 +136,13 @@ require 'strscan'
 
 def initialize(opts={})
   opts = {
-    :debug => true,
+    :debug => false,
     :preserve_space => true,
-    :preserve_comment => true,
-    :preserve_eol => true
+    :preserve_comment => false
   }.merge(opts)
   @yydebug = opts[:debug]
   @preserve_space = opts[:preserve_space]
   @preserve_comment = opts[:preserve_comment]
-  @preserve_eol = opts[:preserve_eol]
   @num_questions = 0
 end
 
@@ -159,28 +153,30 @@ BIND_VARIABLE_PATTERN        = /\A#{BEGIN_BIND_VARIABLE}\s*/
 PAREN_BIND_VARIABLE_PATTERN  = /\A#{BEGIN_BIND_VARIABLE}\s*#{PAREN_EXAMPLE}/
 EMBED_VARIABLE_PATTERN       = /\A(\/|\#)\*\$([^\*]+)\*\1\s*/
 
-CONDITIONAL_PATTERN   = /\A(\/|\#)\*(IF)\s+([^\*]+)\s*\*\1/
-BEGIN_END_PATTERN     = /\A(\/|\#)\*(BEGIN|END)\s*\*\1/
-STRING_LITERAL_PATTERN = /\A(\'(?:[^\']+|\'\')*\')/   ## quoted string
-SPLIT_TOKEN_PATTERN   = /\A(\S+?)(?=\s*(?:(?:\/|\#)\*|-{2,}|\(|\)|\,))/  ## stop on delimiters --,/*,#*,',',(,)
-ELSE_PATTERN          = /\A\-{2,}\s*ELSE\s*/
-AND_PATTERN           = /\A(\s*AND\s+)/i
-OR_PATTERN            = /\A(\s*OR\s+)/i
-LITERAL_PATTERN       = /\A([^;\s]+)/
-SPACES_PATTERN        = /\A(\s+)/
-QUESTION_PATTERN      = /\A\?/
-COMMA_PATTERN         = /\A\,/
-LPAREN_PATTERN        = /\A\(/
-RPAREN_PATTERN        = /\A\)/
-ACTUAL_COMMENT_PATTERN          = /\A(\/|\#)\*\s+(.+)\s*\*\1/  ## start with spaces
+CONDITIONAL_PATTERN     = /\A(\/|\#)\*(IF)\s+([^\*]+)\s*\*\1/
+BEGIN_END_PATTERN       = /\A(\/|\#)\*(BEGIN|END)\s*\*\1/
+STRING_LITERAL_PATTERN  = /\A(\'(?:[^\']+|\'\')*\')/   ## quoted string
+SPLIT_TOKEN_PATTERN     = /\A(\S+?)(?=\s*(?:(?:\/|\#)\*|-{2,}|\(|\)|\,))/  ## stop on delimiters --,/*,#*,',',(,)
+LITERAL_PATTERN         = /\A([^;\s]+)/
+SPACES_PATTERN          = /\A(\s+)/
+QUESTION_PATTERN        = /\A\?/
+COMMA_PATTERN           = /\A\,/
+LPAREN_PATTERN          = /\A\(/
+RPAREN_PATTERN          = /\A\)/
+ACTUAL_COMMENT_PATTERN          = /\A(\/|\#)\*(\s{1,}(?:.*?))\*\1/m  ## start with spaces
 SEMICOLON_AT_INPUT_END_PATTERN  = /\A\;\s*\Z/
 UNMATCHED_COMMENT_START_PATTERN = /\A(?:(?:\/|\#)\*)/
 
+#TODO: remove trailing spaces for S2Dao compatibility, but this spec sometimes causes SQL bugs...
+ELSE_PATTERN            = /\A\-{2,}\s*ELSE\s*/
+AND_PATTERN             = /\A(\ *AND)\b/i
+OR_PATTERN              = /\A(\ *OR)\b/i
+
 
 def parse( io )
   @q = []
-  io.each_line do |line|
-    s = StringScanner.new(line.rstrip)
+  io.each_line(nil) do |whole|
+    s = StringScanner.new(whole)
     until s.eos? do
       case
       when s.scan(AND_PATTERN)
@@ -188,7 +184,7 @@ def parse( io )
       when s.scan(OR_PATTERN)
         @q.push [ :OR, s[1] ]
       when s.scan(SPACES_PATTERN)
-        @q.push [ :SPACES, s[1] ] if @preserve_space
+        @q.push [ :SPACES, s[1] ]
       when s.scan(QUESTION_PATTERN)
         @q.push [ :QUESTION, nil ]
       when s.scan(COMMA_PATTERN)
@@ -200,7 +196,7 @@ def parse( io )
       when s.scan(ELSE_PATTERN)
         @q.push [ :ELSE, nil ]
       when s.scan(ACTUAL_COMMENT_PATTERN)
-        @q.push [ :ACTUAL_COMMENT, s[2] ] if @preserve_comment
+        @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)
@@ -226,7 +222,6 @@ def parse( io )
       end
     end
       
-    @q.push [ :EOL, nil ] if @preserve_eol
   end
     
   @q.push [ false, nil ]

data/lib/twowaysql/template.rb

@@ -1,5 +1,3 @@
-require 'forwardable'
-
 module TwoWaySQL
 
   # TwoWaySQL::Template represents template object, acts as a Facade for this package.
@@ -64,12 +62,36 @@ module TwoWaySQL
 
   # TwoWaySQL::Result represents merge result of template and data.
   # it contains SQL string with placeholders, and bound variables associated with placeholders.
+  #
+  # === Usage
+  #
+  #   merged = template.merge(:job => "HOGE", :deptno => 30)
+  #   merged.sql                #=> "SELECT * FROM emp WHERE job = ? AND deptno = ?"
+  #   merged.bound_variables    #=> ["HOGE", 30]
+  #
   class Result
-    extend Forwardable
     def initialize(context)
       @context = context
     end
-    def_delegators :@context, :sql, :bound_variables
+
+    # return merge result SQL with placeholders (question mark).
+    #
+    # === Return
+    # merge result SQL with placeholders
+    #
+    def sql
+      @context.sql
+    end
+
+    # return array of variables which indices are corresponding to placeholders.
+    #
+    # === Return
+    # merge result SQL with placeholders
+    #
+    def bound_variables
+      @context.bound_variables
+    end
+    alias vars bound_variables
   end
 
 end

data/lib/twowaysql/version.rb

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

data/spec/large_sql_spec.rb

@@ -153,11 +153,26 @@ from
   /*IF ctx[:id_list] */and id in /*ctx[:id_list]*/(3, 4, 9)/*END*/
 /*END*/
 EOS
-      template = TwoWaySQL::Template.parse(sql)
-      @result = template.merge(:id_list => [10, 11])
+      @template = TwoWaySQL::Template.parse(sql)
     end
 
-    it "sql" do
+    it "if both line is true" do
+      expected = <<-EOS
+select
+  *
+from
+  hoge
+where
+  name like ?
+  and id in (?, ?)
+
+EOS
+      @result = @template.merge(:name => 'foo%', :id_list => [10, 11])
+      @result.sql.should == expected
+      @result.bound_variables.should == ['foo%', 10, 11]
+    end
+
+    it "if second line is true" do
       expected = <<-EOS
 select
   *
@@ -165,12 +180,60 @@ from
   hoge
 where
   
-  id in (?, ?)
+   id in (?, ?)
 
 EOS
+      @result = @template.merge(:id_list => [10, 11])
       @result.sql.should == expected
       @result.bound_variables.should == [10, 11]
     end
+
+  end
+
+
+
+
+  describe "examples in website" do
+    it do
+  # given SQL string with TwoWaySQL comments
+  sql = <<-EOS
+    SELECT * FROM emp
+    /*BEGIN*/WHERE
+      /*IF ctx[:job]*/ job = /*ctx[:job]*/'CLERK' /*END*/
+      /*IF ctx[:deptno_list]*/ AND deptno IN /*ctx[:deptno_list]*/(20, 30) /*END*/
+      /*IF ctx[:age]*/ AND age > /*ctx[:age]*/30 /*END*/
+    /*END*/
+    /*IF ctx[:order_by] */ ORDER BY /*$ctx[:order_by]*/id /*$ctx[:order]*/ASC /*END*/
+  EOS
+
+
+  # parse the SQL to create template object
+  template = TwoWaySQL::Template.parse(sql)
+
+
+  # merge data with template
+  data = {
+    :age => 35,
+    :deptno_list => [10,20,30],
+    :order_by => 'age',
+    :order => 'DESC'
+  }
+  merged = template.merge(data)
+
+
+  expected_sql = <<-EOS
+    SELECT * FROM emp
+    WHERE
+      
+       deptno IN (?, ?, ?) 
+       AND age > ? 
+    
+     ORDER BY age DESC 
+  EOS
+
+  merged.sql.should == expected_sql      #=> true
+  merged.bound_variables.should == [10,20,30,35]
+    end
   end
 
 end