mysql2 0.4.0-x86-mingw32 → 0.4.1-x86-mingw32

data/ext/mysql2/mysql_enc_name_to_ruby.h

@@ -1,4 +1,4 @@
-/* C code produced by gperf version 3.0.3 */
+/* C code produced by gperf version 3.0.4 */
 /* Command-line: gperf  */
 /* Computed positions: -k'1,3,$' */
 
@@ -40,9 +40,9 @@ inline
 #endif
 #endif
 static unsigned int
-mysql2_mysql_enc_name_to_rb_hash(str, len)
+mysql2_mysql_enc_name_to_rb_hash (str, len)
      register const char *str;
-     register const unsigned int len;
+     register unsigned int len;
 {
   static const unsigned char asso_values[] =
     {
@@ -78,14 +78,14 @@ mysql2_mysql_enc_name_to_rb_hash(str, len)
 
 #ifdef __GNUC__
 __inline
-#ifdef __GNUC_STDC_INLINE__
+#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
 __attribute__ ((__gnu_inline__))
 #endif
 #endif
 const struct mysql2_mysql_enc_name_to_rb_map *
-mysql2_mysql_enc_name_to_rb(str, len)
+mysql2_mysql_enc_name_to_rb (str, len)
      register const char *str;
-     register const unsigned int len;
+     register unsigned int len;
 {
   enum
     {
@@ -154,9 +154,9 @@ mysql2_mysql_enc_name_to_rb(str, len)
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
     {
-      register const unsigned int key = mysql2_mysql_enc_name_to_rb_hash(str, len);
+      register int key = mysql2_mysql_enc_name_to_rb_hash (str, len);
 
-      if (key <= MAX_HASH_VALUE)
+      if (key <= MAX_HASH_VALUE && key >= 0)
         {
           register const char *s = wordlist[key].name;
 

data/ext/mysql2/mysql_enc_to_ruby.h

@@ -1,4 +1,4 @@
-const char *mysql2_mysql_enc_to_rb[] = {
+static const char *mysql2_mysql_enc_to_rb[] = {
   "Big5",
   "ISO-8859-2",
   NULL,
@@ -54,13 +54,13 @@ const char *mysql2_mysql_enc_to_rb[] = {
   "macRoman",
   "UTF-16",
   "UTF-16",
-  NULL,
+  "",
   "Windows-1256",
   "Windows-1257",
   "Windows-1257",
   "UTF-32",
   "UTF-32",
-  NULL,
+  "",
   "ASCII-8BIT",
   NULL,
   "US-ASCII",
@@ -119,10 +119,10 @@ const char *mysql2_mysql_enc_to_rb[] = {
   "UTF-16",
   "UTF-16",
   "UTF-16",
-  NULL,
-  NULL,
-  NULL,
-  NULL,
+  "UTF-16",
+  "UTF-16",
+  "UTF-16",
+  "UTF-16",
   NULL,
   NULL,
   NULL,
@@ -146,6 +146,10 @@ const char *mysql2_mysql_enc_to_rb[] = {
   "UTF-16BE",
   "UTF-16BE",
   "UTF-16BE",
+  "UTF-16BE",
+  "UTF-16BE",
+  "UTF-16BE",
+  "UTF-16BE",
   NULL,
   NULL,
   NULL,
@@ -153,11 +157,11 @@ const char *mysql2_mysql_enc_to_rb[] = {
   NULL,
   NULL,
   NULL,
-  NULL,
-  NULL,
-  NULL,
-  NULL,
-  NULL,
+  "UTF-16BE",
+  "UTF-32",
+  "UTF-32",
+  "UTF-32",
+  "UTF-32",
   "UTF-32",
   "UTF-32",
   "UTF-32",
@@ -178,10 +182,6 @@ const char *mysql2_mysql_enc_to_rb[] = {
   "UTF-32",
   "UTF-32",
   "UTF-32",
-  NULL,
-  NULL,
-  NULL,
-  NULL,
   NULL,
   NULL,
   NULL,
@@ -210,6 +210,10 @@ const char *mysql2_mysql_enc_to_rb[] = {
   "UTF-8",
   "UTF-8",
   "UTF-8",
+  "UTF-8",
+  "UTF-8",
+  "UTF-8",
+  "UTF-8",
   NULL,
   NULL,
   NULL,
@@ -217,11 +221,11 @@ const char *mysql2_mysql_enc_to_rb[] = {
   NULL,
   NULL,
   NULL,
-  NULL,
-  NULL,
-  NULL,
-  NULL,
-  NULL,
+  "UTF-8",
+  "UTF-8",
+  "UTF-8",
+  "UTF-8",
+  "UTF-8",
   "UTF-8",
   "UTF-8",
   "UTF-8",
@@ -243,4 +247,3 @@ const char *mysql2_mysql_enc_to_rb[] = {
   "UTF-8",
   "UTF-8"
 };
-

data/ext/mysql2/result.c

@@ -1,7 +1,5 @@
 #include <mysql2_ext.h>
 
-#include <stdint.h>
-
 #include "mysql_enc_to_ruby.h"
 
 #ifdef HAVE_RUBY_ENCODING_H
@@ -161,8 +159,7 @@ static void *nogvl_stmt_fetch(void *ptr) {
   return (void *)r;
 }
 
-
-static VALUE rb_mysql_result_fetch_field(VALUE self, unsigned int idx, short int symbolize_keys) {
+static VALUE rb_mysql_result_fetch_field(VALUE self, unsigned int idx, int symbolize_keys) {
   VALUE rb_field;
   GET_RESULT(self);
 
@@ -357,11 +354,7 @@ static VALUE rb_mysql_result_fetch_row_stmt(VALUE self, MYSQL_FIELD * fields, co
   }
 
   if (mysql_stmt_bind_result(wrapper->stmt_wrapper->stmt, wrapper->result_buffers)) {
-    rb_raise_mysql2_stmt_error2(wrapper->stmt_wrapper->stmt
-#ifdef HAVE_RUBY_ENCODING_H
-      , conn_enc
-#endif
-      );
+    rb_raise_mysql2_stmt_error(wrapper->stmt_wrapper);
   }
 
   {
@@ -372,11 +365,7 @@ static VALUE rb_mysql_result_fetch_row_stmt(VALUE self, MYSQL_FIELD * fields, co
 
       case 1:
         /* error */
-        rb_raise_mysql2_stmt_error2(wrapper->stmt_wrapper->stmt
-#ifdef HAVE_RUBY_ENCODING_H
-          , conn_enc
-#endif
-          );
+        rb_raise_mysql2_stmt_error(wrapper->stmt_wrapper);
 
       case MYSQL_NO_DATA:
         /* no more row */
@@ -510,7 +499,6 @@ static VALUE rb_mysql_result_fetch_row_stmt(VALUE self, MYSQL_FIELD * fields, co
         default:
           rb_raise(cMysql2Error, "unhandled buffer type: %d",
               result_buffer->buffer_type);
-          break;
       }
     }
 
@@ -764,7 +752,7 @@ static VALUE rb_mysql_result_fetch_fields(VALUE self) {
     wrapper->fields = rb_ary_new2(wrapper->numberOfFields);
   }
 
-  if ((unsigned)RARRAY_LEN(wrapper->fields) != wrapper->numberOfFields) {
+  if ((my_ulonglong)RARRAY_LEN(wrapper->fields) != wrapper->numberOfFields) {
     for (i=0; i<wrapper->numberOfFields; i++) {
       rb_mysql_result_fetch_field(self, i, symbolizeKeys);
     }

data/ext/mysql2/result.h

@@ -1,7 +1,7 @@
 #ifndef MYSQL2_RESULT_H
 #define MYSQL2_RESULT_H
 
-void init_mysql2_result();
+void init_mysql2_result(void);
 VALUE rb_mysql_result_to_obj(VALUE client, VALUE encoding, VALUE options, MYSQL_RES *r, VALUE statement);
 
 typedef struct {
@@ -10,8 +10,8 @@ typedef struct {
   VALUE client;
   VALUE encoding;
   VALUE statement;
-  unsigned int numberOfFields;
-  unsigned long numberOfRows;
+  my_ulonglong numberOfFields;
+  my_ulonglong numberOfRows;
   unsigned long lastRowProcessed;
   char is_streaming;
   char streamingComplete;

data/ext/mysql2/statement.c

@@ -2,12 +2,13 @@
 
 VALUE cMysql2Statement;
 extern VALUE mMysql2, cMysql2Error, cBigDecimal, cDateTime, cDate;
-static VALUE sym_stream, intern_error_number_eql, intern_sql_state_eql, intern_each;
+static VALUE sym_stream, intern_new_with_args, intern_each;
 static VALUE intern_usec, intern_sec, intern_min, intern_hour, intern_day, intern_month, intern_year;
 
 #define GET_STATEMENT(self) \
   mysql_stmt_wrapper *stmt_wrapper; \
-  Data_Get_Struct(self, mysql_stmt_wrapper, stmt_wrapper);
+  Data_Get_Struct(self, mysql_stmt_wrapper, stmt_wrapper); \
+  if (!stmt_wrapper->stmt) { rb_raise(cMysql2Error, "Invalid statement handle"); }
 
 
 static void rb_mysql_stmt_mark(void * ptr) {
@@ -17,6 +18,15 @@ static void rb_mysql_stmt_mark(void * ptr) {
   rb_gc_mark(stmt_wrapper->client);
 }
 
+static void *nogvl_stmt_close(void * ptr) {
+  mysql_stmt_wrapper *stmt_wrapper = (mysql_stmt_wrapper *)ptr;
+  if (stmt_wrapper->stmt) {
+    mysql_stmt_close(stmt_wrapper->stmt);
+    stmt_wrapper->stmt = NULL;
+  }
+  return NULL;
+}
+
 static void rb_mysql_stmt_free(void * ptr) {
   mysql_stmt_wrapper* stmt_wrapper = (mysql_stmt_wrapper *)ptr;
   decr_mysql2_stmt(stmt_wrapper);
@@ -26,20 +36,22 @@ void decr_mysql2_stmt(mysql_stmt_wrapper *stmt_wrapper) {
   stmt_wrapper->refcount--;
 
   if (stmt_wrapper->refcount == 0) {
-    mysql_stmt_close(stmt_wrapper->stmt);
+    nogvl_stmt_close(stmt_wrapper);
     xfree(stmt_wrapper);
   }
 }
 
-VALUE rb_raise_mysql2_stmt_error2(MYSQL_STMT *stmt
-#ifdef HAVE_RUBY_ENCODING_H
-  , rb_encoding *conn_enc
-#endif
-  ) {
-  VALUE rb_error_msg = rb_str_new2(mysql_stmt_error(stmt));
-  VALUE rb_sql_state = rb_tainted_str_new2(mysql_stmt_sqlstate(stmt));
-  VALUE e = rb_exc_new3(cMysql2Error, rb_error_msg);
+
+void rb_raise_mysql2_stmt_error(mysql_stmt_wrapper *stmt_wrapper) {
+  VALUE e;
+  GET_CLIENT(stmt_wrapper->client);
+  VALUE rb_error_msg = rb_str_new2(mysql_stmt_error(stmt_wrapper->stmt));
+  VALUE rb_sql_state = rb_tainted_str_new2(mysql_stmt_sqlstate(stmt_wrapper->stmt));
+
 #ifdef HAVE_RUBY_ENCODING_H
+  rb_encoding *conn_enc;
+  conn_enc = rb_to_encoding(wrapper->encoding);
+
   rb_encoding *default_internal_enc = rb_default_internal_encoding();
 
   rb_enc_associate(rb_error_msg, conn_enc);
@@ -49,30 +61,13 @@ VALUE rb_raise_mysql2_stmt_error2(MYSQL_STMT *stmt
     rb_sql_state = rb_str_export_to_enc(rb_sql_state, default_internal_enc);
   }
 #endif
-  rb_funcall(e, intern_error_number_eql, 1, UINT2NUM(mysql_stmt_errno(stmt)));
-  rb_funcall(e, intern_sql_state_eql, 1, rb_sql_state);
-  rb_exc_raise(e);
-  return Qnil;
-}
 
-static void rb_raise_mysql2_stmt_error(VALUE self) {
-#ifdef HAVE_RUBY_ENCODING_H
-  rb_encoding *conn_enc;
-#endif
-  GET_STATEMENT(self);
-
-#ifdef HAVE_RUBY_ENCODING_H
-  {
-    GET_CLIENT(stmt_wrapper->client);
-    conn_enc = rb_to_encoding(wrapper->encoding);
-  }
-#endif
-
-  rb_raise_mysql2_stmt_error2(stmt_wrapper->stmt
-#ifdef HAVE_RUBY_ENCODING_H
-  , conn_enc
-#endif
-  );
+  e = rb_funcall(cMysql2Error, intern_new_with_args, 4,
+                 rb_error_msg,
+                 LONG2FIX(wrapper->server_version),
+                 UINT2NUM(mysql_stmt_errno(stmt_wrapper->stmt)),
+                 rb_sql_state);
+  rb_exc_raise(e);
 }
 
 
@@ -146,7 +141,7 @@ VALUE rb_mysql_stmt_new(VALUE rb_client, VALUE sql) {
     args.sql_len = RSTRING_LEN(sql);
 
     if ((VALUE)rb_thread_call_without_gvl(nogvl_prepare_statement, &args, RUBY_UBF_IO, 0) == Qfalse) {
-      rb_raise_mysql2_stmt_error(rb_stmt);
+      rb_raise_mysql2_stmt_error(stmt_wrapper);
     }
   }
 
@@ -335,13 +330,13 @@ static VALUE execute(int argc, VALUE *argv, VALUE self) {
     // copies bind_buffers into internal storage
     if (mysql_stmt_bind_param(stmt, bind_buffers)) {
       FREE_BINDS;
-      rb_raise_mysql2_stmt_error(self);
+      rb_raise_mysql2_stmt_error(stmt_wrapper);
     }
   }
 
   if ((VALUE)rb_thread_call_without_gvl(nogvl_execute, stmt, RUBY_UBF_IO, 0) == Qfalse) {
     FREE_BINDS;
-    rb_raise_mysql2_stmt_error(self);
+    rb_raise_mysql2_stmt_error(stmt_wrapper);
   }
 
   FREE_BINDS;
@@ -352,7 +347,7 @@ static VALUE execute(int argc, VALUE *argv, VALUE self) {
       // either CR_OUT_OF_MEMORY or CR_UNKNOWN_ERROR. both fatal.
 
       MARK_CONN_INACTIVE(stmt_wrapper->client);
-      rb_raise_mysql2_stmt_error(self);
+      rb_raise_mysql2_stmt_error(stmt_wrapper);
     }
     // no data and no error, so query was not a SELECT
     return Qnil;
@@ -367,7 +362,7 @@ static VALUE execute(int argc, VALUE *argv, VALUE self) {
     // recieve the whole result set from the server
     if (rb_thread_call_without_gvl(nogvl_stmt_store_result, stmt, RUBY_UBF_IO, 0) == Qfalse) {
       mysql_free_result(metadata);
-      rb_raise_mysql2_stmt_error(self);
+      rb_raise_mysql2_stmt_error(stmt_wrapper);
     }
     MARK_CONN_INACTIVE(stmt_wrapper->client);
   }
@@ -430,18 +425,60 @@ 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(stmt_wrapper);
+  }
+
+  return ULL2NUM(affected);
+}
+
+/* call-seq:
+ *    stmt.close
+ *
+ * Explicitly closing this will free up server resources immediately rather
+ * than waiting for the garbage collector. Useful if you're managing your
+ * own prepared statement cache.
+ */
+static VALUE rb_mysql_stmt_close(VALUE self) {
+  GET_STATEMENT(self);
+  rb_thread_call_without_gvl(nogvl_stmt_close, stmt_wrapper, RUBY_UBF_IO, 0);
+  return Qnil;
+}
+
 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, "_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);
+  rb_define_method(cMysql2Statement, "close", rb_mysql_stmt_close, 0);
 
   sym_stream = ID2SYM(rb_intern("stream"));
 
-  intern_error_number_eql = rb_intern("error_number=");
-  intern_sql_state_eql = rb_intern("sql_state=");
+  intern_new_with_args = rb_intern("new_with_args");
   intern_each = rb_intern("each");
 
   intern_usec = rb_intern("usec");

data/ext/mysql2/statement.h

@@ -9,14 +9,10 @@ typedef struct {
   int refcount;
 } mysql_stmt_wrapper;
 
-void init_mysql2_statement();
+void init_mysql2_statement(void);
 void decr_mysql2_stmt(mysql_stmt_wrapper *stmt_wrapper);
 
 VALUE rb_mysql_stmt_new(VALUE rb_client, VALUE sql);
-VALUE rb_raise_mysql2_stmt_error2(MYSQL_STMT *stmt
-#ifdef HAVE_RUBY_ENCODING_H
-  , rb_encoding* conn_enc
-#endif
-  );
+void rb_raise_mysql2_stmt_error(mysql_stmt_wrapper *stmt_wrapper) RB_MYSQL_NORETURN;
 
 #endif