twowaysql 0.2.0 → 0.2.1

data/History.txt

@@ -1,3 +1,11 @@
-== 0.2.0 2008-09-03
-
+== 0.2.0 / 2008-09-05
 * Initial release
+* RubyForge settings
+* rdoc for published classes and methods
+
+== 0.2.1 / 2008-09-07
+* bugfix: case insensitive match for SQL reserved words
+* make Ruby1.9 ready
+* integrate ditz html into site
+* change idiom 'substitution' to 'interpolation'
+* Handle Embedded variable comment at Scanner/Grammar level

data/Manifest.txt

@@ -5,11 +5,16 @@ README.txt
 Rakefile
 config/hoe.rb
 config/requirements.rb
+issues/issue-1cee7e821865a216674832b0186bd92792680571.yaml
 issues/issue-25efcfc383f3b0f6c0e2730ae7c2975bb2b3de26.yaml
 issues/issue-39023ea09e17e2d64bcef03aa59cdfe38b78ad5b.yaml
 issues/issue-4bc308d55ae91f266e656162a4147d356de1166c.yaml
+issues/issue-5c973ef5bb074eacca0c6c84f7d27c4267773ea8.yaml
+issues/issue-664986b219202ff1948cab717b56e7540f493561.yaml
 issues/issue-897995fa10377eabdf597e8e7692f17087c76923.yaml
+issues/issue-901f65630639507c8b05b466790e9f22256c6450.yaml
 issues/issue-bd38c1cdc965d73dd629a81db2de1bcdcf4b10b8.yaml
+issues/issue-dca4b19aa13de59838b33e03252bf824670a2d12.yaml
 issues/issue-f2b773020b54f839c03d899b38b5113c8fd991df.yaml
 issues/issue-f39b907d01d7fa93df8c7a9de2e1b5e27727ee0a.yaml
 issues/issue-f64d73ed4f9854f1ded77e6496dbf59cfb3770a7.yaml

data/README.txt

@@ -38,7 +38,7 @@ TwoWaySQL provides better separation of host language and SQL.
 
 With TwoWaySQL, you can
 * separate SQL (as file) from host language
-* bind variables to SQL using Substitution comments
+* bind variables to SQL using Interpolation comments
 * modify SQL conditionally by using Directive comments
 * run and preview TwoWaySQL-style SQL by tools like pgAdmin3, since the SQL is still valid SQL.
 
@@ -110,7 +110,7 @@ TwoWaySQL is not
 
 == FEATURES/PROBLEMS:
 
-* Substitution comments
+* Interpolation comments
   * Bind variable comment
   * Embedded variable comment
 

data/issues/issue-1cee7e821865a216674832b0186bd92792680571.yaml

@@ -0,0 +1,30 @@
+--- !ditz.rubyforge.org,2008-03-06/issue 
+title: make Ruby1.9 ready
+desc: make sure to work under Ruby1.9
+type: :feature
+component: twowaysql
+release: release_0_2_1
+reporter: takuto <takuto.wada@gmail.com>
+status: :closed
+disposition: :fixed
+creation_time: 2008-09-05 14:32:11.017805 Z
+references: []
+
+id: 1cee7e821865a216674832b0186bd92792680571
+log_events: 
+- - 2008-09-05 14:33:13.624689 Z
+  - takuto <takuto.wada@gmail.com>
+  - created
+  - ""
+- - 2008-09-05 14:34:03.805045 Z
+  - takuto <takuto.wada@gmail.com>
+  - changed status from unstarted to in_progress
+  - ""
+- - 2008-09-05 14:58:22.094256 Z
+  - takuto <takuto.wada@gmail.com>
+  - closed with disposition fixed
+  - done.
+- - 2008-09-07 16:16:17.406228 Z
+  - takuto <takuto.wada@gmail.com>
+  - assigned to release release_0_2_1 from release_0_3
+  - ""

data/issues/issue-25efcfc383f3b0f6c0e2730ae7c2975bb2b3de26.yaml

@@ -1,6 +1,6 @@
 --- !ditz.rubyforge.org,2008-03-06/issue 
 title: better whitespace handling
-desc: better whitespace handling on Scanner/Grammer.
+desc: better whitespace handling on Scanner/Grammar.
 type: :feature
 component: twowaysql
 release: 

data/issues/issue-39023ea09e17e2d64bcef03aa59cdfe38b78ad5b.yaml

@@ -3,7 +3,7 @@ title: integrate ditz html into site
 desc: Integrate ditz html output into site. Ditz site(http://ditz.rubyforge.org/ditz) may help.
 type: :task
 component: twowaysql
-release: 
+release: release_0_2_1
 reporter: takuto <takuto.wada@gmail.com>
 status: :closed
 disposition: :fixed
@@ -24,3 +24,11 @@ log_events:
   - takuto <takuto.wada@gmail.com>
   - closed with disposition fixed
   - done.
+- - 2008-09-07 16:12:29.395340 Z
+  - takuto <takuto.wada@gmail.com>
+  - assigned to release release_0_3 from unassigned
+  - ""
+- - 2008-09-07 16:15:39.449630 Z
+  - takuto <takuto.wada@gmail.com>
+  - assigned to release release_0_2_1 from release_0_3
+  - ""

data/issues/issue-5c973ef5bb074eacca0c6c84f7d27c4267773ea8.yaml

@@ -0,0 +1,30 @@
+--- !ditz.rubyforge.org,2008-03-06/issue 
+title: case insensitive match for SQL reserved words
+desc: case insensitive match for SQL reserved words
+type: :bugfix
+component: twowaysql
+release: release_0_2_1
+reporter: takuto <takuto.wada@gmail.com>
+status: :closed
+disposition: :fixed
+creation_time: 2008-09-06 08:22:09.096464 Z
+references: []
+
+id: 5c973ef5bb074eacca0c6c84f7d27c4267773ea8
+log_events: 
+- - 2008-09-06 08:22:13.438780 Z
+  - takuto <takuto.wada@gmail.com>
+  - created
+  - ""
+- - 2008-09-06 08:24:42.298213 Z
+  - takuto <takuto.wada@gmail.com>
+  - changed status from unstarted to in_progress
+  - ""
+- - 2008-09-06 18:48:46.516332 Z
+  - takuto <takuto.wada@gmail.com>
+  - closed with disposition fixed
+  - ""
+- - 2008-09-07 16:16:22.125681 Z
+  - takuto <takuto.wada@gmail.com>
+  - assigned to release release_0_2_1 from release_0_3
+  - ""

data/issues/issue-664986b219202ff1948cab717b56e7540f493561.yaml

@@ -0,0 +1,22 @@
+--- !ditz.rubyforge.org,2008-03-06/issue 
+title: line number support on parse error
+desc: show line number of SQL when parse error has occurred.
+type: :feature
+component: twowaysql
+release: release_0_3
+reporter: takuto <takuto.wada@gmail.com>
+status: :unstarted
+disposition: 
+creation_time: 2008-09-06 07:38:16.872853 Z
+references: []
+
+id: 664986b219202ff1948cab717b56e7540f493561
+log_events: 
+- - 2008-09-06 07:39:56.519949 Z
+  - takuto <takuto.wada@gmail.com>
+  - created
+  - work with multiline parsing?
+- - 2008-09-07 14:11:28.508490 Z
+  - takuto <takuto.wada@gmail.com>
+  - assigned to release release_0_3 from unassigned
+  - assign to release_0_3

data/issues/issue-897995fa10377eabdf597e8e7692f17087c76923.yaml

@@ -5,8 +5,8 @@ type: :task
 component: twowaysql
 release: 0.2 release
 reporter: takuto <takuto.wada@gmail.com>
-status: :in_progress
-disposition: 
+status: :closed
+disposition: :fixed
 creation_time: 2008-09-04 17:02:51.175082 Z
 references: []
 
@@ -24,3 +24,16 @@ log_events:
   - takuto <takuto.wada@gmail.com>
   - changed status from unstarted to in_progress
   - ""
+- - 2008-09-05 08:06:48.196336 Z
+  - takuto <takuto.wada@gmail.com>
+  - closed with disposition fixed
+  - |-
+    version 0.2.0 deploy done(gem, website, rdoc).
+    these sites are very helpful when wrestling with rubyforge
+    http://fromnorth.blogspot.com/2008/06/rubygem.html
+    http://blog.bogojoker.com/category/rr/
+    short summary of workaround
+    1. change language to English in RubyForge site's profile page
+    2. make sure ./rubyforge/auto-config.yml contains non-empty processor_ids. If empty, add the data manually.
+    then I can hit 'rake VERSION=x.y.z deploy', all done.
+    It's one button release. great.

data/issues/issue-901f65630639507c8b05b466790e9f22256c6450.yaml

@@ -0,0 +1,18 @@
+--- !ditz.rubyforge.org,2008-03-06/issue 
+title: Whitespace compaction mode
+desc: Whitespace compaction mode for log space saving
+type: :feature
+component: twowaysql
+release: 
+reporter: takuto <takuto.wada@gmail.com>
+status: :unstarted
+disposition: 
+creation_time: 2008-09-05 11:32:38.661495 Z
+references: []
+
+id: 901f65630639507c8b05b466790e9f22256c6450
+log_events: 
+- - 2008-09-05 11:32:40.738455 Z
+  - takuto <takuto.wada@gmail.com>
+  - created
+  - ""

data/issues/issue-dca4b19aa13de59838b33e03252bf824670a2d12.yaml

@@ -0,0 +1,30 @@
+--- !ditz.rubyforge.org,2008-03-06/issue 
+title: change idiom 'substitution' to 'interpolation'
+desc: "'interpolation' should be better. Thanks Leo."
+type: :task
+component: twowaysql
+release: release_0_2_1
+reporter: takuto <takuto.wada@gmail.com>
+status: :closed
+disposition: :fixed
+creation_time: 2008-09-05 12:57:18.093242 Z
+references: []
+
+id: dca4b19aa13de59838b33e03252bf824670a2d12
+log_events: 
+- - 2008-09-05 12:57:20.102850 Z
+  - takuto <takuto.wada@gmail.com>
+  - created
+  - ""
+- - 2008-09-06 07:19:52.293739 Z
+  - takuto <takuto.wada@gmail.com>
+  - changed status from unstarted to in_progress
+  - ""
+- - 2008-09-06 07:21:02.436063 Z
+  - takuto <takuto.wada@gmail.com>
+  - closed with disposition fixed
+  - ""
+- - 2008-09-07 16:16:00.691175 Z
+  - takuto <takuto.wada@gmail.com>
+  - assigned to release release_0_2_1 from release_0_3
+  - ""

data/issues/issue-f39b907d01d7fa93df8c7a9de2e1b5e27727ee0a.yaml

@@ -1,12 +1,12 @@
 --- !ditz.rubyforge.org,2008-03-06/issue 
-title: Handle Embedded variable comment at Scanner/Grammer level
-desc: Handle Embedded variable comment at Scanner/Grammer level. Currently it is handled at Node object level, so Scanner does not know the Substitution comment is Bind variable comment or Embedded variable comment. However Node should not be responsible for that, Scanner/Grammer should do.
+title: Handle Embedded variable comment at Scanner/Grammar level
+desc: Handle Embedded variable comment at Scanner/Grammar level. Currently it is handled at Node object level, so Scanner does not know the Substitution comment is Bind variable comment or Embedded variable comment. However Node should not be responsible for that, Scanner/Grammar should do.
 type: :task
 component: twowaysql
-release: 
+release: release_0_2_1
 reporter: takuto <takuto.wada@gmail.com>
-status: :unstarted
-disposition: 
+status: :closed
+disposition: :fixed
 creation_time: 2008-09-04 19:53:35.026331 Z
 references: []
 
@@ -16,3 +16,19 @@ log_events:
   - takuto <takuto.wada@gmail.com>
   - created
   - ""
+- - 2008-09-05 12:33:44.914741 Z
+  - takuto <takuto.wada@gmail.com>
+  - changed status from unstarted to in_progress
+  - start
+- - 2008-09-06 04:23:57.911458 Z
+  - takuto <takuto.wada@gmail.com>
+  - closed with disposition fixed
+  - ""
+- - 2008-09-07 16:12:40.550815 Z
+  - takuto <takuto.wada@gmail.com>
+  - assigned to release release_0_3 from unassigned
+  - ""
+- - 2008-09-07 16:15:51.826887 Z
+  - takuto <takuto.wada@gmail.com>
+  - assigned to release release_0_2_1 from release_0_3
+  - ""

data/issues/issue-f64d73ed4f9854f1ded77e6496dbf59cfb3770a7.yaml

@@ -3,7 +3,7 @@ title: preserve actual comment content
 desc: preserve actual comment content
 type: :feature
 component: twowaysql
-release: 
+release: release_0_3
 reporter: takuto <takuto.wada@gmail.com>
 status: :unstarted
 disposition: 
@@ -16,3 +16,7 @@ log_events:
   - takuto <takuto.wada@gmail.com>
   - created
   - preserve actual comment content if :preserve_comment is on.
+- - 2008-09-07 14:11:49.991298 Z
+  - takuto <takuto.wada@gmail.com>
+  - assigned to release release_0_3 from unassigned
+  - assign to release_0_3

data/issues/project.yaml

@@ -7,10 +7,36 @@ components:
 releases: 
 - !ditz.rubyforge.org,2008-03-06/release 
   name: 0.2 release
-  status: :unreleased
-  release_time: 
+  status: :released
+  release_time: 2008-09-05 08:08:30.793430 Z
   log_events: 
   - - 2008-09-03 08:30:15.096853 Z
     - takuto <takuto.wada@gmail.com>
     - created
     - first published version.
+  - - 2008-09-05 08:08:30.793446 Z
+    - takuto <takuto.wada@gmail.com>
+    - released
+    - 0.2 release done.
+- !ditz.rubyforge.org,2008-03-06/release 
+  name: release_0_3
+  status: :unreleased
+  release_time: 
+  log_events: 
+  - - 2008-09-05 11:23:24.696817 Z
+    - takuto <takuto.wada@gmail.com>
+    - created
+    - release 0.3
+- !ditz.rubyforge.org,2008-03-06/release 
+  name: release_0_2_1
+  status: :released
+  release_time: 2008-09-07 16:48:59.265076 Z
+  log_events: 
+  - - 2008-09-07 16:13:59.207476 Z
+    - takuto <takuto.wada@gmail.com>
+    - created
+    - release 0.2.1
+  - - 2008-09-07 16:48:59.265087 Z
+    - takuto <takuto.wada@gmail.com>
+    - released
+    - 0.2.1 release

data/lib/twowaysql/node.rb

@@ -1,13 +1,3 @@
-unless String.method_defined?(:start_with?)
-  class String #:nodoc:
-    def start_with?(prefix)
-      prefix = prefix.to_s
-      self[0, prefix.length] == prefix
-    end
-  end
-end
-
-
 module TwoWaySQL
 
   class Context
@@ -157,24 +147,13 @@ module TwoWaySQL
   end
 
 
-  class SubstitutionNode < Node
+  class BindVariableNode < Node
     def initialize(exp)
       @exp = exp
     end
     def accept(ctx)
-      if @exp.start_with?('$')
-        embed_value(ctx)
-      else
-        substitute(ctx)
-      end
-    end
-    def substitute(ctx)
       ctx.add_value(do_eval(ctx, @exp))
     end
-    def embed_value(ctx)
-      result = do_eval(ctx, @exp[1..-1])
-      ctx.add_sql(result) unless result.nil?
-    end
   end
 
 
@@ -188,7 +167,7 @@ module TwoWaySQL
   end
 
 
-  class ParenSubstitutionNode < Node
+  class ParenBindVariableNode < Node
     def initialize(exp)
       @exp = exp
     end
@@ -210,6 +189,17 @@ module TwoWaySQL
   end
 
 
+  class EmbedVariableNode < Node
+    def initialize(exp)
+      @exp = exp
+    end
+    def accept(ctx)
+      result = do_eval(ctx, @exp)
+      ctx.add_sql(result) unless result.nil?
+    end
+  end
+
+
   class LiteralNode < Node
     def initialize(val)
       @val = val

data/lib/twowaysql/parser.rb

@@ -11,7 +11,7 @@ module TwoWaySQL
 
   class Parser < Racc::Parser
 
-module_eval <<'..end lib/twowaysql/parser.y modeval..id42b80b1728', 'lib/twowaysql/parser.y', 128
+module_eval <<'..end lib/twowaysql/parser.y modeval..id33db4a3791', 'lib/twowaysql/parser.y', 138
 
 require 'strscan'
 
@@ -29,18 +29,20 @@ def initialize(opts={})
   @num_questions = 0
 end
 
-BEGIN_SUBSTITUTION          = '(\/|\#)\*([^\*]+)\*\1'
-PAREN_EXAMPLE               = '\([^\)]+\)'
-SUBSTITUTION_PATTERN        = /\A#{BEGIN_SUBSTITUTION}\s*/
-PAREN_SUBSTITUTION_PATTERN  = /\A#{BEGIN_SUBSTITUTION}\s*#{PAREN_EXAMPLE}/
+
+PAREN_EXAMPLE                = '\([^\)]+\)'
+BEGIN_BIND_VARIABLE          = '(\/|\#)\*([^\*]+)\*\1'
+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/
-QUOTED_STRING_PATTERN = /\A(\'(?:[^\']+|\'\')*\')/   ## quoted string
+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+)/
-OR_PATTERN            = /\A(\s*OR\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\?/
@@ -54,7 +56,7 @@ UNMATCHED_COMMENT_START_PATTERN = /\A(?:(?:\/|\#)\*)/
 
 def parse( io )
   @q = []
-  io.each do |line|
+  io.each_line do |line|
     s = StringScanner.new(line.rstrip)
     until s.eos? do
       case
@@ -80,18 +82,20 @@ def parse( io )
         @q.push [ s[2].intern, nil ]
       when s.scan(CONDITIONAL_PATTERN)
         @q.push [ s[2].intern, s[3] ]
-      when s.scan(PAREN_SUBSTITUTION_PATTERN)
-        @q.push [ :PAREN_SUBSTITUTION, s[2] ]
-      when s.scan(SUBSTITUTION_PATTERN)
-        @q.push [ :SUBSTITUTION, s[2] ]
-      when s.scan(QUOTED_STRING_PATTERN)
-        @q.push [ :QUOTED, s[1] ]
+      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 [ :CHARS, s[1] ]
+        @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 [ :CHARS, s[1] ]
+        @q.push [ :IDENT, s[1] ]
       when s.scan(SEMICOLON_AT_INPUT_END_PATTERN)
         #drop semicolon at input end
       else
@@ -111,104 +115,109 @@ end
 def next_token
   @q.shift
 end
-..end lib/twowaysql/parser.y modeval..id42b80b1728
+..end lib/twowaysql/parser.y modeval..id33db4a3791
 
 ##### racc 1.4.5 generates ###
 
 racc_reduce_table = [
  0, 0, :racc_error,
- 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_26,
+ 1, 21, :_reduce_1,
+ 0, 22, :_reduce_2,
+ 2, 22, :_reduce_3,
  1, 23, :_reduce_none,
- 2, 30, :_reduce_28,
- 3, 30, :_reduce_29,
- 2, 30, :_reduce_30,
- 3, 30, :_reduce_31,
- 1, 30, :_reduce_32 ]
-
-racc_reduce_n = 33
-
-racc_shift_n = 44
+ 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
 
 racc_action_table = [
-     9,    36,    14,    43,    17,    19,    21,    22,    23,     4,
-     6,     8,    11,    13,    15,    16,    18,     9,    24,    14,
-     3,    17,    19,    21,    22,    23,     4,     6,     8,    11,
-    13,    15,    16,    18,     9,   nil,    14,   nil,    17,    19,
-    21,    22,    23,     4,     6,     8,    11,    13,    15,    16,
-    18,     9,   nil,    14,   nil,    17,    19,    21,    22,    23,
-     4,     6,     8,    11,    13,    15,    16,    18,     9,    35,
-    14,   nil,    17,    19,    21,    22,    23,     4,     6,     8,
-    11,    13,    15,    16,    18,    32,    33,    34,    27,    29,
-    27,    29,    40,    41 ]
+     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 ]
 
 racc_action_check = [
-    39,    26,    39,    37,    39,    39,    39,    39,    39,    39,
-    39,    39,    39,    39,    39,    39,    39,     2,     3,     2,
-     1,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,    38,   nil,    38,   nil,    38,    38,
-    38,    38,    38,    38,    38,    38,    38,    38,    38,    38,
-    38,    31,   nil,    31,   nil,    31,    31,    31,    31,    31,
-    31,    31,    31,    31,    31,    31,    31,    31,    25,    25,
-    25,   nil,    25,    25,    25,    25,    25,    25,    25,    25,
-    25,    25,    25,    25,    25,    16,    16,    16,    36,    36,
-    14,    14,    34,    34 ]
+     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 ]
 
 racc_action_pointer = [
-   nil,    20,    15,    18,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    84,   nil,    77,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    66,    -4,   nil,   nil,   nil,
-   nil,    49,   nil,   nil,    84,   nil,    82,     0,    32,    -2,
-   nil,   nil,   nil,   nil ]
+   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 ]
 
 racc_action_default = [
-    -2,   -33,    -1,   -33,   -21,    -3,   -22,    -4,   -23,    -2,
-    -5,   -24,    -6,   -25,    -2,   -26,   -33,   -18,   -32,   -19,
-   -27,   -16,   -17,   -20,    44,   -33,   -10,    -2,   -11,    -2,
-   -12,   -13,   -30,   -28,   -33,    -7,    -2,   -33,   -14,   -15,
-   -31,   -29,    -9,    -8 ]
+    -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 ]
 
 racc_goto_table = [
-     2,    26,     1,    37,   nil,   nil,   nil,   nil,   nil,    25,
+     1,     2,    41,    28,   nil,   nil,   nil,    26,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    42,   nil,   nil,   nil,    38,   nil,    39 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    42,
+    43,    47 ]
 
 racc_goto_check = [
-     2,     7,     1,     8,   nil,   nil,   nil,   nil,   nil,     2,
+     2,     1,     8,     7,   nil,   nil,   nil,     2,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,     7,   nil,   nil,   nil,     2,   nil,     2 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     2,
+     2,     7 ]
 
 racc_goto_pointer = [
-   nil,     2,     0,   nil,   nil,   nil,   nil,   -13,   -23,   nil,
-   nil,   nil ]
+   nil,     1,     0,   nil,   nil,   nil,   nil,    -9,   -26,   nil,
+   nil,   nil,   nil ]
 
 racc_goto_default = [
-   nil,   nil,    31,     5,     7,    10,    12,   nil,   nil,    28,
-    30,    20 ]
+   nil,   nil,    27,     5,     8,    10,    13,   nil,   nil,    31,
+    32,    21,    23 ]
 
 racc_token_table = {
  false => 0,
@@ -219,8 +228,8 @@ racc_token_table = {
  :ELSE => 5,
  :AND => 6,
  :OR => 7,
- :CHARS => 8,
- :QUOTED => 9,
+ :IDENT => 8,
+ :STRING_LITERAL => 9,
  :SPACES => 10,
  :COMMA => 11,
  :LPAREN => 12,
@@ -228,12 +237,13 @@ racc_token_table = {
  :QUESTION => 14,
  :ACTUAL_COMMENT => 15,
  :EOL => 16,
- :SUBSTITUTION => 17,
- :PAREN_SUBSTITUTION => 18 }
+ :BIND_VARIABLE => 17,
+ :PAREN_BIND_VARIABLE => 18,
+ :EMBED_VARIABLE => 19 }
 
 racc_use_result_var = true
 
-racc_nt_base = 19
+racc_nt_base = 20
 
 Racc_arg = [
  racc_action_table,
@@ -260,8 +270,8 @@ Racc_token_to_s_table = [
 'ELSE',
 'AND',
 'OR',
-'CHARS',
-'QUOTED',
+'IDENT',
+'STRING_LITERAL',
 'SPACES',
 'COMMA',
 'LPAREN',
@@ -269,8 +279,9 @@ Racc_token_to_s_table = [
 'QUESTION',
 'ACTUAL_COMMENT',
 'EOL',
-'SUBSTITUTION',
-'PAREN_SUBSTITUTION',
+'BIND_VARIABLE',
+'PAREN_BIND_VARIABLE',
+'EMBED_VARIABLE',
 '$start',
 'sql',
 'stmt_list',
@@ -282,7 +293,8 @@ Racc_token_to_s_table = [
 'else_stmt',
 'and_stmt',
 'or_stmt',
-'substitution']
+'bind_var',
+'embed_var']
 
 Racc_debug_parser = false
 
@@ -445,37 +457,53 @@ module_eval <<'.,.,', 'lib/twowaysql/parser.y', 100
 
  # reduce 27 omitted
 
-module_eval <<'.,.,', 'lib/twowaysql/parser.y', 106
-  def _reduce_28( val, _values, result )
-                  result = SubstitutionNode.new( val[0] )
-   result
-  end
-.,.,
+ # reduce 28 omitted
 
-module_eval <<'.,.,', 'lib/twowaysql/parser.y', 110
+module_eval <<'.,.,', 'lib/twowaysql/parser.y', 107
   def _reduce_29( val, _values, result )
-                  result = SubstitutionNode.new( val[0] )
+                  result = BindVariableNode.new( val[0] )
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/twowaysql/parser.y', 114
+module_eval <<'.,.,', 'lib/twowaysql/parser.y', 111
   def _reduce_30( val, _values, result )
-                  result = SubstitutionNode.new( val[0] )
+                  result = BindVariableNode.new( val[0] )
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/twowaysql/parser.y', 118
+module_eval <<'.,.,', 'lib/twowaysql/parser.y', 115
   def _reduce_31( val, _values, result )
-                  result = SubstitutionNode.new( val[0] )
+                  result = BindVariableNode.new( val[0] )
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/twowaysql/parser.y', 122
+module_eval <<'.,.,', 'lib/twowaysql/parser.y', 119
   def _reduce_32( val, _values, result )
-                  result = ParenSubstitutionNode.new( val[0] )
+                  result = BindVariableNode.new( val[0] )
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'lib/twowaysql/parser.y', 123
+  def _reduce_33( val, _values, result )
+                  result = ParenBindVariableNode.new( val[0] )
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'lib/twowaysql/parser.y', 128
+  def _reduce_34( val, _values, result )
+                  result = EmbedVariableNode.new( val[0] )
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'lib/twowaysql/parser.y', 132
+  def _reduce_35( val, _values, result )
+                  result = EmbedVariableNode.new( val[0] )
    result
   end
 .,.,

data/lib/twowaysql/parser.y

@@ -53,11 +53,11 @@ or_stmt        : OR stmt_list
                   result = SubStatementNode.new( val[0], val[1] )
                 }
 
-primary        : CHARS
+primary        : IDENT
                 {
                   result = LiteralNode.new( val[0] )
                 }
-               | QUOTED
+               | STRING_LITERAL
                 {
                   result = LiteralNode.new( val[0] )
                 }
@@ -98,27 +98,37 @@ primary        : CHARS
                 {
                   result = EolNode.new
                 }
-               | substitution
+               | bind_var
+               | embed_var
 
-substitution   : SUBSTITUTION QUOTED
+bind_var       : BIND_VARIABLE STRING_LITERAL
                 {
-                  result = SubstitutionNode.new( val[0] )
+                  result = BindVariableNode.new( val[0] )
                 }
-               | SUBSTITUTION SPACES QUOTED
+               | BIND_VARIABLE SPACES STRING_LITERAL
                 {
-                  result = SubstitutionNode.new( val[0] )
+                  result = BindVariableNode.new( val[0] )
                 }
-               | SUBSTITUTION CHARS
+               | BIND_VARIABLE IDENT
                 {
-                  result = SubstitutionNode.new( val[0] )
+                  result = BindVariableNode.new( val[0] )
                 }
-               | SUBSTITUTION SPACES CHARS
+               | BIND_VARIABLE SPACES IDENT
                 {
-                  result = SubstitutionNode.new( val[0] )
+                  result = BindVariableNode.new( val[0] )
                 }
-               | PAREN_SUBSTITUTION
+               | PAREN_BIND_VARIABLE
                 {
-                  result = ParenSubstitutionNode.new( val[0] )
+                  result = ParenBindVariableNode.new( val[0] )
+                }
+
+embed_var      : EMBED_VARIABLE IDENT
+                {
+                  result = EmbedVariableNode.new( val[0] )
+                }
+               | EMBED_VARIABLE SPACES IDENT
+                {
+                  result = EmbedVariableNode.new( val[0] )
                 }
 
 end
@@ -142,18 +152,20 @@ def initialize(opts={})
   @num_questions = 0
 end
 
-BEGIN_SUBSTITUTION          = '(\/|\#)\*([^\*]+)\*\1'
-PAREN_EXAMPLE               = '\([^\)]+\)'
-SUBSTITUTION_PATTERN        = /\A#{BEGIN_SUBSTITUTION}\s*/
-PAREN_SUBSTITUTION_PATTERN  = /\A#{BEGIN_SUBSTITUTION}\s*#{PAREN_EXAMPLE}/
+
+PAREN_EXAMPLE                = '\([^\)]+\)'
+BEGIN_BIND_VARIABLE          = '(\/|\#)\*([^\*]+)\*\1'
+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/
-QUOTED_STRING_PATTERN = /\A(\'(?:[^\']+|\'\')*\')/   ## quoted string
+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+)/
-OR_PATTERN            = /\A(\s*OR\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\?/
@@ -167,7 +179,7 @@ UNMATCHED_COMMENT_START_PATTERN = /\A(?:(?:\/|\#)\*)/
 
 def parse( io )
   @q = []
-  io.each do |line|
+  io.each_line do |line|
     s = StringScanner.new(line.rstrip)
     until s.eos? do
       case
@@ -193,18 +205,20 @@ def parse( io )
         @q.push [ s[2].intern, nil ]
       when s.scan(CONDITIONAL_PATTERN)
         @q.push [ s[2].intern, s[3] ]
-      when s.scan(PAREN_SUBSTITUTION_PATTERN)
-        @q.push [ :PAREN_SUBSTITUTION, s[2] ]
-      when s.scan(SUBSTITUTION_PATTERN)
-        @q.push [ :SUBSTITUTION, s[2] ]
-      when s.scan(QUOTED_STRING_PATTERN)
-        @q.push [ :QUOTED, s[1] ]
+      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 [ :CHARS, s[1] ]
+        @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 [ :CHARS, s[1] ]
+        @q.push [ :IDENT, s[1] ]
       when s.scan(SEMICOLON_AT_INPUT_END_PATTERN)
         #drop semicolon at input end
       else

data/lib/twowaysql/version.rb

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

data/spec/large_sql_spec.rb

@@ -21,7 +21,7 @@ FROM
     ON i.id = h.item_id
 
 /*BEGIN*/WHERE
-  /*IF ctx[:name] */AND i.name ILIKE /*ctx[:name]*/'hoge%'/*END*/
+  /*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)/*END*/
   /*IF ctx[:ignore_status] */AND h.status NOT IN /*ctx[:ignore_status]*/(4, 9)/*END*/
@@ -139,4 +139,38 @@ EOS
     end
   end
 
+
+
+  describe "bugfix: case insensitive match for SQL reserved words" do
+    before do
+      sql = <<-EOS
+select
+  *
+from
+  hoge
+/*BEGIN*/where
+  /*IF ctx[:name] */name like /*ctx[:name]*/'hoge%'/*END*/
+  /*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])
+    end
+
+    it "sql" do
+      expected = <<-EOS
+select
+  *
+from
+  hoge
+where
+  
+  id in (?, ?)
+
+EOS
+      @result.sql.should == expected
+      @result.bound_variables.should == [10, 11]
+    end
+  end
+
 end

data/spec/spec_helper.rb

@@ -8,3 +8,36 @@ end
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'twowaysql'
+
+
+
+## workaround for RSpec with ruby 1.9 cause 'wrong argument type Proc (expected Binding) (TypeError)'
+#
+# before:
+#   params[:spec_path] = eval("caller(0)[1]", example_group_block) unless params[:spec_path]
+# after:
+#   params[:spec_path] = eval("caller(0)[1]", example_group_block.binding) unless params[:spec_path]
+#
+module Spec::Example::ExampleGroupMethods
+
+      def describe(*args, &example_group_block)
+        args << {} unless Hash === args.last
+        if example_group_block
+          params = args.last
+          params[:spec_path] = eval("caller(0)[1]", example_group_block.binding) unless params[:spec_path]
+          if params[:shared]
+            SharedExampleGroup.new(*args, &example_group_block)
+          else
+            self.subclass("Subclass") do
+              describe(*args)
+              module_eval(&example_group_block)
+            end
+          end
+        else
+          set_description(*args)
+          before_eval
+          self
+        end
+      end
+
+end

data/tasks/deployment.rake

@@ -38,6 +38,7 @@ namespace :manifest do
                         /^doc/,
                         /^website/,
                         /^\.git/,
+                        /.*\.output/
                        ]
 
     files = Dir.glob(glob_pattern).delete_if do |fname|

data/tasks/ditz.rake

@@ -1,8 +1,5 @@
-namespace :ditz do
-
-  desc 'generate html report'
-  task :html do
-    `ditz -i issues html website/issues`
-  end
-
+desc 'generate Ditz html report'
+task :ditz_report do
+  puts 'generate ditz report'
+  `ditz -i issues html website/issues`
 end

data/tasks/website.rake

@@ -1,5 +1,5 @@
 desc 'Generate website files'
-task :website_generate => :ruby_env do
+task :website_generate => [:ruby_env,: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.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Takuto Wada
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-05 00:00:00 +09:00
+date: 2008-09-08 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,11 +42,16 @@ files:
 - Rakefile
 - config/hoe.rb
 - config/requirements.rb
+- issues/issue-1cee7e821865a216674832b0186bd92792680571.yaml
 - issues/issue-25efcfc383f3b0f6c0e2730ae7c2975bb2b3de26.yaml
 - issues/issue-39023ea09e17e2d64bcef03aa59cdfe38b78ad5b.yaml
 - issues/issue-4bc308d55ae91f266e656162a4147d356de1166c.yaml
+- issues/issue-5c973ef5bb074eacca0c6c84f7d27c4267773ea8.yaml
+- issues/issue-664986b219202ff1948cab717b56e7540f493561.yaml
 - issues/issue-897995fa10377eabdf597e8e7692f17087c76923.yaml
+- issues/issue-901f65630639507c8b05b466790e9f22256c6450.yaml
 - issues/issue-bd38c1cdc965d73dd629a81db2de1bcdcf4b10b8.yaml
+- issues/issue-dca4b19aa13de59838b33e03252bf824670a2d12.yaml
 - issues/issue-f2b773020b54f839c03d899b38b5113c8fd991df.yaml
 - issues/issue-f39b907d01d7fa93df8c7a9de2e1b5e27727ee0a.yaml
 - issues/issue-f64d73ed4f9854f1ded77e6496dbf59cfb3770a7.yaml