Merge pull request #672 from jeremy/prepared-writes

Mysql2::Statement#last_id and #affected_rows (rebased)

Author: sodabrew

ext/mysql2/statement.c

@@ -415,13 +415,42 @@ static VALUE fields(VALUE self) {
   return field_list;
 }
 
+/* call-seq:
+ *    stmt.last_id
+ *
+ * Returns the AUTO_INCREMENT value from the executed INSERT or UPDATE.
+ */
+static VALUE rb_mysql_stmt_last_id(VALUE self) {
+  GET_STATEMENT(self);
+  return ULL2NUM(mysql_stmt_insert_id(stmt_wrapper->stmt));
+}
+
+/* call-seq:
+ *    stmt.affected_rows
+ *
+ * Returns the number of rows changed, deleted, or inserted.
+ */
+static VALUE rb_mysql_stmt_affected_rows(VALUE self) {
+  my_ulonglong affected;
+  GET_STATEMENT(self);
+
+  affected = mysql_stmt_affected_rows(stmt_wrapper->stmt);
+  if (affected == (my_ulonglong)-1) {
+    rb_raise_mysql2_stmt_error(self);
+  }
+
+  return ULL2NUM(affected);
+}
+
 void init_mysql2_statement() {
   cMysql2Statement = rb_define_class_under(mMysql2, "Statement", rb_cObject);
 
   rb_define_method(cMysql2Statement, "param_count", param_count, 0);
   rb_define_method(cMysql2Statement, "field_count", field_count, 0);
   rb_define_method(cMysql2Statement, "execute", execute, -1);
   rb_define_method(cMysql2Statement, "fields", fields, 0);
+  rb_define_method(cMysql2Statement, "last_id", rb_mysql_stmt_last_id, 0);
+  rb_define_method(cMysql2Statement, "affected_rows", rb_mysql_stmt_affected_rows, 0);
 
   sym_stream = ID2SYM(rb_intern("stream"));
 

spec/mysql2/statement_spec.rb

@@ -594,4 +594,74 @@
       end
     end
   end
+
+  context 'last_id' do
+    before(:each) do
+      @client.query 'USE test'
+      @client.query 'CREATE TABLE IF NOT EXISTS lastIdTest (`id` BIGINT NOT NULL AUTO_INCREMENT, blah INT(11), PRIMARY KEY (`id`))'
+    end
+
+    after(:each) do
+      @client.query 'DROP TABLE lastIdTest'
+    end
+
+    it 'should return last insert id' do
+      stmt = @client.prepare 'INSERT INTO lastIdTest (blah) VALUES (?)'
+      expect(stmt.last_id).to eq 0
+      stmt.execute 1
+      expect(stmt.last_id).to eq 1
+    end
+
+    it 'should handle bigint ids' do
+      stmt = @client.prepare 'INSERT INTO lastIdTest (id, blah) VALUES (?, ?)'
+      stmt.execute 5000000000, 5000
+      expect(stmt.last_id).to eql(5000000000)
+
+      stmt = @client.prepare 'INSERT INTO lastIdTest (blah) VALUES (?)'
+      stmt.execute 5001
+      expect(stmt.last_id).to eql(5000000001)
+    end
+  end
+
+  context 'affected_rows' do
+    before :each do
+      @client.query 'USE test'
+      @client.query 'CREATE TABLE IF NOT EXISTS lastIdTest (`id` BIGINT NOT NULL AUTO_INCREMENT, blah INT(11), PRIMARY KEY (`id`))'
+    end
+
+    after :each do
+      @client.query 'DROP TABLE lastIdTest'
+    end
+
+    it 'should return number of rows affected by an insert' do
+      stmt = @client.prepare 'INSERT INTO lastIdTest (blah) VALUES (?)'
+      expect(stmt.affected_rows).to eq 0
+      stmt.execute 1
+      expect(stmt.affected_rows).to eq 1
+    end
+
+    it 'should return number of rows affected by an update' do
+      stmt = @client.prepare 'INSERT INTO lastIdTest (blah) VALUES (?)'
+      stmt.execute 1
+      expect(stmt.affected_rows).to eq 1
+      stmt.execute 2
+      expect(stmt.affected_rows).to eq 1
+
+      stmt = @client.prepare 'UPDATE lastIdTest SET blah=? WHERE blah=?'
+      stmt.execute 0, 1
+      expect(stmt.affected_rows).to eq 1
+    end
+
+    it 'should return number of rows affected by a delete' do
+      stmt = @client.prepare 'INSERT INTO lastIdTest (blah) VALUES (?)'
+      stmt.execute 1
+      expect(stmt.affected_rows).to eq 1
+      stmt.execute 2
+      expect(stmt.affected_rows).to eq 1
+
+      stmt = @client.prepare 'DELETE FROM lastIdTest WHERE blah=?'
+      stmt.execute 1
+      expect(stmt.affected_rows).to eq 1
+    end
+  end
 end