Merge branch 'readme_updates'

Author: sodabrew

README.md

@@ -9,12 +9,14 @@ This one is not.
 
 It also forces the use of UTF-8 [or binary] for the connection [and all strings in 1.9, unless Encoding.default_internal is set then it'll convert from UTF-8 to that encoding] and uses encoding-aware MySQL API calls where it can.
 
-The API consists of two classes:
+The API consists of three classes:
 
 `Mysql2::Client` - your connection to the database.
 
 `Mysql2::Result` - returned from issuing a #query on the connection. It includes Enumerable.
 
+`Mysql2::Statement` - returned from issuing a #prepare on the connection. Execute the statement to get a Result.
+
 ## Installing
 ### General Instructions
 ``` sh
@@ -153,6 +155,20 @@ results.each(:as => :array) do |row|
 end
 ```
 
+Prepared statements are supported, as well. In a prepared statement, use a `?`
+in place of each value and then execute the statement to retrieve a result set.
+Pass your arguments to the execute method in the same number and order as the
+question marks in the statement.
+
+``` ruby
+statement = @client.prepare("SELECT * FROM users WHERE login_count = ?")
+result1 = statement.execute(1)
+result2 = statement.execute(2)
+
+statement = @client.prepare("SELECT * FROM users WHERE last_login >= ? AND location LIKE ?")
+result = statement.execute(1, "CA")
+```
+
 ## Connection options
 
 You may set the following connection options in Mysql2::Client.new(...):
@@ -538,4 +554,8 @@ though.
 * Yury Korolev (http://github.com/yury) - for TONS of help testing the Active Record adapter
 * Aaron Patterson (http://github.com/tenderlove) - tons of contributions, suggestions and general badassness
 * Mike Perham (http://github.com/mperham) - Async Active Record adapter (uses Fibers and EventMachine)
-* Aaron Stone (http://github.com/sodabrew) - additional client settings, local files, microsecond time, maintenance support.
+* Aaron Stone (http://github.com/sodabrew) - additional client settings, local files, microsecond time, maintenance support
+* Kouhei Ueno (https://github.com/nyaxt) - for the original work on Prepared Statements way back in 2012
+* John Cant (http://github.com/johncant) - polishing and updating Prepared Statements support
+* Justin Case (http://github.com/justincase) - polishing and updating Prepared Statements support and getting it merged
+* Tamir Duberstein (http://github.com/tamird) - for help with timeouts and all around updates and cleanups

mysql2.gemspec

@@ -3,9 +3,9 @@ require File.expand_path('../lib/mysql2/version', __FILE__)
 Gem::Specification.new do |s|
   s.name = %q{mysql2}
   s.version = Mysql2::VERSION
-  s.authors = ["Brian Lopez"]
+  s.authors = ['Brian Lopez', 'Aaron Stone']
   s.license = "MIT"
-  s.email = %q{[email protected]}
+  s.email = ['[email protected]', '[email protected]']
   s.extensions = ["ext/mysql2/extconf.rb"]
   s.homepage = %q{http://github.com/brianmario/mysql2}
   s.rdoc_options = ["--charset=UTF-8"]

spec/mysql2/statement_spec.rb

@@ -83,6 +83,20 @@
       result = statement.execute
       expect(result.to_a.length).to eq(1)
     end
+
+  it "should handle comparisons and likes" do
+    @client.query 'USE test'
+    @client.query 'CREATE TABLE IF NOT EXISTS mysql2_stmt_q(a int, b varchar(10))'
+    @client.query 'INSERT INTO mysql2_stmt_q (a, b) VALUES (1, "Hello"), (2, "World")'
+    statement = @client.prepare 'SELECT * FROM mysql2_stmt_q WHERE a < ?'
+    results = statement.execute(2)
+    results.first.should == {"a" => 1, "b" => "Hello"}
+
+    statement = @client.prepare 'SELECT * FROM mysql2_stmt_q WHERE b LIKE ?'
+    results = statement.execute('%orld')
+    results.first.should == {"a" => 2, "b" => "World"}
+
+    @client.query 'DROP TABLE IF EXISTS mysql2_stmt_q'
   end
 
   it "should select dates" do