oedipus 0.0.8 → 0.0.9

data/ext/oedipus/oedipus.c

@@ -85,10 +85,15 @@ static VALUE odp_close(VALUE self) {
   return Qtrue;
 }
 
-static VALUE odp_execute(VALUE self, VALUE sql) {
+static VALUE odp_execute(int argc, VALUE * args, VALUE self) {
+  VALUE       sql;
   OdpMysql  * conn;
 
-  Check_Type(sql, T_STRING);
+  if (0 == argc) {
+    rb_raise(rb_eArgError, "Wrong number of arguments (0 for 1..*)");
+  }
+
+  Check_Type(args[0], T_STRING);
 
   Data_Get_Struct(self, OdpMysql, conn);
 
@@ -96,6 +101,8 @@ static VALUE odp_execute(VALUE self, VALUE sql) {
     odp_raise(self, "Cannot execute query on a closed connection");
   }
 
+  sql = odp_replace_bind_values(conn, args[0], &args[1], argc - 1);
+
   if (mysql_query(conn->ptr, RSTRING_PTR(sql))) {
     odp_raise(self, "Failed to execute statement(s)");
   }
@@ -103,7 +110,8 @@ static VALUE odp_execute(VALUE self, VALUE sql) {
   return INT2NUM(mysql_affected_rows(conn->ptr));
 }
 
-static VALUE odp_query(VALUE self, VALUE sql) {
+static VALUE odp_query(int argc, VALUE * args, VALUE self) {
+  VALUE           sql;
   OdpMysql      * conn;
   MYSQL_RES     * rs;
   int             status;
@@ -116,7 +124,11 @@ static VALUE odp_query(VALUE self, VALUE sql) {
   VALUE           hash;
   VALUE           results;
 
-  Check_Type(sql, T_STRING);
+  if (0 == argc) {
+    rb_raise(rb_eArgError, "Wrong number of arguments (0 for 1..*)");
+  }
+
+  Check_Type(args[0], T_STRING);
 
   Data_Get_Struct(self, OdpMysql, conn);
 
@@ -124,6 +136,8 @@ static VALUE odp_query(VALUE self, VALUE sql) {
     odp_raise(self, "Cannot execute query on a closed connection");
   }
 
+  sql = odp_replace_bind_values(conn, args[0], &args[1], argc - 1);
+
   if (mysql_query(conn->ptr, RSTRING_PTR(sql))) {
     odp_raise(self, "Failed to execute statement(s)");
   }
@@ -175,6 +189,50 @@ static void odp_free(OdpMysql * conn) {
   free(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: Do a real lexical scan of the string, to avoid replacing '?' inside comments/strings
+
+  for (i = 0; i < num_values; ++i) {
+    if ((idx = rb_funcall(sql, rb_intern("index"), 1, q)) == Qnil) {
+      break;
+    }
+
+    v = bind_values[i];
+
+    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);
+      }
+
+      {
+        char          * v_ptr = RSTRING_PTR(v);
+        unsigned long   v_len = strlen(v_ptr);
+
+        char escaped_str [v_len * 2 + 1];
+        char quoted_str  [v_len * 2 + 3];
+
+        mysql_real_escape_string(conn->ptr, escaped_str, v_ptr, v_len);
+        sprintf(quoted_str, "'%s'", escaped_str);
+        ODP_STR_SUB(sql, idx, rb_str_new2(quoted_str));
+      }
+    }
+  }
+
+  return sql;
+}
+
 static VALUE odp_cast_value(MYSQL_FIELD f, char * v, unsigned long len) {
   short  s;
   int    i;
@@ -225,16 +283,19 @@ static VALUE odp_cast_value(MYSQL_FIELD f, char * v, unsigned long len) {
 /* -- Extension initialization -- */
 
 void Init_oedipus(void) {
+  VALUE mOedipus;
+  VALUE cMysql;
+
   rb_require("bigdecimal");
 
-  VALUE mOedipus = rb_define_module("Oedipus");
-  VALUE cMysql   = rb_define_class_under(mOedipus, "Mysql", rb_cObject);
+  mOedipus = rb_define_module("Oedipus");
+  cMysql   = rb_define_class_under(mOedipus, "Mysql", rb_cObject);
 
   rb_define_method(cMysql, "initialize", odp_initialize, 2);
   rb_define_method(cMysql, "open",       odp_open,       0);
   rb_define_method(cMysql, "close",      odp_close,      0);
-  rb_define_method(cMysql, "execute",    odp_execute,    1);
-  rb_define_method(cMysql, "query",      odp_query,      1);
+  rb_define_method(cMysql, "execute",    odp_execute,   -1);
+  rb_define_method(cMysql, "query",      odp_query,     -1);
 
   rb_define_singleton_method(cMysql, "new",  odp_new, 2);
 }

data/ext/oedipus/oedipus.h

@@ -10,6 +10,12 @@
 #include <ruby.h>
 #include <mysql.h>
 
+// Macros for lazy fingers
+#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 {
   /*! Boolean representing the connected state */
@@ -33,13 +39,10 @@ static VALUE odp_open(VALUE self);
 static VALUE odp_close(VALUE self);
 
 /*! Execute an SQL non-read query and return the number of rows affected */
-static VALUE odp_execute(VALUE self, VALUE sql);
+static VALUE odp_execute(int argc, VALUE * args, VALUE self);
 
 /*! Execute several SQL read queries and return the result sets  */
-static VALUE odp_query(VALUE self, VALUE sql);
-
-/*! Cast the given field to a ruby data type */
-static VALUE odp_cast_value(MYSQL_FIELD f, char * v, unsigned long len);
+static VALUE odp_query(int argc, VALUE * args, VALUE self);
 
 /* -- Internal methods -- */
 
@@ -48,3 +51,9 @@ static void odp_raise(VALUE self, const char *msg);
 
 /*! Free memory allocated to mysql */
 static void odp_free(OdpMysql * conn);
+
+/*! Substitute all ? markers with the values in bind_values */
+static VALUE odp_replace_bind_values(OdpMysql * conn, VALUE sql, VALUE * bind_values, int num_values);
+
+/*! Cast the given field to a ruby data type */
+static VALUE odp_cast_value(MYSQL_FIELD f, char * v, unsigned long len);

data/lib/oedipus/comparison/between.rb

@@ -10,13 +10,8 @@
 module Oedipus
   # Between comparison of range.
   class Comparison::Between < Comparison
-    def to_s
-      [
-        "BETWEEN",
-        Connection.quote(v.first),
-        "AND",
-        Connection.quote(v.exclude_end? ? v.end - 1 : v.end)
-      ].join(" ")
+    def to_sql
+      ["BETWEEN ? AND ?", v.first, v.exclude_end? ? v.end - 1 : v.end]
     end
 
     def inverse

data/lib/oedipus/comparison/equal.rb

@@ -10,8 +10,8 @@
 module Oedipus
   # Equality comparison of value.
   class Comparison::Equal < Comparison
-    def to_s
-      "= #{Connection.quote(v)}"
+    def to_sql
+      ["= ?", v]
     end
 
     def inverse

data/lib/oedipus/comparison/gt.rb

@@ -10,8 +10,8 @@
 module Oedipus
   # Greater than comparison of +v+.
   class Comparison::GT < Comparison
-    def to_s
-      "> #{Connection.quote(v)}"
+    def to_sql
+      ["> ?", v]
     end
 
     def inverse

data/lib/oedipus/comparison/gte.rb

@@ -10,8 +10,8 @@
 module Oedipus
   # Greater than or equal comparison of +v+.
   class Comparison::GTE < Comparison
-    def to_s
-      ">= #{Connection.quote(v)}"
+    def to_sql
+      [">= ?", v]
     end
 
     def inverse

data/lib/oedipus/comparison/in.rb

@@ -10,8 +10,8 @@
 module Oedipus
   # IN comparison of +v+.
   class Comparison::In < Comparison
-    def to_s
-      "IN (#{v.map { |o| Connection.quote(o)}.join(', ')})"
+    def to_sql
+      ["IN (#{v.map{'?'}.join(', ')})", *v]
     end
 
     def inverse

data/lib/oedipus/comparison/lt.rb

@@ -10,8 +10,8 @@
 module Oedipus
   # Less than comparison of +v+.
   class Comparison::LT < Comparison
-    def to_s
-      "< #{Connection.quote(v)}"
+    def to_sql
+      ["< ?", v]
     end
 
     def inverse

data/lib/oedipus/comparison/lte.rb

@@ -10,8 +10,8 @@
 module Oedipus
   # Less than or equal comparison of +v+.
   class Comparison::LTE < Comparison
-    def to_s
-      "<= #{Connection.quote(v)}"
+    def to_sql
+      ["<= ?", v]
     end
 
     def inverse

data/lib/oedipus/comparison/not.rb

@@ -14,8 +14,8 @@ module Oedipus
       super(Comparison.of(v))
     end
 
-    def to_s
-      v.inverse.to_s
+    def to_sql
+      v.inverse.to_sql
     end
 
     def inverse

data/lib/oedipus/comparison/not_equal.rb

@@ -10,8 +10,8 @@
 module Oedipus
   # Negation comparison of value.
   class Comparison::NotEqual < Comparison
-    def to_s
-      "!= #{Connection.quote(v)}"
+    def to_sql
+      ["!= ?", v]
     end
 
     def inverse

data/lib/oedipus/comparison/not_in.rb

@@ -10,8 +10,8 @@
 module Oedipus
   # NOT IN comparison of +v+.
   class Comparison::NotIn < Comparison
-    def to_s
-      "NOT IN (#{v.map { |o| Connection.quote(o)}.join(', ')})"
+    def to_sql
+      ["NOT IN (#{v.map{'?'}.join(', ')})", *v]
     end
 
     def inverse

data/lib/oedipus/comparison/outside.rb

@@ -10,13 +10,8 @@
 module Oedipus
   # Outside comparison of range.
   class Comparison::Outside < Comparison
-    def to_s
-      [
-        "NOT BETWEEN",
-        Connection.quote(v.first),
-        "AND",
-        Connection.quote(v.exclude_end? ? v.end - 1 : v.end)
-      ].join(" ")
+    def to_sql
+      ["NOT BETWEEN ? AND ?", v.first, v.exclude_end? ? v.end - 1 : v.end]
     end
 
     def inverse

data/lib/oedipus/comparison.rb

@@ -77,12 +77,12 @@ module Oedipus
       raise NotImplementedError, "Comparison#inverse must be defined by subclasses"
     end
 
-    # Represent the comparison as a string.
+    # Represent the comparison as SQL arguments.
     #
-    # @return [String]
-    #   an expression to compare a LHS against v
-    def to_s
-      raise NotImplementedError, "Comparison#to_s must be defined by subclasses"
+    # @return [Array]
+    #   an SQL expression to compare a LHS against v
+    def to_sql
+      raise NotImplementedError, "Comparison#to_sql must be defined by subclasses"
     end
   end
 end

data/lib/oedipus/connection.rb

@@ -12,48 +12,6 @@ module Oedipus
   #
   # Currently this class wraps a native mysql extension.
   class Connection
-    class << self
-      # Quote a value (of any type) for use in SphinxQL.
-      #
-      # @param [Object] v
-      #   the value to quote
-      #
-      # @return [Object]
-      #   the safe value
-      #
-      # Note that single quotes are added to strings.
-      def quote(v)
-        require "bigdecimal" unless defined? BigDecimal
-        case v
-        when BigDecimal, Rational, Complex
-          v.to_f
-        when Numeric
-          v
-        else
-          "'#{escape_str(v.to_s)}'"
-        end
-      end
-
-      # Escape a string, without adding enclosing quotes.
-      #
-      # @param [String] str
-      #   the unsafe input string
-      #
-      # @return [String]
-      #   a safe string for use in SphinxQL
-      def escape_str(str)
-        str.gsub(/[\0\n\r\\\'\"\x1a]/) do |s|
-          case s
-          when "\0"   then "\\0"
-          when "\n"   then "\\n"
-          when "\r"   then "\\r"
-          when "\x1a" then "\\Z"
-          else "\\#{s}"
-          end
-        end
-      end
-    end
-
     # Instantiate a new Connection to a SphinxQL host.
     #
     # @param [String] server
@@ -99,12 +57,15 @@ module Oedipus
     # @param [String] sql
     #   one or more SphinxQL statements, separated by semicolons
     #
+    # @param [Object...] bind_values
+    #   values to be substituted in place of '?' in the query
+    #
     # @return [Array]
     #   an array of arrays, containing the returned records
     #
     # Note that SphinxQL does not support prepared statements.
-    def multi_query(sql)
-      @pool.acquire { |conn| conn.query(sql) }
+    def multi_query(sql, *bind_values)
+      @pool.acquire { |conn| conn.query(sql, *bind_values) }
     end
 
     # Execute a single read query.
@@ -112,12 +73,15 @@ module Oedipus
     # @param [String] sql
     #   a single SphinxQL statement
     #
+    # @param [Object...] bind_values
+    #   values to be substituted in place of '?' in the query
+    #
     # @return [Array]
     #   an array of Hashes containing the matched records
     #
     # Note that SphinxQL does not support prepared statements.
-    def query(sql)
-      @pool.acquire { |conn| conn.query(sql).first }
+    def query(sql, *bind_values)
+      @pool.acquire { |conn| conn.query(sql, *bind_values).first }
     end
 
     # Execute a non-read query.
@@ -125,12 +89,15 @@ module Oedipus
     # @param [String] sql
     #   a SphinxQL query, such as INSERT or REPLACE
     #
+    # @param [Object...] bind_values
+    #   values to be substituted in place of '?' in the query
+    #
     # @return [Fixnum]
     #   the number of affected rows
     #
     # Note that SphinxQL does not support prepared statements.
-    def execute(sql)
-      @pool.acquire { |conn| conn.execute(sql) }
+    def execute(sql, *bind_values)
+      @pool.acquire { |conn| conn.execute(sql, *bind_values) }
     end
 
     private

data/lib/oedipus/index.rb

@@ -39,7 +39,7 @@ module Oedipus
     # @return [Fixnum]
     #   the number of rows inserted (currently always 1)
     def insert(id, hash)
-      @conn.execute(@builder.insert(id, hash))
+      @conn.execute(*@builder.insert(id, hash))
     end
 
     # Update the record with the ID +id+.
@@ -56,7 +56,7 @@ module Oedipus
     # @return [Fixnum]
     #   the number of rows updated (1 or 0)
     def update(id, hash)
-      @conn.execute(@builder.update(id, hash))
+      @conn.execute(*@builder.update(id, hash))
     end
 
     # Completely replace the record with the ID +id+.
@@ -73,7 +73,7 @@ module Oedipus
     # @return [Fixnum]
     #   the number of rows inserted (currentl always 1)
     def replace(id, hash)
-      @conn.execute(@builder.replace(id, hash))
+      @conn.execute(*@builder.replace(id, hash))
     end
 
     # Delete the record with the ID +id+.
@@ -87,7 +87,7 @@ module Oedipus
     # @return [Fixnum]
     #   the number of rows deleted (currently always 1 or 0)
     def delete(id)
-      @conn.execute(@builder.delete(id))
+      @conn.execute(*@builder.delete(id))
     end
 
     # Fetch a single document by its ID.
@@ -220,11 +220,16 @@ module Oedipus
         raise ArgumentError, "Argument must be a Hash of named queries (#{queries.class} given)"
       end
 
-      rs = @conn.multi_query(
-        queries.map { |key, args|
-          [@builder.select(*extract_query_data(args)), "SHOW META"]
-        }.flatten.join(";\n")
-      )
+      stmts       = []
+      bind_values = []
+
+      queries.each do |key, args|
+        str, *values = @builder.select(*extract_query_data(args))
+        stmts.push(str, "SHOW META")
+        bind_values.push(*values)
+      end
+
+      rs = @conn.multi_query(stmts.join(";\n"), *bind_values)
 
       Hash[].tap do |result|
         queries.keys.each do |key|

data/lib/oedipus/query_builder.rb

@@ -29,12 +29,16 @@ module Oedipus
     # @return [String]
     #   a SphinxQL query
     def select(query, filters)
+      where, *bind_values = conditions(query, filters)
       [
-        from(filters),
-        conditions(query, filters),
-        order_by(filters),
-        limits(filters)
-      ].join(" ")
+        [
+          from(filters),
+          where,
+          order_by(filters),
+          limits(filters)
+        ].join(" "),
+        *bind_values
+      ]
     end
 
     # Build a SphinxQL query to insert the record identified by +id+ with the given attributes.
@@ -62,11 +66,15 @@ module Oedipus
     # @return [String]
     #   the SphinxQL to update the record
     def update(id, attributes)
+      set_attrs, *bind_values = update_attributes(attributes)
       [
-        "UPDATE #{@index_name} SET",
-        update_attributes(attributes),
-        "WHERE id = #{Connection.quote(id)}"
-      ].join(" ")
+        [
+          "UPDATE #{@index_name} SET",
+          set_attrs,
+          "WHERE id = ?"
+        ].join(" "),
+        *bind_values.push(id)
+      ]
     end
 
     # Build a SphinxQL query to replace the record identified by +id+ with the given attributes.
@@ -91,11 +99,13 @@ module Oedipus
     # @return [String]
     #   the SphinxQL to delete the record
     def delete(id)
-      "DELETE FROM #{@index_name} WHERE id = #{Connection.quote(id)}"
+      ["DELETE FROM #{@index_name} WHERE id = ?", id]
     end
 
     private
 
+    RESERVED = [:attrs, :limit, :offset, :order]
+
     def fields(filters)
       filters.fetch(:attrs, [:*]).dup.tap do |fields|
         if fields.none? { |a| /\brelevance\n/ === a } && normalize_order(filters).key?(:relevance)
@@ -114,32 +124,45 @@ module Oedipus
     end
 
     def into(type, id, attributes)
+      attrs, values = attributes.inject([[:id], [id]]) do |(a, b), (k, v)|
+        [a.push(k), b.push(v)]
+      end
+
       [
-        type,
-        "INTO #{@index_name}",
-        "(#{([:id] + attributes.keys).join(', ')})",
-        "VALUES",
-        "(#{([id] + attributes.values).map { |v| Connection.quote(v) }.join(', ')})"
-      ].join(" ")
+        [
+          type,
+          "INTO #{@index_name}",
+          "(#{attrs.join(', ')})",
+          "VALUES",
+          "(#{(['?'] * attrs.size).join(', ')})"
+        ].join(" "),
+        *values
+      ]
     end
 
     def conditions(query, filters)
-      exprs = []
-      exprs << "MATCH(#{Connection.quote(query)})" unless query.empty?
-      exprs += attribute_conditions(filters)
-      "WHERE " << exprs.join(" AND ") if exprs.any?
+      sql = []
+      sql << ["MATCH(?)", query] unless query.empty?
+      sql.push(*attribute_conditions(filters))
+
+      exprs, bind_values = sql.inject([[], []]) do |(strs, values), v|
+        [strs.push(v.shift), values.push(*v)]
+      end
+
+      ["WHERE " << exprs.join(" AND "), *bind_values] if exprs.any?
     end
 
     def attribute_conditions(filters)
-      filters \
-        .reject { |k, v| [:attrs, :limit, :offset, :order].include?(k.to_sym) } \
-        .map    { |k, v| "#{k} #{Comparison.of(v)}" }
+      filters.reject{ |k, v| RESERVED.include?(k.to_sym) }.map do |k, v|
+        Comparison.of(v).to_sql.tap { |c| c[0].insert(0, "#{k} ") }
+      end
     end
 
     def update_attributes(attributes)
-      attributes \
-        .map    { |k, v| "#{k} = #{Connection.quote(v)}" } \
-        .join(", ")
+      [
+        attributes.keys.map{ |k| "#{k} = ?" }.join(", "),
+        *attributes.values
+      ]
     end
 
     def order_by(filters)

data/lib/oedipus/version.rb

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

data/spec/integration/connection_spec.rb

@@ -23,6 +23,8 @@ describe Oedipus::Connection do
 
   before(:each) { empty_indexes }
 
+  let(:conn) { Oedipus::Connection.new(searchd_host) }
+
   describe "#initialize" do
     context "with a hosname:port string" do
       context "on successful connection" do
@@ -58,10 +60,65 @@ describe Oedipus::Connection do
   end
 
   describe "#[]" do
-    let(:conn) { Oedipus::Connection.new(searchd_host) }
-
     it "returns an index" do
       conn[:posts_rt].should be_a_kind_of(Oedipus::Index)
     end
   end
+
+  describe "#query" do
+    it "accepts integer bind parameters" do
+      conn.query("SELECT * FROM posts_rt WHERE views = ? AND user_id = ?", 1, 7)
+    end
+
+    it "accepts float bind parameters" do
+      conn.query("SELECT * FROM posts_rt WHERE views = ? AND user_id = ?", 1.2, 7.2)
+    end
+
+    it "accepts decimal bind parameters" do
+      require "bigdecimal"
+      conn.query("SELECT * FROM posts_rt WHERE views = ? AND user_id = ?", BigDecimal("1.2"), BigDecimal("7.2"))
+    end
+
+    xit "accepts string bind parameters" do
+      conn.query("SELECT * FROM posts_rt WHERE state = ?", "something")
+    end
+  end
+
+  describe "#multi_query" do
+    it "accepts integer bind parameters" do
+      conn.multi_query("SELECT * FROM posts_rt WHERE views = ? AND user_id = ?", 1, 7)
+    end
+
+    it "accepts float bind parameters" do
+      conn.multi_query("SELECT * FROM posts_rt WHERE views = ? AND user_id = ?", 1.2, 7.2)
+    end
+
+    it "accepts decimal bind parameters" do
+      require "bigdecimal"
+      conn.multi_query("SELECT * FROM posts_rt WHERE views = ? AND user_id = ?", BigDecimal("1.2"), BigDecimal("7.2"))
+    end
+
+    xit "accepts string bind parameters" do
+      conn.multi_query("SELECT * FROM posts_rt WHERE state = ?", "something")
+    end
+  end
+
+  describe "#execute" do
+    it "accepts integer bind parameters" do
+      conn.execute("REPLACE INTO posts_rt (id, views) VALUES (?, ?)", 1, 7)
+    end
+
+    it "accepts float bind parameters" do
+      conn.execute("REPLACE INTO posts_rt (id, views) VALUES (?, ?)", 1, 7.2)
+    end
+
+    it "accepts decimal bind parameters" do
+      require "bigdecimal"
+      conn.execute("REPLACE INTO posts_rt (id, views) VALUES (?, ?)", 1, BigDecimal("7.2"))
+    end
+
+    it "accepts string bind parameters" do
+      conn.execute("REPLACE INTO posts_rt (id, title) VALUES (?, ?)", 1, "an example with `\"this (quoted) string\\'")
+    end
+  end
 end

data/spec/unit/comparison/between_spec.rb

@@ -14,11 +14,11 @@ describe Oedipus::Comparison::Between do
     let(:comparison) { Oedipus::Comparison::Between.new(42..100) }
 
     it "draws as BETWEEN x AND y" do
-      comparison.to_s.should == "BETWEEN 42 AND 100"
+      comparison.to_sql.should == ["BETWEEN ? AND ?", 42, 100]
     end
 
     it "inverses as NOT BETWEEN x AND y" do
-      comparison.inverse.to_s.should == "NOT BETWEEN 42 AND 100"
+      comparison.inverse.to_sql.should == ["NOT BETWEEN ? AND ?", 42, 100]
     end
   end
 
@@ -26,11 +26,11 @@ describe Oedipus::Comparison::Between do
     let(:comparison) { Oedipus::Comparison::Between.new(42...100) }
 
     it "draws as BETWEEN x AND y-1" do
-      comparison.to_s.should == "BETWEEN 42 AND 99"
+      comparison.to_sql.should == ["BETWEEN ? AND ?", 42, 99]
     end
 
     it "inverses as NOT BETWEEN x AND y-1" do
-      comparison.inverse.to_s.should == "NOT BETWEEN 42 AND 99"
+      comparison.inverse.to_sql.should == ["NOT BETWEEN ? AND ?", 42, 99]
     end
   end
 end

data/spec/unit/comparison/equal_spec.rb

@@ -13,10 +13,10 @@ describe Oedipus::Comparison::Equal do
   let(:comparison) { Oedipus::Comparison::Equal.new('test') }
 
   it "draws as = v" do
-    comparison.to_s.should == "= 'test'"
+    comparison.to_sql.should == ["= ?", "test"]
   end
 
   it "inverses as != v" do
-    comparison.inverse.to_s.should == "!= 'test'"
+    comparison.inverse.to_sql.should == ["!= ?", "test"]
   end
 end

data/spec/unit/comparison/gt_spec.rb

@@ -13,10 +13,10 @@ describe Oedipus::Comparison::GT do
   let(:comparison) { Oedipus::Comparison::GT.new(42) }
 
   it "draws as > v" do
-    comparison.to_s.should == "> 42"
+    comparison.to_sql.should == ["> ?", 42]
   end
 
   it "inverses as <= v" do
-    comparison.inverse.to_s.should == "<= 42"
+    comparison.inverse.to_sql.should == ["<= ?", 42]
   end
 end

data/spec/unit/comparison/gte_spec.rb

@@ -13,10 +13,10 @@ describe Oedipus::Comparison::GTE do
   let(:comparison) { Oedipus::Comparison::GTE.new(42) }
 
   it "draws as >= v" do
-    comparison.to_s.should == ">= 42"
+    comparison.to_sql.should == [">= ?", 42]
   end
 
   it "inverses as < v" do
-    comparison.inverse.to_s.should == "< 42"
+    comparison.inverse.to_sql.should == ["< ?", 42]
   end
 end

data/spec/unit/comparison/in_spec.rb

@@ -13,10 +13,10 @@ describe Oedipus::Comparison::In do
   let(:comparison) { Oedipus::Comparison::In.new([1, 2, 3]) }
 
   it "draws as IN (x, y, z)" do
-    comparison.to_s.should == "IN (1, 2, 3)"
+    comparison.to_sql.should == ["IN (?, ?, ?)", 1, 2, 3]
   end
 
   it "inverses as NOT IN (x, y, z)" do
-    comparison.inverse.to_s.should == "NOT IN (1, 2, 3)"
+    comparison.inverse.to_sql.should == ["NOT IN (?, ?, ?)", 1, 2, 3]
   end
 end

data/spec/unit/comparison/lt_spec.rb

@@ -13,10 +13,10 @@ describe Oedipus::Comparison::LT do
   let(:comparison) { Oedipus::Comparison::LT.new(42) }
 
   it "draws as < v" do
-    comparison.to_s.should == "< 42"
+    comparison.to_sql.should == ["< ?", 42]
   end
 
   it "inverses as >= v" do
-    comparison.inverse.to_s.should == ">= 42"
+    comparison.inverse.to_sql.should == [">= ?", 42]
   end
 end

data/spec/unit/comparison/lte_spec.rb

@@ -13,10 +13,10 @@ describe Oedipus::Comparison::LTE do
   let(:comparison) { Oedipus::Comparison::LTE.new(42) }
 
   it "draws as <= v" do
-    comparison.to_s.should == "<= 42"
+    comparison.to_sql.should == ["<= ?", 42]
   end
 
   it "inverses as > v" do
-    comparison.inverse.to_s.should == "> 42"
+    comparison.inverse.to_sql.should == ["> ?", 42]
   end
 end

data/spec/unit/comparison/not_equal_spec.rb

@@ -13,10 +13,10 @@ describe Oedipus::Comparison::NotEqual do
   let(:comparison) { Oedipus::Comparison::NotEqual.new('test') }
 
   it "draws as != v" do
-    comparison.to_s.should == "!= 'test'"
+    comparison.to_sql.should == ["!= ?", "test"]
   end
 
   it "inverses as = v" do
-    comparison.inverse.to_s.should == "= 'test'"
+    comparison.inverse.to_sql.should == ["= ?", "test"]
   end
 end

data/spec/unit/comparison/not_in_spec.rb

@@ -13,10 +13,10 @@ describe Oedipus::Comparison::NotIn do
   let(:comparison) { Oedipus::Comparison::NotIn.new([1, 2, 3]) }
 
   it "draws as NOT IN (x, y, z)" do
-    comparison.to_s.should == "NOT IN (1, 2, 3)"
+    comparison.to_sql.should == ["NOT IN (?, ?, ?)", 1, 2, 3]
   end
 
   it "inverses as IN (x, y, z)" do
-    comparison.inverse.to_s.should == "IN (1, 2, 3)"
+    comparison.inverse.to_sql.should == ["IN (?, ?, ?)", 1, 2, 3]
   end
 end

data/spec/unit/comparison/not_spec.rb

@@ -27,11 +27,11 @@ describe Oedipus::Comparison::In do
     let(:comparison) { Oedipus::Comparison::Not.new(original) }
 
     it "draws as the inverse of the comparison" do
-      comparison.to_s.should == original.inverse.to_s
+      comparison.to_sql.should == original.inverse.to_sql
     end
 
     it "inverses as the original" do
-      comparison.inverse.to_s == original.to_s
+      comparison.inverse.to_sql == original.to_sql
     end
   end
 end

data/spec/unit/comparison/outside_spec.rb

@@ -14,11 +14,11 @@ describe Oedipus::Comparison::Outside do
     let(:comparison) { Oedipus::Comparison::Outside.new(42..100) }
 
     it "draws as NOT BETWEEN x AND y" do
-      comparison.to_s.should == "NOT BETWEEN 42 AND 100"
+      comparison.to_sql.should == ["NOT BETWEEN ? AND ?", 42, 100]
     end
 
     it "inverses as BETWEEN x AND y" do
-      comparison.inverse.to_s.should == "BETWEEN 42 AND 100"
+      comparison.inverse.to_sql.should == ["BETWEEN ? AND ?", 42, 100]
     end
   end
 
@@ -26,11 +26,11 @@ describe Oedipus::Comparison::Outside do
     let(:comparison) { Oedipus::Comparison::Outside.new(42...100) }
 
     it "draws as NOT BETWEEN x AND y-1" do
-      comparison.to_s.should == "NOT BETWEEN 42 AND 99"
+      comparison.to_sql.should == ["NOT BETWEEN ? AND ?", 42, 99]
     end
 
     it "inverses as BETWEEN x AND y-1" do
-      comparison.inverse.to_s.should == "BETWEEN 42 AND 99"
+      comparison.inverse.to_sql.should == ["BETWEEN ? AND ?", 42, 99]
     end
   end
 end

data/spec/unit/query_builder_spec.rb

@@ -15,124 +15,157 @@ describe Oedipus::QueryBuilder do
   describe "#select" do
     context "with a fulltext search" do
       it "uses MATCH()" do
-        builder.select("dogs AND cats", {}).should =~ /SELECT .* FROM posts WHERE MATCH\('dogs AND cats'\)/
+        sql = builder.select("dogs AND cats", {})
+        sql[0].should =~ /SELECT .* FROM posts WHERE MATCH\(\?\)/
+        sql.slice(1..-1).should == ["dogs AND cats"]
       end
     end
 
     context "without conditions" do
       it "does not add a where clause" do
-        builder.select("", {}).should_not =~ /WHERE/
+        builder.select("", {})[0].should_not =~ /WHERE/
       end
     end
 
     context "with equal attribute filters" do
       it "uses the '=' operator" do
-        builder.select("dogs", author_id: 7).should =~ /SELECT .* FROM posts WHERE .* author_id = 7/
+        sql = builder.select("dogs", author_id: 7)
+        sql[0].should =~ /SELECT .* FROM posts WHERE .* author_id = \?/
+        sql.slice(1..-1).should == ["dogs", 7]
       end
     end
 
     context "with not equal attribute filters" do
       it "uses the '!=' operator" do
-        builder.select("dogs", author_id: Oedipus.not(7)).should =~ /SELECT .* FROM posts WHERE .* author_id != 7/
+        sql = builder.select("dogs", author_id: Oedipus.not(7))
+        sql[0].should =~ /SELECT .* FROM posts WHERE .* author_id != \?/
+        sql.slice(1..-1).should == ["dogs", 7]
       end
     end
 
     context "with inclusive range-filtered attribute filters" do
       it "uses the BETWEEN operator" do
-        builder.select("cats", views: 10..20).should =~ /SELECT .* FROM posts WHERE .* views BETWEEN 10 AND 20/
+        sql = builder.select("cats", views: 10..20)
+        sql[0].should =~ /SELECT .* FROM posts WHERE .* views BETWEEN \? AND \?/
+        sql.slice(1..-1).should == ["cats", 10, 20]
       end
     end
 
     context "with exclusive range-filtered attribute filters" do
       it "uses the BETWEEN operator" do
-        builder.select("cats", views: 10...20).should =~ /SELECT .* FROM posts WHERE .* views BETWEEN 10 AND 19/
+        sql = builder.select("cats", views: 10...20)
+        sql[0].should =~ /SELECT .* FROM posts WHERE .* views BETWEEN \? AND \?/
+        sql.slice(1..-1).should == ["cats", 10, 19]
       end
     end
 
     context "with a greater than or equal comparison" do
       it "uses the >= operator" do
-        builder.select("cats", views: 50..(1/0.0)).should =~ /SELECT .* FROM posts WHERE .* views >= 50/
+        sql = builder.select("cats", views: 50..(1/0.0))
+        sql[0].should =~ /SELECT .* FROM posts WHERE .* views >= \?/
+        sql.slice(1..-1).should == ["cats", 50]
       end
     end
 
     context "with a greater than comparison" do
       it "uses the > operator" do
-        builder.select("cats", views: 50...(1/0.0)).should =~ /SELECT .* FROM posts WHERE .* views > 50/
+        sql = builder.select("cats", views: 50...(1/0.0))
+        sql[0].should =~ /SELECT .* FROM posts WHERE .* views > \?/
+        sql.slice(1..-1).should == ["cats", 50]
       end
     end
 
     context "with a less than or equal comparison" do
       it "uses the <= operator" do
-        builder.select("cats", views: -(1/0.0)..50).should =~ /SELECT .* FROM posts WHERE .* views <= 50/
+        sql = builder.select("cats", views: -(1/0.0)..50)
+        sql[0].should =~ /SELECT .* FROM posts WHERE .* views <= \?/
+        sql.slice(1..-1).should == ["cats", 50]
       end
     end
 
     context "with a less than comparison" do
       it "uses the < operator" do
-        builder.select("cats", views: -(1/0.0)...50).should =~ /SELECT .* FROM posts WHERE .* views < 50/
+        sql = builder.select("cats", views: -(1/0.0)...50)
+        sql[0].should =~ /SELECT .* FROM posts WHERE .* views < \?/
+        sql.slice(1..-1).should == ["cats", 50]
       end
     end
 
     context "with a negated range comparison" do
       it "uses the NOT BETWEEN operator" do
-        builder.select("cats", views: Oedipus.not(50..100)).should =~ /SELECT .* FROM posts WHERE .* views NOT BETWEEN 50 AND 100/
+        sql = builder.select("cats", views: Oedipus.not(50..100))
+        sql[0].should =~ /SELECT .* FROM posts WHERE .* views NOT BETWEEN \? AND \?/
+        sql.slice(1..-1).should == ["cats", 50, 100]
       end
     end
 
     context "with an attributed filtered by collection" do
       it "uses the IN operator" do
-        builder.select("cats", author_id: [7, 11]).should =~ /SELECT .* FROM posts WHERE .* author_id IN \(7, 11\)/
+        sql = builder.select("cats", author_id: [7, 11])
+        sql[0].should =~ /SELECT .* FROM posts WHERE .* author_id IN \(\?, \?\)/
+        sql.slice(1..-1).should == ["cats", 7, 11]
       end
     end
 
     context "with an attributed filtered by negated collection" do
       it "uses the NOT IN operator" do
-        builder.select("cats", author_id: Oedipus.not([7, 11])).should =~ /SELECT .* FROM posts WHERE .* author_id NOT IN \(7, 11\)/
+        sql = builder.select("cats", author_id: Oedipus.not([7, 11]))
+        sql[0].should =~ /SELECT .* FROM posts WHERE .* author_id NOT IN \(\?, \?\)/
+        sql.slice(1..-1).should == ["cats", 7, 11]
       end
     end
 
     context "with explicit attributes" do
       it "puts the attributes in the select clause" do
-        builder.select("cats", attrs: [:*, "FOO() AS f"]).should =~ /SELECT \*, FOO\(\) AS f FROM posts/
+        sql = builder.select("cats", attrs: [:*, "FOO() AS f"])
+        sql[0].should =~ /SELECT \*, FOO\(\) AS f FROM posts/
       end
     end
 
     context "with a limit" do
       it "applies a LIMIT with an offset of 0" do
-        builder.select("dogs", limit: 50).should =~ /SELECT .* FROM posts WHERE .* LIMIT 0, 50/
+        sql = builder.select("dogs", limit: 50)
+        sql[0].should =~ /SELECT .* FROM posts WHERE .* LIMIT 0, 50/
       end
 
       it "is not considered an attribute" do
-        builder.select("dogs", limit: 50).should_not =~ /limit = 50/
+        sql = builder.select("dogs", limit: 50)
+        sql.slice(1..-1).should == ["dogs"]
       end
     end
 
     context "with an offset" do
       it "applies a LIMIT with an offset" do
-        builder.select("dogs", limit: 50, offset: 200).should =~ /SELECT .* FROM posts WHERE .* LIMIT 200, 50/
+        sql = builder.select("dogs", limit: 50, offset: 200)
+        sql[0].should =~ /SELECT .* FROM posts WHERE .* LIMIT 200, 50/
       end
 
       it "is not considered an attribute" do
-        builder.select("dogs", limit: 50, offset: 200).should_not =~ /offset = 200/
+        sql = builder.select("dogs", limit: 50, offset: 200)
+        sql.slice(1..-1).should == ["dogs"]
       end
     end
 
     context "with an order clause" do
       it "applies an ORDER BY" do
-        builder.select("cats", order: {views: :desc}).should =~ /SELECT .* FROM posts WHERE .* ORDER BY views DESC/
+        sql = builder.select("cats", order: {views: :desc})
+        sql[0].should =~ /SELECT .* FROM posts WHERE .* ORDER BY views DESC/
       end
 
       it "defaults to ASC" do
-        builder.select("cats", order: :views).should =~ /SELECT .* FROM posts WHERE .* ORDER BY views ASC/
+        sql = builder.select("cats", order: :views)
+        sql[0].should =~ /SELECT .* FROM posts WHERE .* ORDER BY views ASC/
       end
 
       it "supports multiple orders" do
-        builder.select("cats", order: {views: :asc, author_id: :desc}).should =~ /SELECT .* FROM posts WHERE .* ORDER BY views ASC, author_id DESC/
+        sql = builder.select("cats", order: {views: :asc, author_id: :desc})
+        sql[0].should =~ /SELECT .* FROM posts WHERE .* ORDER BY views ASC, author_id DESC/
       end
 
       context "by relevance" do
         it "injects a weight() attribute" do
-          builder.select("cats", order: {relevance: :desc}).should =~ /SELECT \*, WEIGHT\(\) AS relevance FROM posts WHERE .* ORDER BY relevance DESC/
+          sql = builder.select("cats", order: {relevance: :desc})
+          sql[0].should =~ /SELECT \*, WEIGHT\(\) AS relevance FROM posts WHERE .* ORDER BY relevance DESC/
         end
       end
     end
@@ -140,29 +173,33 @@ describe Oedipus::QueryBuilder do
 
   describe "#insert" do
     it "includes the ID and the attributes" do
-      builder.insert(3, title: "example", views: 9).should == "INSERT INTO posts (id, title, views) VALUES (3, 'example', 9)"
+      builder.insert(3, title: "example", views: 9).should == ["INSERT INTO posts (id, title, views) VALUES (?, ?, ?)", 3, "example", 9]
     end
   end
 
   describe "#update" do
     it "includes the ID in the WHERE clause" do
-      builder.update(3, title: "example", views: 9).should =~ /UPDATE posts SET .* WHERE id = 3/
+      sql = builder.update(3, title: "example", views: 9)
+      sql[0].should =~ /UPDATE posts SET .* WHERE id = \?/
+      sql.last.should == 3
     end
 
     it "includes the changed attributes" do
-      builder.update(3, title: "example", views: 9).should =~ /UPDATE posts SET title = 'example', views = 9/
+      sql = builder.update(3, title: "example", views: 9)
+      sql[0].should =~ /UPDATE posts SET title = \?, views = \?/
+      sql.slice(1..-1).should == ["example", 9, 3]
     end
   end
 
   describe "#replace" do
     it "includes the ID and the attributes" do
-      builder.replace(3, title: "example", views: 9).should == "REPLACE INTO posts (id, title, views) VALUES (3, 'example', 9)"
+      builder.replace(3, title: "example", views: 9).should == ["REPLACE INTO posts (id, title, views) VALUES (?, ?, ?)", 3, "example", 9]
     end
   end
 
   describe "#delete" do
     it "includes the ID" do
-      builder.delete(3).should == "DELETE FROM posts WHERE id = 3"
+      builder.delete(3).should == ["DELETE FROM posts WHERE id = ?", 3]
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oedipus
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-04 00:00:00.000000000 Z
+date: 2012-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &11159640 !ruby/object:Gem::Requirement
+  requirement: &20663420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11159640
+  version_requirements: *20663420
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &11157840 !ruby/object:Gem::Requirement
+  requirement: &20662600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11157840
+  version_requirements: *20662600
 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
@@ -109,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2937819901066625379
+      hash: -658671341905469446
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2937819901066625379
+      hash: -658671341905469446
 requirements: []
 rubyforge_project: oedipus
 rubygems_version: 1.8.11