rdo 0.1.7 → 0.1.8

data/README.md

@@ -277,6 +277,16 @@ This method returns nil if there are no rows, so if you need to distinguish
 between NULL and no rows, you will need to check the result contents the
 longer way around.
 
+### Disambiguating bind markers from operators
+
+Some drivers use '?' for operators. In order to avoid ambiguity, escape such
+occurrences with a backslash. You **do not** need to escape inside of strings
+and comments (i.e. wherever a bind marker could not naturally occur).
+
+``` ruby
+conn.execute(%q{SELECT 'a=>42,b=>7'::hstore \? ?}, "a")
+```
+
 ### Debugging
 
 A Logger instance (with an interface like that in Ruby stdlib) may be passed

data/ext/rdo/rdo.c

@@ -95,6 +95,13 @@ static VALUE rdo_driver_interpolate(VALUE self, VALUE stmt, VALUE params) {
   // this loop is intentionally kept procedural (for performance)
   for (; *s; ++s, ++b) {
     switch (*s) {
+      case '\\':
+        if (!insquote && !indquote && !inmlcmt && !inslcmt && *(s + 1) == '?')
+          ++s;
+
+        *b = *s;
+        break;
+
       case '?':
         if (insquote || indquote || inmlcmt || inslcmt) {
           *b = *s;

data/lib/rdo/version.rb

@@ -6,5 +6,5 @@
 ##
 
 module RDO
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/spec/rdo/driver_spec.rb

@@ -84,6 +84,16 @@ describe RDO::Driver do
       end
     end
 
+    context "with escaped marks" do
+      it "does not treat them as bind markers" do
+        driver.send(
+          :interpolate,
+          %q{SELECT 'a=>42,b=>7'::hstore \? ?},
+          ["a"]
+        ).should == "SELECT 'a=>42,b=>7'::hstore ? 'a'"
+      end
+    end
+
     context "with marks placed inside single quotes" do
       it "ignores the quoted marks" do
         driver.send(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdo
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-24 00:00:00.000000000 Z
+date: 2012-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec