mysql2 0.3.18 → 0.4.0

data/ext/mysql2/extconf.rb

@@ -2,7 +2,13 @@
 require 'mkmf'
 
 def asplode lib
-  abort "-----\n#{lib} is missing.  please check your installation of mysql and try again.\n-----"
+  if RUBY_PLATFORM =~ /mingw|mswin/
+    abort "-----\n#{lib} is missing. Check your installation of MySQL or Connector/C, and try again.\n-----"
+  elsif RUBY_PLATFORM =~ /darwin/
+    abort "-----\n#{lib} is missing. You may need to 'brew install mysql' or 'port install mysql', and try again.\n-----"
+  else
+    abort "-----\n#{lib} is missing. You may need to 'apt-get install libmysqlclient-dev' or 'yum install mysql-devel', and try again.\n-----"
+  end
 end
 
 # 2.0-only
@@ -27,9 +33,10 @@ dirs = ENV['PATH'].split(File::PATH_SEPARATOR) + %w[
   /usr/local/mysql
   /usr/local/mysql-*
   /usr/local/lib/mysql5*
+  /usr/local/opt/mysql5*
 ].map{|dir| "#{dir}/bin" }
 
-GLOB = "{#{dirs.join(',')}}/{mysql_config,mysql_config5}"
+GLOB = "{#{dirs.join(',')}}/{mysql_config,mysql_config5,mariadb_config}"
 
 # If the user has provided a --with-mysql-dir argument, we must respect it or fail.
 inc, lib = dir_config('mysql')
@@ -66,11 +73,9 @@ elsif mc = (with_config('mysql-config') || Dir[GLOB].first)
   rpath_dir = libs
 else
   inc, lib = dir_config('mysql', '/usr/local')
-  libs = ['m', 'z', 'socket', 'nsl', 'mygcc']
-  while not find_library('mysqlclient', 'mysql_query', lib, "#{lib}/mysql") do
-    exit 1 if libs.empty?
-    have_library(libs.shift)
-  end
+
+  asplode("mysql client") unless find_library('mysqlclient', 'mysql_query', lib, "#{lib}/mysql")
+
   rpath_dir = lib
 end
 
@@ -87,11 +92,20 @@ end
   asplode h unless have_header h
 end
 
-# These gcc style flags are also supported by clang and xcode compilers,
-# so we'll use a does-it-work test instead of an is-it-gcc test.
-gcc_flags = ' -Wall -funroll-loops'
-if try_link('int main() {return 0;}', gcc_flags)
-  $CFLAGS << gcc_flags
+# This is our wishlist. We use whichever flags work on the host.
+# TODO: fix statement.c and remove -Wno-declaration-after-statement
+# TODO: fix gperf mysql_enc_name_to_ruby.h and remove -Wno-missing-field-initializers
+%w(
+  -Wall
+  -Wextra
+  -Werror
+  -Wno-unused-function
+  -Wno-declaration-after-statement
+  -Wno-missing-field-initializers
+).select do |flag|
+  try_link('int main() {return 0;}', flag)
+end.each do |flag|
+  $CFLAGS << ' ' << flag
 end
 
 if RUBY_PLATFORM =~ /mswin|mingw/
@@ -108,9 +122,9 @@ if RUBY_PLATFORM =~ /mswin|mingw/
       # Maybe in the future Ruby could provide RbConfig::CONFIG['DLLTOOL'] directly.
       dlltool = RbConfig::CONFIG['DLLWRAP'].gsub('dllwrap', 'dlltool')
       sh dlltool, '--kill-at',
-         '--dllname', 'libmysql.dll',
-         '--output-lib', 'libmysql.a',
-         '--input-def', deffile, libfile
+        '--dllname', 'libmysql.dll',
+        '--output-lib', 'libmysql.a',
+        '--input-def', deffile, libfile
     end
   end
 

data/ext/mysql2/mysql2_ext.c

@@ -9,4 +9,5 @@ void Init_mysql2() {
 
   init_mysql2_client();
   init_mysql2_result();
+  init_mysql2_statement();
 }

data/ext/mysql2/mysql2_ext.h

@@ -39,6 +39,7 @@ typedef unsigned int    uint;
 #endif
 
 #include <client.h>
+#include <statement.h>
 #include <result.h>
 #include <infile.h>
 

data/ext/mysql2/mysql_enc_name_to_ruby.h

@@ -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 unsigned int len;
+     register const unsigned int len;
 {
   static const unsigned char asso_values[] =
     {
@@ -83,9 +83,9 @@ __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 unsigned int len;
+     register const 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 int key = mysql2_mysql_enc_name_to_rb_hash (str, len);
+      register const unsigned int key = mysql2_mysql_enc_name_to_rb_hash(str, len);
 
-      if (key <= MAX_HASH_VALUE && key >= 0)
+      if (key <= MAX_HASH_VALUE)
         {
           register const char *s = wordlist[key].name;