oedipus 0.0.9 → 0.0.10

data/ext/oedipus/lexing.c

@@ -0,0 +1,96 @@
+/*-- encoding: utf-8 --*/
+
+/*
+ * Oedipus Sphinx 2 Search.
+ * Copyright © 2012 Chris Corbyn.
+ *
+ * See LICENSE file for details.
+ */
+
+#include "lexing.h"
+
+/* WARNING: Complex pointer (but fast) arithmetic in here... avert your eyes */
+
+int odp_scan_until_char(char stop, char ** sql_ptr, char ** dest_ptr, unsigned long len) {
+  char * end = *sql_ptr + len;
+
+  for (; *sql_ptr < end; ++(*sql_ptr)) {
+    *((*dest_ptr)++) = **sql_ptr;
+
+    if (**sql_ptr == '\\') {
+      if (*sql_ptr < end) {
+        *((*dest_ptr)++) = *(++(*sql_ptr)); // consume char following escape
+      }
+    } else if (**sql_ptr == stop) {
+      return 1;
+    }
+  }
+
+  return 0;
+}
+
+int odp_scan_multi_line_comment(char ** sql_ptr, char ** dest_ptr, unsigned long len) {
+  char * end = *sql_ptr + len;
+
+  for (; *sql_ptr < end; ++(*sql_ptr)) {
+    *((*dest_ptr)++) = **sql_ptr;
+
+    if (**sql_ptr == '*') {
+      if ((*sql_ptr < end) && (*((*dest_ptr)++) = *(++(*sql_ptr))) == '/') {
+        return 1;
+      }
+    }
+  }
+
+  return 0;
+}
+
+int odp_scan_until_marker(char ** sql_ptr, char ** dest_ptr, long len) {
+  char * end = *sql_ptr + len;
+  char   c;
+
+  for (; *sql_ptr < end; ++(*sql_ptr)) {
+    c = **sql_ptr;
+    *((*dest_ptr)++) = c;
+
+    switch (c) {
+    case '\\':
+      if (*sql_ptr < end) {
+        *((*dest_ptr)++) = *(++(*sql_ptr));
+      }
+      break;
+    case '\'':
+      ++(*sql_ptr);
+      odp_scan_until_char('\'', sql_ptr, dest_ptr, end - *sql_ptr);
+      break;
+    case '"':
+      ++(*sql_ptr);
+      odp_scan_until_char('"', sql_ptr, dest_ptr, end - *sql_ptr);
+      break;
+    case '/':
+      if ((*sql_ptr < end) && *(*sql_ptr + 1) == '*') {
+        *((*dest_ptr)++) = *(++(*sql_ptr)); // consume '*' following '/'
+        ++(*sql_ptr);
+        odp_scan_multi_line_comment(sql_ptr, dest_ptr, end - *sql_ptr);
+      }
+      break;
+    case '#':
+      ++(*sql_ptr);
+      odp_scan_until_char('\n', sql_ptr, dest_ptr, end - *sql_ptr);
+      break;
+    case '-':
+      // FIXME: This shouldn't really work for things like ------ comment
+      if (((*sql_ptr + 1) < end) && *(*sql_ptr + 1) == '-' && *(*sql_ptr + 2) == ' ') {
+        ++(*sql_ptr);
+        odp_scan_until_char('\n', sql_ptr, dest_ptr, end - *sql_ptr);
+      }
+      break;
+    case '?':
+      ++(*sql_ptr);  // discard
+      --(*dest_ptr); // unconsume
+      return 1;
+    }
+  }
+
+  return 0;
+}

data/ext/oedipus/lexing.h

@@ -0,0 +1,17 @@
+/*-- encoding: utf-8 --*/
+
+/*
+ * Oedipus Sphinx 2 Search.
+ * Copyright © 2012 Chris Corbyn.
+ *
+ * See LICENSE file for details.
+ */
+
+/*! Consume input from the string pointed to by sql_ptr, into the string pointed to by dest_ptr, until stop is reached (inclusive) */
+int odp_scan_until_char(char stop, char ** sql_ptr, char ** dest_ptr, unsigned long len);
+
+/*! Consume input from the string pointed to by sql_ptr, into the string pointed to by dest_ptr, until the end of a multi-line comment is reached (inclusive)  */
+int odp_scan_multi_line_comment(char ** sql_ptr, char ** dest_ptr, unsigned long len);
+
+/*! Consume input from the string pointed to by sql_ptr, into the string pointed to by dest_ptr, until '?' is found */
+int odp_scan_until_marker(char ** sql_ptr, char ** dest_ptr, long len);

data/ext/oedipus/oedipus.c

@@ -8,6 +8,7 @@
  */
 
 #include "oedipus.h"
+#include "lexing.h"
 
 /* -- Public methods -- */
 
@@ -190,47 +191,71 @@ static void odp_free(OdpMysql * conn) {
 }
 
 static VALUE odp_replace_bind_values(OdpMysql * conn, VALUE sql, VALUE * bind_values, int num_values) {
-  int           i;
-  VALUE         v;
-  VALUE         q;
-  VALUE         idx;
-
-  q   = rb_str_new("?", 1);
-  sql = rb_funcall(sql, rb_intern("dup"), 0);
+  // FIXME: Refactor this whole method, somehow... use a struct instead of a gazillion variables, so other functions can be called
+  char          * sql_str;
+  unsigned long   sql_len;
+  char          * str_values[num_values];
+  unsigned long   escaped_value_lengths[num_values];
+  unsigned long   escaped_sql_len;
+  int             i;
 
-  // FIXME: Do a real lexical scan of the string, to avoid replacing '?' inside comments/strings
+  sql_str         = RSTRING_PTR(sql);
+  sql_len         = strlen(sql_str);
+  escaped_sql_len = sql_len;
 
   for (i = 0; i < num_values; ++i) {
-    if ((idx = rb_funcall(sql, rb_intern("index"), 1, q)) == Qnil) {
-      break;
+    if (T_STRING == TYPE(bind_values[i])) {
+      str_values[i] = RSTRING_PTR(bind_values[i]);
+    } else if (ODP_KIND_OF_P(bind_values[i], rb_cNumeric) && !(ODP_KIND_OF_P(bind_values[i], rb_cInteger))) {
+      str_values[i] = RSTRING_PTR(ODP_TO_S(ODP_TO_F(bind_values[i])));
+    } else {
+      str_values[i] = RSTRING_PTR(ODP_TO_S(bind_values[i]));
     }
 
-    v = bind_values[i];
+    escaped_value_lengths[i] = (strlen(str_values[i]) * 2 + 3);
+    escaped_sql_len          += escaped_value_lengths[i];
+  }
+
+  {
+    char   escaped_sql_str[escaped_sql_len];
+    char * sql_end;
+    char * dest;
 
-    if (ODP_KIND_OF_P(v, rb_cInteger)) {
-      ODP_STR_SUB(sql, idx, ODP_TO_S(v));
-    } else if (ODP_KIND_OF_P(v, rb_cNumeric)) {
-      ODP_STR_SUB(sql, idx, ODP_TO_S(ODP_TO_F(v)));
-    } else {
-      if (T_STRING != TYPE(v)) {
-        v = ODP_TO_S(v);
-      }
+    sql_end = sql_str + sql_len;
+    dest    = escaped_sql_str;
+
+    for (i = 0; i < num_values; ++i) {
+      char * str = str_values[i];
+      char   len = strlen(str);
+      long   pos = 0;
 
-      {
-        char          * v_ptr = RSTRING_PTR(v);
-        unsigned long   v_len = strlen(v_ptr);
+      if (!(odp_scan_until_marker(&sql_str, &dest, sql_end - sql_str))) {
+        break;
+      }
 
-        char escaped_str [v_len * 2 + 1];
-        char quoted_str  [v_len * 2 + 3];
+      if (T_STRING == TYPE(bind_values[i])) {
+        char escaped_str[escaped_value_lengths[i]];
+        char quoted_str[escaped_value_lengths[i]];
 
-        mysql_real_escape_string(conn->ptr, escaped_str, v_ptr, v_len);
+        mysql_real_escape_string(conn->ptr, escaped_str, str, len);
         sprintf(quoted_str, "'%s'", escaped_str);
-        ODP_STR_SUB(sql, idx, rb_str_new2(quoted_str));
+
+        str = quoted_str;
+        len = strlen(quoted_str);
+      }
+
+      for (pos = 0; pos < len; ++pos) {
+        *(dest++) = str[pos];
       }
     }
-  }
 
-  return sql;
+    // copy remainder
+    for (; sql_str < sql_end; ++sql_str) {
+      *(dest++) = *sql_str;
+    }
+
+    return rb_str_new(escaped_sql_str, dest - escaped_sql_str);
+  }
 }
 
 static VALUE odp_cast_value(MYSQL_FIELD f, char * v, unsigned long len) {

data/ext/oedipus/oedipus.h

@@ -14,7 +14,6 @@
 #define ODP_TO_S(v)                  rb_funcall(v, rb_intern("to_s"), 0)
 #define ODP_TO_F(n)                  rb_funcall(n, rb_intern("to_f"), 0)
 #define ODP_KIND_OF_P(v, type)       (rb_funcall(v, rb_intern("kind_of?"), 1, type) == Qtrue)
-#define ODP_STR_SUB(s, pos, replace) rb_funcall(s, rb_intern("[]="), 2, pos, replace)
 
 /*! Internal struct used to reference a mysql connection */
 typedef struct {

data/lib/oedipus/version.rb

@@ -8,5 +8,5 @@
 ##
 
 module Oedipus
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/spec/integration/connection_spec.rb

@@ -120,5 +120,20 @@ describe Oedipus::Connection do
     it "accepts string bind parameters" do
       conn.execute("REPLACE INTO posts_rt (id, title) VALUES (?, ?)", 1, "an example with `\"this (quoted) string\\'")
     end
+
+    it "doesn't confuse bind parameters in replacements" do
+      conn.execute("REPLACE INTO posts_rt (id, title, body) VALUES (?, ?, ?)", 1, "question?", "I think not")
+    end
+
+    it "ignores bind markers inside strings" do
+      conn.execute("REPLACE INTO posts_rt (id, title, state, body) VALUES (?, 'question?', 'other?', ?)", 1, "I think not")
+    end
+
+    it "ignores bind markers inside comments" do
+      conn.execute <<-SQL, 1, "A string"
+      /* is this a comment? *//* another comment ? */
+      REPLACE INTO posts_rt (id, title) VALUES (?, ?)
+      SQL
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oedipus
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-05 00:00:00.000000000 Z
+date: 2012-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &20663420 !ruby/object:Gem::Requirement
+  requirement: &27993880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20663420
+  version_requirements: *27993880
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &20662600 !ruby/object:Gem::Requirement
+  requirement: &27993440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20662600
+  version_requirements: *27993440
 description: ! "== Sphinx 2 Comes to Ruby\n\nOedipus brings full support for Sphinx
   2 to Ruby:\n\n  - real-time indexes (insert, replace, update, delete)\n  - faceted
   search (variations on a base query)\n  - multi-queries (multiple queries executed
@@ -53,6 +53,8 @@ files:
 - README.md
 - Rakefile
 - ext/oedipus/extconf.rb
+- ext/oedipus/lexing.c
+- ext/oedipus/lexing.h
 - ext/oedipus/oedipus.c
 - ext/oedipus/oedipus.h
 - lib/oedipus.rb
@@ -109,7 +111,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -658671341905469446
+      hash: 4192034159208166427
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -118,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -658671341905469446
+      hash: 4192034159208166427
 requirements: []
 rubyforge_project: oedipus
 rubygems_version: 1.8.11