swift-db-mysql 0.2.2 → 0.3.0

data/CHANGELOG

@@ -1,3 +1,11 @@
+== 0.3.0 (2013-02-18)
+
+* added encoding option to Adapter#new
+
+== 0.2.3 (2013-01-22)
+
+* fix named parameter initialization issue in GCC versions older than 4.6
+
 == 0.2.2 (2012-11-23)
 
 * 2.x build fixes

data/README.md

@@ -10,6 +10,11 @@ MRI adapter for MySQL
 * Asynchronous support
 * Nested Transactions
 
+## Requirements
+
+* mysql client deveopment libraries
+* uuid development libraries
+
 ## API
 
 ```

data/ext/swift/db/mysql/adapter.c

@@ -88,7 +88,7 @@ char *ssl_option(VALUE ssl, char *key) {
 
 VALUE db_mysql_adapter_initialize(VALUE self, VALUE options) {
     char MYSQL_BOOL_TRUE = 1;
-    VALUE db, user, pass, host, port, ssl;
+    VALUE db, user, pass, host, port, ssl, enc;
     Adapter *a = db_mysql_adapter_handle(self);
 
     if (TYPE(options) != T_HASH)
@@ -100,6 +100,7 @@ VALUE db_mysql_adapter_initialize(VALUE self, VALUE options) {
     host = rb_hash_aref(options, ID2SYM(rb_intern("host")));
     port = rb_hash_aref(options, ID2SYM(rb_intern("port")));
     ssl  = rb_hash_aref(options, ID2SYM(rb_intern("ssl")));
+    enc  = rb_hash_aref(options, ID2SYM(rb_intern("encoding")));
 
     if (NIL_P(db))
         rb_raise(eSwiftConnectionError, "Invalid db name");
@@ -109,6 +110,8 @@ VALUE db_mysql_adapter_initialize(VALUE self, VALUE options) {
         port = rb_str_new2("3306");
     if (NIL_P(user))
         user = sUser;
+    if (NIL_P(enc))
+        enc = rb_str_new2("utf8");
 
     a->connection = mysql_init(0);
     mysql_options(a->connection, MYSQL_OPT_RECONNECT, &MYSQL_BOOL_TRUE);
@@ -132,7 +135,9 @@ VALUE db_mysql_adapter_initialize(VALUE self, VALUE options) {
         CSTRING(host), CSTRING(user), CSTRING(pass), CSTRING(db), atoi(CSTRING(port)), 0, CLIENT_FOUND_ROWS))
         rb_raise(eSwiftConnectionError, "%s", mysql_error(a->connection));
 
-    mysql_set_character_set(a->connection, "utf8");
+    if (mysql_set_character_set(a->connection, CSTRING(enc)) != 0)
+        rb_raise(eSwiftConnectionError, "%s", mysql_error(a->connection));
+
     mysql_set_local_infile_handler(
         a->connection,
         db_mysql_adapter_infile_init, db_mysql_adapter_infile_read, db_mysql_adapter_infile_end, db_mysql_adapter_infile_error,

data/ext/swift/db/mysql/common.h

@@ -27,12 +27,8 @@ DLL_PRIVATE VALUE rb_uuid_string();
 DLL_PRIVATE VALUE db_mysql_bind_sql(VALUE, VALUE, VALUE);
 
 typedef struct Command {
-    union {
-        struct {
-            MYSQL *connection;
-            VALUE sql;
-        };
-        MYSQL_STMT *statement;
-    };
     int status;
+    VALUE sql;
+    MYSQL *connection;
+    MYSQL_STMT *statement;
 } Command;

data/test/test_adapter.rb

@@ -5,6 +5,14 @@ describe 'mysql adapter' do
     assert db
   end
 
+  it 'it should allow custom encoding' do
+    assert Swift::DB::Mysql.new(db: 'swift_test', encoding: 'utf8mb4')
+  end
+
+  it 'should raise connection error on not so awesome encoding' do
+    assert_raises(Swift::ConnectionError) {Swift::DB::Mysql.new(db: 'swift_test', encoding: 'not_awesome')}
+  end
+
   it 'should execute sql' do
     assert db.execute("select * from information_schema.tables limit 1")
   end

metadata

@@ -1,25 +1,24 @@
 --- !ruby/object:Gem::Specification
 name: swift-db-mysql
 version: !ruby/object:Gem::Version
-  version: 0.2.2
   prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Bharanee Rathna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-23 00:00:00.000000000 Z
+date: 2013-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -27,6 +26,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: rake
 description: Swift adapter for MySQL database
 email:
 - deepfryed@gmail.com
@@ -44,11 +44,11 @@ files:
 - ext/swift/db/mysql/common.c
 - ext/swift/db/mysql/typecast.h
 - ext/swift/db/mysql/datetime.h
-- ext/swift/db/mysql/gvl.h
 - ext/swift/db/mysql/result.h
-- ext/swift/db/mysql/common.h
 - ext/swift/db/mysql/statement.h
 - ext/swift/db/mysql/adapter.h
+- ext/swift/db/mysql/gvl.h
+- ext/swift/db/mysql/common.h
 - ext/swift/db/mysql/extconf.rb
 - test/helper.rb
 - test/test_ssl.rb