RubyGems - ruby-odbc - Versions diffs - 0.99997 → 0.99998 - Mend

ruby-odbc 0.99997 → 0.99998

Files changed (8) hide show

data/ChangeLog CHANGED

@@ -1,6 +1,11 @@
 ODBC binding for Ruby
 ---------------------
+Wed Feb 15 2017 version 0.99998 released
+	* minor update to compile with Ruby 2.4, thangs to Kevin Deisz
+	* preset output vars before SQLColAttributes() call
 Wed Apr 15 2015 version 0.99997 released
 	* fixed bug (typo) when compiling with Ruby < 2.0

data/README CHANGED

@@ -1,6 +1,6 @@
-# $Id: README,v 1.44 2015/04/15 13:58:39 chw Exp chw $
+# $Id: README,v 1.45 2017/02/15 10:03:36 chw Exp chw $
-ruby-odbc-0.99997
+ruby-odbc-0.99998
 This is an ODBC binding for Ruby. So far it has been tested with
@@ -20,6 +20,8 @@ This is an ODBC binding for Ruby. So far it has been tested with
     - Ruby 2.0.0, SQLite/ODBC >= 0.93, unixODBC 2.2.14 on Ubuntu 12.04 x86
+    - Ruby 2.4
     Michael Neumann <neumann@s-direktnet.de> and
     Will Merrell <wmerrell@catalystcorp.com> reported successful compilation
     with Cygwin on Win32.

data/doc/odbc.html CHANGED

@@ -27,7 +27,7 @@
   <body>
     <h1><a name="reference">Ruby ODBC Reference</a></h1>
     <div class = "lastmodifed">
-      Last update: Wed, 13 March 2013
+      Last update: Wed, 15 February 2017
     </div>
     <hr>
     <div>

data/ext/odbc.c CHANGED

@@ -8,7 +8,7 @@
  * and redistribution of this file and for a
  * DISCLAIMER OF ALL WARRANTIES.
  *
- * $Id: odbc.c,v 1.77 2015/04/15 06:03:11 chw Exp chw $
+ * $Id: odbc.c,v 1.78 2017/02/15 10:04:30 chw Exp chw $
  */
 #undef ODBCVER
@@ -4123,10 +4123,10 @@ make_coltypes(SQLHSTMT hstmt, int ncols, char **msgp)
 {
     int i;
     COLTYPE *ret = NULL;
-    SQLLEN type, size = 0;
     for (i = 0; i < ncols; i++) {
 	SQLUSMALLINT ic = i + 1;
+	SQLLEN type = SQL_UNKNOWN_TYPE, size = 0;
 	if (!succeeded(SQL_NULL_HENV, SQL_NULL_HDBC, hstmt,
 		       SQLColAttributes(hstmt, ic,
@@ -4152,6 +4152,7 @@ make_coltypes(SQLHSTMT hstmt, int ncols, char **msgp)
     }
     for (i = 0; i < ncols; i++) {
 	SQLUSMALLINT ic = i + 1;
+	SQLLEN type = SQL_UNKNOWN_TYPE, size = 0;
 	callsql(SQL_NULL_HENV, SQL_NULL_HDBC, hstmt,
 		SQLColAttributes(hstmt, ic,
@@ -4509,7 +4510,7 @@ make_column(SQLHSTMT hstmt, int i, int upc, int use_scn)
 {
     VALUE obj, v;
     SQLUSMALLINT ic = i + 1;
-    SQLLEN iv = 0;
+    SQLLEN iv;
 #ifdef UNICODE
     SQLWCHAR name[SQL_MAX_MESSAGE_LENGTH];
 #else
@@ -4581,6 +4582,7 @@ make_column(SQLHSTMT hstmt, int i, int upc, int use_scn)
 #endif
     }
     rb_iv_set(obj, "@table", v);
+    iv = SQL_UNKNOWN_TYPE;
     if (succeeded(SQL_NULL_HENV, SQL_NULL_HDBC, hstmt,
 		  SQLColAttributes(hstmt, ic, SQL_COLUMN_TYPE, NULL,
 				   0, NULL, &iv),
@@ -4591,6 +4593,7 @@ make_column(SQLHSTMT hstmt, int i, int upc, int use_scn)
     }
     rb_iv_set(obj, "@type", v);
     v = Qnil;
+    iv = 0;
     if (succeeded(SQL_NULL_HENV, SQL_NULL_HDBC, hstmt,
 		  SQLColAttributes(hstmt, ic,
 #if (ODBCVER >= 0x0300)
@@ -4616,6 +4619,7 @@ make_column(SQLHSTMT hstmt, int i, int upc, int use_scn)
     }
     rb_iv_set(obj, "@length", v);
     v = Qnil;
+    iv = SQL_NO_NULLS;
     if (succeeded(SQL_NULL_HENV, SQL_NULL_HDBC, hstmt,
 		  SQLColAttributes(hstmt, ic, SQL_COLUMN_NULLABLE, NULL,
 				   0, NULL, &iv),
@@ -4624,6 +4628,7 @@ make_column(SQLHSTMT hstmt, int i, int upc, int use_scn)
     }
     rb_iv_set(obj, "@nullable", v);
     v = Qnil;
+    iv = 0;
     if (succeeded(SQL_NULL_HENV, SQL_NULL_HDBC, hstmt,
 		  SQLColAttributes(hstmt, ic, SQL_COLUMN_SCALE, NULL,
 				   0, NULL, &iv),
@@ -4632,6 +4637,7 @@ make_column(SQLHSTMT hstmt, int i, int upc, int use_scn)
     }
     rb_iv_set(obj, "@scale", v);
     v = Qnil;
+    iv = 0;
     if (succeeded(SQL_NULL_HENV, SQL_NULL_HDBC, hstmt,
 		  SQLColAttributes(hstmt, ic, SQL_COLUMN_PRECISION, NULL,
 				   0, NULL, &iv),
@@ -4640,23 +4646,26 @@ make_column(SQLHSTMT hstmt, int i, int upc, int use_scn)
     }
     rb_iv_set(obj, "@precision", v);
     v = Qnil;
+    iv = SQL_UNSEARCHABLE;
     if (succeeded(SQL_NULL_HENV, SQL_NULL_HDBC, hstmt,
 		  SQLColAttributes(hstmt, ic, SQL_COLUMN_SEARCHABLE, NULL,
 				   0, NULL, &iv),
 		  NULL, "SQLColAttributes(SQL_COLUMN_SEARCHABLE)")) {
-	v = (iv == SQL_NO_NULLS) ? Qfalse : Qtrue;
+	v = (iv == SQL_UNSEARCHABLE) ? Qfalse : Qtrue;
     }
     rb_iv_set(obj, "@searchable", v);
     v = Qnil;
+    iv = SQL_FALSE;
     if (succeeded(SQL_NULL_HENV, SQL_NULL_HDBC, hstmt,
 		  SQLColAttributes(hstmt, ic, SQL_COLUMN_UNSIGNED, NULL,
 				   0, NULL, &iv),
 		  NULL, "SQLColAttributes(SQL_COLUMN_UNSIGNED)")) {
-	v = (iv == SQL_NO_NULLS) ? Qfalse : Qtrue;
+	v = (iv == SQL_FALSE) ? Qfalse : Qtrue;
     }
     rb_iv_set(obj, "@unsigned", v);
     v = Qnil;
 #ifdef SQL_COLUMN_AUTO_INCREMENT
+    iv = SQL_FALSE;
     if (succeeded(SQL_NULL_HENV, SQL_NULL_HDBC, hstmt,
 		  SQLColAttributes(hstmt, ic, SQL_COLUMN_AUTO_INCREMENT, NULL,
 				   0, NULL, &iv),
@@ -5220,12 +5229,16 @@ do_option(int argc, VALUE *argv, VALUE self, int isstmt, int op)
 {
     DBC *p = NULL;
     STMT *q = NULL;
-    VALUE val, val2, vstr;
+    VALUE val, val2 = Qnil;
     SQLINTEGER v;
     char *msg;
     int level = isstmt ? OPT_LEVEL_STMT : OPT_LEVEL_DBC;
-    rb_scan_args(argc, argv, (op == -1) ? "11" : "01", &val, &val2);
+    if (op == -1) {
+	rb_scan_args(argc, argv, "11", &val, &val2);
+    } else {
+	rb_scan_args(argc, argv, "01", &val);
+    }
     if (isstmt) {
 	Data_Get_Struct(self, STMT, q);
 	if (q->dbc == Qnil) {
@@ -5241,6 +5254,7 @@ do_option(int argc, VALUE *argv, VALUE self, int isstmt, int op)
 	}
     }
     if (op == -1) {
+	VALUE vstr;
 	char *string;
 	int i, op_found = 0;

data/ruby-odbc.gemspec CHANGED

@@ -1,7 +1,7 @@
 require 'date'
 spec = Gem::Specification.new do |s|
   s.name = "ruby-odbc"
-  s.version = "0.99997"
+  s.version = "0.99998"
   s.date = Date.today.to_s
   s.author = "Christian Werner"
   s.email = "chw @nospam@ ch-werner.de"

data/test/30select.rb CHANGED

@@ -1,4 +1,4 @@
-$q = $c.prepare("select id,str from test")
+$q = $c.prepare("select id,str from test order by id")
 if $q.column(0).name.upcase != "ID" then raise "fetch failed" end
 if $q.column(1).name.upcase != "STR" then raise "fetch failed" end

metadata CHANGED

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ruby-odbc
 version: !ruby/object:Gem::Version
-  version: '0.99997'
+  version: '0.99998'
+  prerelease:
 platform: ruby
 authors:
 - Christian Werner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-17 00:00:00.000000000 Z
+date: 2017-02-15 00:00:00.000000000 Z
 dependencies: []
 description:
 email: chw @nospam@ ch-werner.de
@@ -24,51 +25,53 @@ extra_rdoc_files:
 - doc/odbc.html
 files:
 - COPYING
-- ChangeLog
-- GPL
-- MANIFEST
-- README
-- doc/odbc.html
-- ext/extconf.rb
-- ext/init.c
 - ext/odbc.c
+- ext/utf8/odbc.c
 - ext/utf8/extconf.rb
 - ext/utf8/init.c
-- ext/utf8/odbc.c
-- lib/cqgen.rb
+- ext/extconf.rb
+- ext/init.c
 - ruby-odbc.gemspec
-- test/00connect.rb
+- README
+- lib/cqgen.rb
+- MANIFEST
+- GPL
+- ChangeLog
+- doc/odbc.html
+- ruby-odbc-0.99998.gem
+- test/40update.rb
 - test/10create_table.rb
+- test/70close.rb
+- test/00connect.rb
 - test/20insert.rb
-- test/30select.rb
-- test/40update.rb
 - test/45delete.rb
+- test/utf8/test.rb
 - test/50drop_table.rb
-- test/70close.rb
+- test/30select.rb
 - test/test.rb
-- test/utf8/test.rb
 homepage: http://www.ch-werner.de/rubyodbc
 licenses: []
-metadata: {}
 post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 - lib
 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: 2.4.5
+rubygems_version: 1.8.23
 signing_key:
-specification_version: 4
+specification_version: 3
 summary: ODBC binding for Ruby
 test_files: []

checksums.yaml DELETED

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: fe13750acbbaeb8c33adb7af778eaba01174229d
-  data.tar.gz: ab8d5d5837ea84f4dca124994e4db2fdb3cc1c24
-SHA512:
-  metadata.gz: 99ac5be18b63d180ca059fde5808d654c60f8d4e014ec4903778c56830da517d38f23b63861a91dedde012a3e71b170c6a33bcd18ae70ab1dbc811d25b58a952
-  data.tar.gz: ce00b6f94cbc7296f20871853cff5295be26ea9a5b7b39093bf4ba7b36811d932ccc9bcd246014558288adb6aa8f781dcd7c4fed03362e68f48b64f29a1eee70