ruby-odbc 0.99999 → 0.999991

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ebe50088f7b79d16a5dc300d6b07890b808a57c6
-  data.tar.gz: 5bfa7a5595c786bcf6125b4bb43f5e0c1312b9cd
+SHA256:
+  metadata.gz: 860fc0eb5595959ec764079118f528b5b0afa5d49e919ab0f8c46e971bd7dbc0
+  data.tar.gz: 843b2f2427d1378489cbc6eea0cb3e3ce5daff17f42ac3a040a0a979f04dddae
 SHA512:
-  metadata.gz: f5ab42fe5a650e2d88cda3106ec3beea1e53bdc651ef6b9ca8848d61904c5b7a4b86e89373e3f392c971ad5cdc8cf3b0423d4163349fa62b337dc2a6cb502c6d
-  data.tar.gz: 3f0fd86fce0f7a08cb59913483a4f494a24dcbc4cfb00eceffeb822a63eb7fdee644a6e13ba5e0a83e7375ed3e9c5f88c4f2f36e778e8e52fc643a797aa4bb56
+  metadata.gz: 600c7ef68780fa4f3eae56dddd7ca01fa1cbd425b58a0c50663688bcefddc6b2471b79e0a51e044d95c570e531a91e4b883c5aa9b813c84c1997498e93024f5e
+  data.tar.gz: 020cd8f08ffce0d846262d839db86b8741db74eeb0ce774ce69aa99d09a56a5b9cd70abf36b06d27f9216118aff945d3ace3778c93f914794c30420c8a43dfab

data/COPYING

@@ -1,4 +1,4 @@
-Ruby/ODBC is copyrighted free software by Christian Werner <chw@ch-werner.de>
+Ruby/ODBC is copyrighted free software by Christian Werner chw at ch-werner.de
 You can redistribute it and/or modify it under either the terms of the GPL
 (see the file GPL), or the conditions below:
 

data/ChangeLog

@@ -1,6 +1,11 @@
 ODBC binding for Ruby
 ---------------------
 
+Sat Dec 26 2020 version 0.999991 released
+
+	* update to compile with newer Ruby releases
+	* report larger width for SQL_(DECIMAL|NUMERIC) columns
+
 Wed Feb 28 2018 version 0.99999 released
 
 	* update to compile with newer Ruby releases, thanks

data/README

@@ -1,6 +1,6 @@
-# $Id: README,v 1.46 2018/02/28 15:08:50 chw Exp chw $
+# $Id: README,v 1.47 2020/12/25 21:47:43 chw Exp chw $
 
-ruby-odbc-0.99999
+ruby-odbc-0.999991
 
 This is an ODBC binding for Ruby. So far it has been tested with
 
@@ -20,11 +20,11 @@ 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
+    - Ruby >= 2.4
 
-    Michael Neumann <neumann@s-direktnet.de> and
-    Will Merrell <wmerrell@catalystcorp.com> reported successful compilation
-    with Cygwin on Win32.
+    Michael Neumann <neumann @nospam@ s-direktnet.de> and
+    Will Merrell <wmerrell @nospam@ catalystcorp.com> reported successful
+    compilation with Cygwin on Win32.
 
 Requirements:
 
@@ -110,5 +110,5 @@ TODO:
 Author:
 
     Christian Werner
-    mailto:chw@ch-werner.de
+    mailto:chw @nospam@ ch-werner.de
     http://www.ch-werner.de/rubyodbc

data/ext/extconf.rb

@@ -20,6 +20,7 @@ end
  
 dir_config("odbc")
 have_header("version.h")
+have_header("ruby/version.h")
 have_header("sql.h") || begin
   puts "ERROR: sql.h not found"
   exit 1

data/ext/odbc.c

@@ -1,6 +1,6 @@
 /*
  * ODBC-Ruby binding
- * Copyright (c) 2001-2015 Christian Werner <chw@ch-werner.de>
+ * Copyright (c) 2001-2020 Christian Werner <chw@ch-werner.de>
  * Portions copyright (c) 2004 Ryszard Niewisiewicz <micz@fibernet.pl>
  * Portions copyright (c) 2006 Carl Blakeley <cblakeley@openlinksw.co.uk>
  *
@@ -8,7 +8,7 @@
  * and redistribution of this file and for a
  * DISCLAIMER OF ALL WARRANTIES.
  *
- * $Id: odbc.c,v 1.79 2018/02/28 15:15:24 chw Exp chw $
+ * $Id: odbc.c,v 1.80 2020/12/25 21:45:42 chw Exp chw $
  */
 
 #undef ODBCVER
@@ -22,6 +22,9 @@
 #ifdef HAVE_VERSION_H
 #include "version.h"
 #endif
+#ifdef HAVE_RUBY_VERSION_H
+#include "ruby/version.h"
+#endif
 #ifdef HAVE_SQL_H
 #include <sql.h>
 #else
@@ -65,6 +68,12 @@ typedef SQLCHAR SQLTCHAR;
 #define TIME_USE_USEC 1
 #endif
 
+#if (RUBY_API_VERSION_CODE >= 20500)
+#define FUNCALL_NOARGS(o, m) rb_funcall((o), (m), 0)
+#else
+#define FUNCALL_NOARGS(o, m) rb_funcall((o), (m), 0, NULL)
+#endif
+
 #ifdef HAVE_RUBY_THREAD_H
 #include "ruby/thread.h"
 #endif
@@ -1824,7 +1833,7 @@ free_stmt(STMT *q)
 static void
 start_gc()
 {
-    rb_funcall(rb_mGC, IDstart, 0, NULL);
+    FUNCALL_NOARGS(rb_mGC, IDstart);
 }
 
 static void
@@ -1899,6 +1908,7 @@ get_err_or_info(SQLHENV henv, SQLHDBC hdbc, SQLHSTMT hstmt, int isinfo)
 	msg[SQL_MAX_MESSAGE_LENGTH - 1] = '\0';
 	switch (err) {
 	case SQL_SUCCESS:
+	case SQL_SUCCESS_WITH_INFO:
 #ifdef UNICODE
 	    v = uc_str_new2(state);
 #else
@@ -2513,7 +2523,7 @@ conf_dsn(int argc, VALUE *argv, VALUE self, int op)
     if (rb_obj_is_kind_of(attr, rb_cHash) == Qtrue) {
 	VALUE a, x;
 
-	a = rb_funcall(attr, IDkeys, 0, NULL);
+	a = FUNCALL_NOARGS(attr, IDkeys);
 	while ((x = rb_ary_shift(a)) != Qnil) {
 	    VALUE v = rb_hash_aref(attr, x);
 
@@ -3018,7 +3028,7 @@ dbc_drvconnect(VALUE self, VALUE drv)
 	VALUE d, a, x;
 
 	d = rb_str_new2("");
-	a = rb_funcall(rb_iv_get(drv, "@attrs"), IDkeys, 0, NULL);
+	a = FUNCALL_NOARGS(rb_iv_get(drv, "@attrs"), IDkeys);
 	while ((x = rb_ary_shift(a)) != Qnil) {
 	    VALUE v = rb_hash_aref(rb_iv_get(drv, "@attrs"), x);
 
@@ -4238,6 +4248,22 @@ make_coltypes(SQLHSTMT hstmt, int ncols, char **msgp)
 	    }
 	    break;
 #endif
+	case SQL_DECIMAL:
+	case SQL_NUMERIC:
+	    if ((size == 0) || (size > SEGSIZE)) {
+		size = SQL_NO_TOTAL;
+	    }
+	    if (size != SQL_NO_TOTAL) {
+		size += 2;	/* sign and decimal point */
+		size += 1;	/* NUL terminator */
+	    }
+#ifdef UNICODE
+	    type = SQL_C_WCHAR;
+	    size *= sizeof (SQLWCHAR);
+#else
+	    type = SQL_C_CHAR;
+#endif
+	    break;
 	default:
 	    if ((size == 0) || (size > SEGSIZE)) {
 		size = SQL_NO_TOTAL;
@@ -5095,7 +5121,7 @@ dbc_transaction(VALUE self)
     }
     ret = rb_ary_entry(a, 1);
     rb_exc_raise(rb_exc_new3(rb_obj_class(ret),
-			     rb_funcall(ret, IDto_s, 0, 0)));
+			     FUNCALL_NOARGS(ret, IDto_s)));
     return Qnil;
 }
 
@@ -5660,16 +5686,16 @@ date_init(int argc, VALUE *argv, VALUE self)
 	if (argc > 1) {
 	    rb_raise(rb_eArgError, "wrong # arguments");
 	}
-	d = rb_funcall(y, IDday, 0, NULL);
-	m = rb_funcall(y, IDmonth, 0, NULL);
-	y = rb_funcall(y, IDyear, 0, NULL);
+	d = FUNCALL_NOARGS(y, IDday);
+	m = FUNCALL_NOARGS(y, IDmonth);
+	y = FUNCALL_NOARGS(y, IDyear);
     } else if (rb_obj_is_kind_of(y, rb_cDate) == Qtrue) {
 	if (argc > 1) {
 	    rb_raise(rb_eArgError, "wrong # arguments");
 	}
-	d = rb_funcall(y, IDmday, 0, NULL);
-	m = rb_funcall(y, IDmonth, 0, NULL);
-	y = rb_funcall(y, IDyear, 0, NULL);
+	d = FUNCALL_NOARGS(y, IDmday);
+	m = FUNCALL_NOARGS(y, IDmonth);
+	y = FUNCALL_NOARGS(y, IDyear);
     } else if ((argc == 1) && (rb_obj_is_kind_of(y, rb_cString) == Qtrue)) {
 	if (date_load1(self, y, 0) != Qnil) {
 	    return self;
@@ -5895,9 +5921,9 @@ time_init(int argc, VALUE *argv, VALUE self)
 	if (argc > 1) {
 	    rb_raise(rb_eArgError, "wrong # arguments");
 	}
-	s = rb_funcall(h, IDsec, 0, NULL);
-	m = rb_funcall(h, IDmin, 0, NULL);
-	h = rb_funcall(h, IDhour, 0, NULL);
+	s = FUNCALL_NOARGS(h, IDsec);
+	m = FUNCALL_NOARGS(h, IDmin);
+	h = FUNCALL_NOARGS(h, IDhour);
     } else if ((argc == 1) && (rb_obj_is_kind_of(h, rb_cString) == Qtrue)) {
 	if (time_load1(self, h, 0) != Qnil) {
 	    return self;
@@ -6135,13 +6161,13 @@ timestamp_init(int argc, VALUE *argv, VALUE self)
 	if (argc > 1) {
 	    rb_raise(rb_eArgError, "wrong # arguments");
 	}
-	f  = rb_funcall(y, IDusec, 0, NULL);
-	ss = rb_funcall(y, IDsec, 0, NULL);
-	mm = rb_funcall(y, IDmin, 0, NULL);
-	hh = rb_funcall(y, IDhour, 0, NULL);
-	d  = rb_funcall(y, IDday, 0, NULL);
-	m  = rb_funcall(y, IDmonth, 0, NULL);
-	y  = rb_funcall(y, IDyear, 0, NULL);
+	f  = FUNCALL_NOARGS(y, IDusec);
+	ss = FUNCALL_NOARGS(y, IDsec);
+	mm = FUNCALL_NOARGS(y, IDmin);
+	hh = FUNCALL_NOARGS(y, IDhour);
+	d  = FUNCALL_NOARGS(y, IDday);
+	m  = FUNCALL_NOARGS(y, IDmonth);
+	y  = FUNCALL_NOARGS(y, IDyear);
 	f = INT2NUM(NUM2INT(f) * 1000);
     } else if (rb_obj_is_kind_of(y, rb_cDate) == Qtrue) {
 	if (argc > 1) {
@@ -6151,9 +6177,9 @@ timestamp_init(int argc, VALUE *argv, VALUE self)
 	ss = INT2FIX(0);
 	mm = INT2FIX(0);
 	hh = INT2FIX(0);
-	d  = rb_funcall(y, IDmday, 0, NULL);
-	m  = rb_funcall(y, IDmonth, 0, NULL);
-	y  = rb_funcall(y, IDyear, 0, NULL);
+	d  = FUNCALL_NOARGS(y, IDmday);
+	m  = FUNCALL_NOARGS(y, IDmonth);
+	y  = FUNCALL_NOARGS(y, IDyear);
     } else if ((argc == 1) && (rb_obj_is_kind_of(y, rb_cString) == Qtrue)) {
 	if (timestamp_load1(self, y, 0) != Qnil) {
 	    return self;
@@ -6628,13 +6654,13 @@ stmt_param_output_value(int argc, VALUE *argv, VALUE self)
 
 		time = (TIME_STRUCT *) q->paraminfo[vnum].outbuf;
 		frac = rb_float_new(0.0);
-		now = rb_funcall(rb_cTime, IDnow, 0, NULL);
+		now = FUNCALL_NOARGS(rb_cTime, IDnow);
 		v = rb_funcall(rb_cTime,
 			       (q->dbcp->gmtime == Qtrue) ? IDutc : IDlocal,
 			       7,
-			       rb_funcall(now, IDyear, 0, NULL),
-			       rb_funcall(now, IDmonth, 0, NULL),
-			       rb_funcall(now, IDday, 0, NULL),
+			       FUNCALL_NOARGS(now, IDyear),
+			       FUNCALL_NOARGS(now, IDmonth),
+			       FUNCALL_NOARGS(now, IDday),
 			       INT2NUM(time->hour),
 			       INT2NUM(time->minute),
 			       INT2NUM(time->second),
@@ -7285,14 +7311,14 @@ do_fetch(STMT *q, int mode)
 
 			time = (TIME_STRUCT *) valp;
 			frac = rb_float_new(0.0);
-			now = rb_funcall(rb_cTime, IDnow, 0, NULL);
+			now = FUNCALL_NOARGS(rb_cTime, IDnow);
 			v = rb_funcall(rb_cTime,
 				       (q->dbcp->gmtime == Qtrue) ?
 				       IDutc : IDlocal,
 				       7,
-				       rb_funcall(now, IDyear, 0, NULL),
-				       rb_funcall(now, IDmonth, 0, NULL),
-				       rb_funcall(now, IDday, 0, NULL),
+				       FUNCALL_NOARGS(now, IDyear),
+				       FUNCALL_NOARGS(now, IDmonth),
+				       FUNCALL_NOARGS(now, IDday),
 				       INT2NUM(time->hour),
 				       INT2NUM(time->minute),
 				       INT2NUM(time->second),
@@ -8148,9 +8174,9 @@ bind_one_param(int pnum, VALUE arg, STMT *q, char **msgp, int *outpp)
 		ctype = SQL_C_TIME;
 		time = (TIME_STRUCT *) valp;
 		memset(time, 0, sizeof (TIME_STRUCT));
-		time->hour   = rb_funcall(arg, IDhour, 0, NULL);
-		time->minute = rb_funcall(arg, IDmin, 0, NULL);
-		time->second = rb_funcall(arg, IDsec, 0, NULL);
+		time->hour   = FUNCALL_NOARGS(arg, IDhour);
+		time->minute = FUNCALL_NOARGS(arg, IDmin);
+		time->second = FUNCALL_NOARGS(arg, IDsec);
 		rlen = 1;
 		vlen = sizeof (TIME_STRUCT);
 	    } else if (q->paraminfo[pnum].type == SQL_DATE) {
@@ -8159,9 +8185,9 @@ bind_one_param(int pnum, VALUE arg, STMT *q, char **msgp, int *outpp)
 		ctype = SQL_C_DATE;
 		date = (DATE_STRUCT *) valp;
 		memset(date, 0, sizeof (DATE_STRUCT));
-		date->year  = rb_funcall(arg, IDyear, 0, NULL);
-		date->month = rb_funcall(arg, IDmonth, 0, NULL);
-		date->day   = rb_funcall(arg, IDday, 0, NULL);
+		date->year  = FUNCALL_NOARGS(arg, IDyear);
+		date->month = FUNCALL_NOARGS(arg, IDmonth);
+		date->day   = FUNCALL_NOARGS(arg, IDday);
 		rlen = 1;
 		vlen = sizeof (TIMESTAMP_STRUCT);
 	    } else {
@@ -8170,16 +8196,16 @@ bind_one_param(int pnum, VALUE arg, STMT *q, char **msgp, int *outpp)
 		ctype = SQL_C_TIMESTAMP;
 		ts = (TIMESTAMP_STRUCT *) valp;
 		memset(ts, 0, sizeof (TIMESTAMP_STRUCT));
-		ts->year     = rb_funcall(arg, IDyear, 0, NULL);
-		ts->month    = rb_funcall(arg, IDmonth, 0, NULL);
-		ts->day      = rb_funcall(arg, IDday, 0, NULL);
-		ts->hour     = rb_funcall(arg, IDhour, 0, NULL);
-		ts->minute   = rb_funcall(arg, IDmin, 0, NULL);
-		ts->second   = rb_funcall(arg, IDsec, 0, NULL);
+		ts->year     = FUNCALL_NOARGS(arg, IDyear);
+		ts->month    = FUNCALL_NOARGS(arg, IDmonth);
+		ts->day      = FUNCALL_NOARGS(arg, IDday);
+		ts->hour     = FUNCALL_NOARGS(arg, IDhour);
+		ts->minute   = FUNCALL_NOARGS(arg, IDmin);
+		ts->second   = FUNCALL_NOARGS(arg, IDsec);
 #ifdef TIME_USE_USEC
-		ts->fraction = rb_funcall(arg, IDusec, 0, NULL) * 1000;
+		ts->fraction = FUNCALL_NOARGS(arg, IDusec) * 1000;
 #else
-		ts->fraction = rb_funcall(arg, IDnsec, 0, NULL);
+		ts->fraction = FUNCALL_NOARGS(arg, IDnsec);
 #endif
 		rlen = 1;
 		vlen = sizeof (TIMESTAMP_STRUCT);
@@ -8192,9 +8218,9 @@ bind_one_param(int pnum, VALUE arg, STMT *q, char **msgp, int *outpp)
 	    ctype = SQL_C_DATE;
 	    date = (DATE_STRUCT *) valp;
 	    memset(date, 0, sizeof (DATE_STRUCT));
-	    date->year  = rb_funcall(arg, IDyear, 0, NULL);
-	    date->month = rb_funcall(arg, IDmonth, 0, NULL);
-	    date->day   = rb_funcall(arg, IDmday, 0, NULL);
+	    date->year  = FUNCALL_NOARGS(arg, IDyear);
+	    date->month = FUNCALL_NOARGS(arg, IDmonth);
+	    date->day   = FUNCALL_NOARGS(arg, IDmday);
 	    rlen = 1;
 	    vlen = sizeof (DATE_STRUCT);
 	    break;
@@ -8708,7 +8734,7 @@ again:
 		rb_raise(rb_eTypeError, "expecting ODBC::Date");
 	    }
 	} else {
-	    VALUE now = rb_funcall(rb_cTime, IDnow, 0, NULL);
+	    VALUE now = FUNCALL_NOARGS(rb_cTime, IDnow);
 
 	    y = rb_funcall(rb_cTime, IDyear, 1, now);
 	    m = rb_funcall(rb_cTime, IDmonth, 1, now);
@@ -9298,7 +9324,7 @@ Init_odbc()
     rb_define_method(Cstmt, "fetch_scroll!", stmt_fetch_scroll_bang, -1);
     rb_define_method(Cstmt, "fetch_hash", stmt_fetch_hash, -1);
     rb_define_method(Cstmt, "fetch_hash!", stmt_fetch_hash_bang, -1);
-    rb_define_method(Cstmt, "fetch_first_hash", stmt_fetch_first_hash, 0);
+    rb_define_method(Cstmt, "fetch_first_hash", stmt_fetch_first_hash, -1);
     rb_define_method(Cstmt, "fetch_many", stmt_fetch_many, 1);
     rb_define_method(Cstmt, "fetch_all", stmt_fetch_all, 0);
     rb_define_method(Cstmt, "each", stmt_each, 0);

data/ext/utf8/extconf.rb

@@ -40,6 +40,8 @@ def have_func_nolink(func, headers = nil, &b)
 end
  
 dir_config("odbc")
+have_header("version.h")
+have_header("ruby/version.h")
 have_header("sql.h") || begin
   puts "ERROR: sql.h not found"
   exit 1

data/ruby-odbc.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-odbc
 version: !ruby/object:Gem::Version
-  version: '0.99999'
+  version: '0.999991'
 platform: ruby
 authors:
 - Christian Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-28 00:00:00.000000000 Z
+date: 2020-12-26 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: chw @nospam@ ch-werner.de
@@ -66,8 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: ODBC binding for Ruby