swift-db-mysql 0.3.0 → 0.3.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ee5b272d79d1ac384a2e922b217fa23ee4c1ef74
+  data.tar.gz: e765c67b44843fb780decc4e9eff46b0c8721810
+SHA512:
+  metadata.gz: 57b271d67812362c0c2e776420db1f4673c8ac9a5b6dd7670e215a2662fc9ac0048c84530055452bed350aa2fc7c777c47b4cba08ca464c82d2b15a8ffff68d9
+  data.tar.gz: d1473cc7ad558e0b74a8fcad72f7abe661ded46dfc49de4cc8d29b7b3ec6ce0b9f321379115c0b71597014fcdf2e80663db16dc069acf74069865e726ae846da

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.3.1 (2015-03-22)
+
+* prepared statement uuid overflow fix. 
+
 == 0.3.0 (2013-02-18)
 
 * added encoding option to Adapter#new

data/README.md

@@ -12,8 +12,15 @@ MRI adapter for MySQL
 
 ## Requirements
 
-* mysql client deveopment libraries
-* uuid development libraries
+* mysql client deveopment libraries (libmysqlclient-dev)
+* uuid development libraries (uuid-dev)
+
+## Building
+
+```
+git submodule update --init
+rake
+```
 
 ## API
 
@@ -49,6 +56,27 @@ MRI adapter for MySQL
     #insert_id
 ```
 
+## Connection options
+
+```
+╭────────────────────╥────────────┬─────────────╮
+│ Name               ║  Default   │  Optional   │
+╞════════════════════╬════════════╪═════════════╡
+│ db                 ║  -         │  No         │
+│ host               ║  127.0.0.1 │  Yes        │
+│ port               ║  3306      │  Yes        │
+│ user               ║  Etc.login │  Yes        │
+│ password           ║  nil       │  Yes        │
+│ encoding           ║  utf8      │  Yes        │
+│ ssl                ║            │  Yes        │
+│ ssl[:key]          ║  -         │  No         │
+│ ssl[:cert]         ║  nil       │  Yes        │
+│ ssl[:ca]           ║  nil       │  Yes        │
+│ ssl[:capath]       ║  nil       │  Yes        │
+│ ssl[:cipher]       ║  nil       │  Yes        │
+└────────────────────╨────────────┴─────────────┘
+```
+
 ## Example
 
 ```ruby

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

@@ -4,7 +4,17 @@
 
 #include "common.h"
 #include "typecast.h"
-#include <uuid/uuid.h>
+
+#ifdef HAVE_CONST_UUID_VARIANT_NCS
+    #include <uuid/uuid.h>
+#else
+    // TODO: no guarantee of being unique.
+    typedef unsigned char uuid_t[16];
+    void uuid_generate(uuid_t uuid) {
+        for (int i = 0; i < sizeof(uuid); i++)
+            uuid[i] = rand() % 256;
+    }
+#endif
 
 VALUE db_mysql_adapter_escape(VALUE, VALUE);
 
@@ -14,11 +24,12 @@ VALUE rb_uuid_string() {
     char uuid_hex[sizeof(uuid_t) * 2 + 1];
 
     uuid_generate(uuid);
+
+    memset(uuid_hex, 0, sizeof(uuid_hex));
     for (n = 0; n < sizeof(uuid_t); n++)
-        sprintf(uuid_hex + n * 2 + 1, "%02x", uuid[n]);
+        sprintf(uuid_hex + n * 2, "%02x", uuid[n]);
 
-    uuid_hex[0] = 'u';
-    return rb_str_new(uuid_hex, sizeof(uuid_t) * 2 + 1);
+    return rb_str_new(uuid_hex, sizeof(uuid_t) * 2);
 }
 
 size_t db_mysql_buffer_adjust(char **buffer, size_t size, size_t offset, size_t need) {

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

@@ -1,6 +1,11 @@
 #include "datetime.h"
+#include <time.h>
 #include <ctype.h>
 
+#define CONST_GET(scope, constant) rb_funcall(scope, rb_intern("const_get"), 1, rb_str_new2(constant))
+#define TO_S(v)                    rb_funcall(v, rb_intern("to_s"), 0)
+#define CSTRING(v)                 RSTRING_PTR(TO_S(v))
+
 extern VALUE dtformat;
 
 VALUE cSwiftDateTime, day_seconds;

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

@@ -1,8 +1,11 @@
 #pragma once
 
-#include "common.h"
-#include <math.h>
+#include <ruby.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdbool.h>
 
-DLL_PRIVATE extern VALUE cSwiftDateTime;
-DLL_PRIVATE void init_swift_datetime();
-DLL_PRIVATE VALUE datetime_parse(VALUE klass, const char *data, size_t size);
+extern VALUE cSwiftDateTime;
+void init_swift_datetime();
+VALUE datetime_parse(VALUE klass, const char *data, size_t size);

data/ext/swift/db/mysql/extconf.rb

@@ -34,4 +34,5 @@ find_header 'mysql.h', *inc_paths.dup.unshift(mysql_inc).compact
 find_library 'uuid',        'main', *lib_paths.dup.unshift(uuid_lib).compact
 find_library 'mysqlclient', 'main', *lib_paths.dup.unshift(mysql_lib).compact
 
+have_const(%w(UUID_VARIANT_NCS), 'uuid.h')
 create_makefile('swift_db_mysql_ext')

data/test/test_async.rb

@@ -2,33 +2,35 @@ require 'helper'
 
 describe 'async operations' do
   it 'can query async and call block with result when ready' do
-    rows = []
-    pool = 3.times.map {Swift::DB::Mysql.new(db: 'swift_test')}
+    rows    = []
+    threads = []
+    pool    = 3.times.map {Swift::DB::Mysql.new(db: 'swift_test')}
 
     3.times do |n|
-      Thread.new do
+      threads << Thread.new do
         pool[n].query("select sleep(#{(3 - n) / 10.0}), #{n + 1} as query_id") {|row| rows << row[:query_id]}
       end
     end
 
-    Thread.list.reject {|thread| Thread.current == thread}.each(&:join)
+    threads.each(&:join)
     assert_equal [3, 2, 1], rows
   end
 
   it 'returns and allows IO poll on connection file descriptor' do
 
-    rows = []
-    pool = 3.times.map {Swift::DB::Mysql.new(db: 'swift_test')}
+    rows    = []
+    threads = []
+    pool    = 3.times.map {Swift::DB::Mysql.new(db: 'swift_test')}
 
     3.times do |n|
-      Thread.new do
+      threads << Thread.new do
         pool[n].query("select sleep(#{(3 - n) / 10.0}), #{n + 1} as query_id")
         IO.select([IO.for_fd(pool[n].fileno)], [], [])
         rows << pool[n].result.first[:query_id]
       end
     end
 
-    Thread.list.reject {|thread| Thread.current == thread}.each(&:join)
+    threads.each(&:join)
     assert_equal [3, 2, 1], rows
   end
 end

data/test/test_ssl.rb

@@ -1,10 +1,11 @@
 require 'helper'
 
 describe 'adapter ssl' do
-# TODO: this seems to rely on openssl versions used to build the mysql server.
-# it 'should connect to database with ssl options' do
-#   key  = File.join(File.dirname(__FILE__), 'server.key')
-#   cert = File.join(File.dirname(__FILE__), 'server.crt')
-#   assert Swift::DB::Mysql.new(db: 'swift_test', ssl: {key: key, cert: cert})
-# end
+  # TODO: this seems to rely on openssl versions used to build the mysql server.
+  it 'should connect to database with ssl options' do
+    skip
+    key  = File.join(File.dirname(__FILE__), 'server.key')
+    cert = File.join(File.dirname(__FILE__), 'server.crt')
+    assert Swift::DB::Mysql.new(db: 'swift_test', ssl: {key: key, cert: cert})
+  end
 end

metadata

@@ -1,32 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: swift-db-mysql
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Bharanee Rathna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-18 00:00:00.000000000 Z
+date: 2015-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :development
+  name: rake
   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
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rake
 description: Swift adapter for MySQL database
 email:
 - deepfryed@gmail.com
@@ -35,53 +32,53 @@ extensions:
 - ext/swift/db/mysql/extconf.rb
 extra_rdoc_files: []
 files:
-- ext/swift/db/mysql/datetime.c
-- ext/swift/db/mysql/main.c
-- ext/swift/db/mysql/typecast.c
+- CHANGELOG
+- README.md
 - ext/swift/db/mysql/adapter.c
-- ext/swift/db/mysql/result.c
-- ext/swift/db/mysql/statement.c
+- ext/swift/db/mysql/adapter.h
 - ext/swift/db/mysql/common.c
-- ext/swift/db/mysql/typecast.h
+- ext/swift/db/mysql/common.h
+- ext/swift/db/mysql/datetime.c
 - ext/swift/db/mysql/datetime.h
+- ext/swift/db/mysql/extconf.rb
+- ext/swift/db/mysql/gvl.h
+- ext/swift/db/mysql/main.c
+- ext/swift/db/mysql/result.c
 - ext/swift/db/mysql/result.h
+- ext/swift/db/mysql/statement.c
 - 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
+- ext/swift/db/mysql/typecast.c
+- ext/swift/db/mysql/typecast.h
+- lib/swift-db-mysql.rb
+- lib/swift/db/mysql.rb
 - test/helper.rb
-- test/test_ssl.rb
-- test/test_encoding.rb
 - test/test_adapter.rb
 - test/test_async.rb
-- lib/swift/db/mysql.rb
-- lib/swift-db-mysql.rb
-- README.md
-- CHANGELOG
+- test/test_encoding.rb
+- test/test_ssl.rb
 homepage: http://github.com/deepfryed/swift-db-mysql
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Swift mysql adapter
 test_files: []
+has_rdoc: