github-migration/mysql2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some misc cleanup

Browse Source
This commit is contained in:
Brian Lopez 2010-04-01 12:04:48 -07:00
parent 631456fc58
commit 953f547f79
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ext/mysql2_ext.c
View File

@ -43,13 +43,11 @@ void rb_mysql_client_free(void * client) {
static VALUE rb_mysql_client_query(VALUE self, VALUE sql) { static VALUE rb_mysql_client_query(VALUE self, VALUE sql) {
MYSQL * client; MYSQL * client;
MYSQL_RES * result = NULL; MYSQL_RES * result;
int query;
Check_Type(sql, T_STRING); Check_Type(sql, T_STRING);
GetMysql2Client(self, client); GetMysql2Client(self, client);
query = mysql_real_query(client, RSTRING_PTR(sql), RSTRING_LEN(sql)); if (mysql_real_query(client, RSTRING_PTR(sql), RSTRING_LEN(sql)) != 0) {
if (query != 0) {
// fprintf(stdout, "mysql_real_query error: %s\n", mysql_error(client)); // fprintf(stdout, "mysql_real_query error: %s\n", mysql_error(client));
return Qnil; return Qnil;
} }
@ -132,15 +130,6 @@ static VALUE rb_mysql_result_fetch_row(int argc, VALUE * argv, VALUE self) {
if (row[i]) { if (row[i]) {
VALUE val; VALUE val;
switch(fields[i].type) { switch(fields[i].type) {
case MYSQL_TYPE_TINY_BLOB:
case MYSQL_TYPE_MEDIUM_BLOB:
case MYSQL_TYPE_LONG_BLOB:
case MYSQL_TYPE_BLOB:
case MYSQL_TYPE_VAR_STRING:
case MYSQL_TYPE_VARCHAR:
case MYSQL_TYPE_STRING: // CHAR or BINARY field
val = rb_str_new(row[i], fieldLengths[i]);
break;
case MYSQL_TYPE_NULL: // NULL-type field case MYSQL_TYPE_NULL: // NULL-type field
val = Qnil; val = Qnil;
break; break;
@ -181,6 +170,13 @@ static VALUE rb_mysql_result_fetch_row(int argc, VALUE * argv, VALUE self) {
// val = rb_funcall(cDate, intern_parse, 1, rb_str_new(row[i], fieldLengths[i])); // val = rb_funcall(cDate, intern_parse, 1, rb_str_new(row[i], fieldLengths[i]));
// val = rb_str_new(row[i], fieldLengths[i]); // val = rb_str_new(row[i], fieldLengths[i]);
// break; // break;
case MYSQL_TYPE_TINY_BLOB:
case MYSQL_TYPE_MEDIUM_BLOB:
case MYSQL_TYPE_LONG_BLOB:
case MYSQL_TYPE_BLOB:
case MYSQL_TYPE_VAR_STRING:
case MYSQL_TYPE_VARCHAR:
case MYSQL_TYPE_STRING: // CHAR or BINARY field
case MYSQL_TYPE_SET: // SET field case MYSQL_TYPE_SET: // SET field
case MYSQL_TYPE_ENUM: // ENUM field case MYSQL_TYPE_ENUM: // ENUM field
case MYSQL_TYPE_GEOMETRY: // Spatial fielda case MYSQL_TYPE_GEOMETRY: // Spatial fielda

2
ext/mysql2_ext.h
View File

@ -25,6 +25,6 @@ void rb_mysql_client_free(void * client);
VALUE cMysql2Result; VALUE cMysql2Result;
static ID sym_symbolize_keys; static ID sym_symbolize_keys;
static VALUE rb_mysql_result_to_obj(MYSQL_RES * res); static VALUE rb_mysql_result_to_obj(MYSQL_RES * res);
void rb_mysql_result_free(void * result);
static VALUE rb_mysql_result_fetch_row(int argc, VALUE * argv, VALUE self); static VALUE rb_mysql_result_fetch_row(int argc, VALUE * argv, VALUE self);
static VALUE rb_mysql_result_fetch_rows(int argc, VALUE * argv, VALUE self); static VALUE rb_mysql_result_fetch_rows(int argc, VALUE * argv, VALUE self);
void rb_mysql_result_free(void * result);