oedipus 0.0.11 → 0.0.12

data/ext/oedipus/lexing.h

@@ -7,6 +7,9 @@
  * See LICENSE file for details.
  */
 
+/*! Scans the entire string pointed to by src into the string pointed to by dest, advancing both pointers */
+int odp_scan_move_pointers(char ** src, char ** dest, long len);
+
 /*! 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);
 

data/ext/oedipus/oedipus.c

@@ -190,6 +190,16 @@ static void odp_free(OdpMysql * conn) {
   free(conn);
 }
 
+int odp_scan_move_pointers(char ** src, char ** dest, long len) {
+  char * end = *src + len;
+
+  for (; *src < end; ++(*src)) {
+    *((*dest)++) = **src;
+  }
+
+  return 1;
+}
+
 static VALUE odp_replace_bind_values(OdpMysql * conn, VALUE sql, VALUE * bind_values, int num_values) {
   // FIXME: Refactor this whole method, somehow... use a struct instead of a gazillion variables, so other functions can be called
   char          * sql_str;
@@ -217,7 +227,7 @@ static VALUE odp_replace_bind_values(OdpMysql * conn, VALUE sql, VALUE * bind_va
   }
 
   {
-    char   escaped_sql_str[escaped_sql_len];
+    char   escaped_sql_str[escaped_sql_len]; // FIXME: Possibly use the heap
     char * sql_end;
     char * dest;
 
@@ -226,33 +236,32 @@ static VALUE odp_replace_bind_values(OdpMysql * conn, VALUE sql, VALUE * bind_va
 
     for (i = 0; i < num_values; ++i) {
       char * str = str_values[i];
-      char   len = strlen(str);
-      long   pos = 0;
+      long   len = strlen(str);
 
       if (!(odp_scan_until_marker(&sql_str, &dest, sql_end - sql_str))) {
         break;
       }
 
       if (!(ODP_KIND_OF_P(bind_values[i], rb_cNumeric))) {
-        char escaped_str[escaped_value_lengths[i]];
-        char quoted_str[escaped_value_lengths[i]];
+        // would prefer to use stack allocation, but it segfaults with larger (megabytes) values
+        char * escaped_str = (char *) malloc(escaped_value_lengths[i]);
+        char * quoted_str  = (char *) malloc(escaped_value_lengths[i]);
 
         mysql_real_escape_string(conn->ptr, escaped_str, str, len);
         sprintf(quoted_str, "'%s'", escaped_str);
-
         str = quoted_str;
-        len = strlen(quoted_str);
-      }
 
-      for (pos = 0; pos < len; ++pos) {
-        *(dest++) = str[pos];
+        odp_scan_move_pointers(&str, &dest, strlen(str));
+
+        free(quoted_str);
+        free(escaped_str);
+      } else {
+        odp_scan_move_pointers(&str, &dest, len);
       }
     }
 
     // copy remainder
-    for (; sql_str < sql_end; ++sql_str) {
-      *(dest++) = *sql_str;
-    }
+    odp_scan_move_pointers(&sql_str, &dest, sql_end - sql_str);
 
     return rb_str_new(escaped_sql_str, dest - escaped_sql_str);
   }

data/lib/oedipus/version.rb

@@ -8,5 +8,5 @@
 ##
 
 module Oedipus
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

data/spec/integration/connection_spec.rb

@@ -139,5 +139,9 @@ describe Oedipus::Connection do
     it "handles nil" do
       conn.execute("REPLACE INTO posts_rt (id, title, state, body) VALUES (?, 'question?', 'other?', ?)", 1, nil)
     end
+
+    it "handles really long strings" do
+      conn.execute("REPLACE INTO posts_rt (id, title, state, body) VALUES (?, 'question?', 'other?', ?)", 1, 'a' * 2_000_000)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oedipus
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &10245200 !ruby/object:Gem::Requirement
+  requirement: &19781180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10245200
+  version_requirements: *19781180
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &10244200 !ruby/object:Gem::Requirement
+  requirement: &19780720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10244200
+  version_requirements: *19780720
 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
@@ -111,7 +111,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3872912040138826603
+      hash: -3179225269925894902
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3872912040138826603
+      hash: -3179225269925894902
 requirements: []
 rubyforge_project: oedipus
 rubygems_version: 1.8.11