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

ruby-odbc 0.99997 → 0.99999

Files changed (10) hide show

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe13750acbbaeb8c33adb7af778eaba01174229d
-  data.tar.gz: ab8d5d5837ea84f4dca124994e4db2fdb3cc1c24
+  metadata.gz: ebe50088f7b79d16a5dc300d6b07890b808a57c6
+  data.tar.gz: 5bfa7a5595c786bcf6125b4bb43f5e0c1312b9cd
 SHA512:
-  metadata.gz: 99ac5be18b63d180ca059fde5808d654c60f8d4e014ec4903778c56830da517d38f23b63861a91dedde012a3e71b170c6a33bcd18ae70ab1dbc811d25b58a952
-  data.tar.gz: ce00b6f94cbc7296f20871853cff5295be26ea9a5b7b39093bf4ba7b36811d932ccc9bcd246014558288adb6aa8f781dcd7c4fed03362e68f48b64f29a1eee70
+  metadata.gz: f5ab42fe5a650e2d88cda3106ec3beea1e53bdc651ef6b9ca8848d61904c5b7a4b86e89373e3f392c971ad5cdc8cf3b0423d4163349fa62b337dc2a6cb502c6d
+  data.tar.gz: 3f0fd86fce0f7a08cb59913483a4f494a24dcbc4cfb00eceffeb822a63eb7fdee644a6e13ba5e0a83e7375ed3e9c5f88c4f2f36e778e8e52fc643a797aa4bb56

data/ChangeLog CHANGED

@@ -1,6 +1,18 @@
 ODBC binding for Ruby
 ---------------------
+Wed Feb 28 2018 version 0.99999 released
+	* update to compile with newer Ruby releases, thanks
+	  Lars Kanis for patch
+	* added ODBC::Database.login_timeout to get/set the
+	  SQL_LOGIN_TIMEOUT connection attribute
+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.46 2018/02/28 15:08:50 chw Exp chw $
-ruby-odbc-0.99997
+ruby-odbc-0.99999
 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

@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
     "http://www.w3.org/TR/html4/strict.dtd">
 <html lang="en">
-  <head>
+  <head>
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
     <meta http-equiv="Content-Style-Type" content="text/css">
     <meta name="Keywords" lang="en" content="ODBC Binding for Ruby">
@@ -14,7 +14,7 @@
       }
       address { text-align: right }
       div.lastmodifed { text-align: right }
-      div.language { text-align: right }
+      div.language { text-align: right }
       pre {
       white-space: pre;
       background-color: antiquewhite;
@@ -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, 28 February 2018
     </div>
     <hr>
     <div>
@@ -73,8 +73,10 @@
         <dd>Gets or sets the process-wide connection pooling attribute.
 	<dt><a name="ODBC::to_time1">
 	    <code>to_time(<var>timestamp</var>)</code></a>
-	<dt><a name="ODBC::to_time2"><code>to_time(<var>date</var>,[<var>time</var>])</code></a>
-	<dt><a name="ODBC::to_time3"><code>to_time(<var>time</var>,[<var>date</var>])</code></a>
+	<dt><a name="ODBC::to_time2">
+	    <code>to_time(<var>date</var>,[<var>time</var>])</code></a>
+	<dt><a name="ODBC::to_time3">
+	    <code>to_time(<var>time</var>,[<var>date</var>])</code></a>
         <dd>Creates a <code>Time</code> object from the specified arguments,
           which must be <a href="#ODBC::Date">ODBC::Date</a>,
           <a href="#ODBC::Time">ODBC::Time</a>, or
@@ -89,7 +91,7 @@
 	      [{|<var>dbc</var>| <var>block</var>}]</code></a>
 	<dd>If no block is specified, a connection to the given data source
 	  is established and a <a href="#ODBC::Database">ODBC::Database</a>
-	  object is returned, identifying that connection. Otherwise,
+	  object is returned, identifying that connection. Otherwise,
 	  the block is executed with the database object. When the block
 	  is finished, the connection is automatically released.
 	  Options are:
@@ -383,10 +385,11 @@
           <a href="#dbc_get_option"><code>ODBC::Database.get_option</code></a>,
           <a href="#dbc_set_option"><code>ODBC::Database.set_option</code></a>,
           <a href="#stmt_get_option"><code>ODBC::Statement.get_option</code></a>,
-	  and
+	  and
           <a href="#stmt_set_option"><code>ODBC::Statement.set_option</code></a>
           yielding integers:
 	<dd><var>SQL_AUTOCOMMIT</var>,
+	  <var>SQL_LOGIN_TIMEOUT</var>,
 	  <var>SQL_CONCURRENCY</var>,
 	  <var>SQL_QUERY_TIMEOUT</var>,
 	  <var>SQL_MAX_ROWS</var>,
@@ -591,7 +594,7 @@
           of the underlying ODBC function <code>SQLGetInfo()</code> as a
           specific Ruby type the optional parameter <var>sql_type</var>
           can be given as e.g.
-          <code>ODBC::SQL_SMALLINT</code> (yielding integer),
+          <code>ODBC::SQL_SMALLINT</code> (yielding integer),
           <code>ODBC::SQL_INTEGER</code> (yielding integer), and
           <code>ODBC::SQL_CHAR</code> (yielding string).
 	<dt><a name="run"><code>run(<var>sql</var>[,<var>args...</var>])</code></a>
@@ -668,9 +671,13 @@ aproc.statement.drop</pre>
 	<dt><a name="timeout"><code>timeout[=<var>intval</var>]</code></a>
 	<dd>Sets or queries the number of seconds to wait for queries to
 	  execute on the connection before returning.
+	<dt><a name="login_timeout">
+	    <code>login_timeout[=<var>intval</var>]</code></a>
+	<dd>Sets or queries the number of seconds to wait for a login to
+	  complete on the connection before returning.
 	<dt><a name="maxlength"><code>maxlength[=<var>intval</var>]</code></a>
 	<dd>Sets or queries the maximum amount of data that will be returned
-          from a character or binary column.
+	  from a character or binary column.
 	<dt><a name="cursortype">
 	    <code>cursortype[=<var>intval</var>]</code></a>
 	<dd>Sets or queries the cursor type used for fetches.
@@ -1262,7 +1269,7 @@ out_value = stmt.param_output_value(2);</pre>
 	<dd>Queries or sets attributes in the <var>attrs</var> Hash of the
 	  ODBC driver object. The <var>key</var>s and <var>value</var>s
 	  should be Strings.
-      </dl>
+      </dl>
       <h3>singleton methods:</h3>
       <dl>
 	<dt><a name="ODBC::Driver.new"><code>new</code></a>
@@ -1291,7 +1298,7 @@ out_value = stmt.param_output_value(2);</pre>
 	   <a href="#ODBC::Statement">ODBC::Statement</a>.
 	<dt><code>[[<var>args*</var>]]</code>
 	<dd>Synonym for <code>call</code>.
-      </dl>
+      </dl>
     </div>
     <div>
       <hr>

data/ext/extconf.rb CHANGED

@@ -124,9 +124,9 @@ if PLATFORM =~ /mswin32/ then
   have_func("SQLInstallerError", "odbcinst.h")
 # mingw untested !!!
 elsif PLATFORM =~ /(mingw|cygwin)/ then
-  have_library("odbc32", "")
-  have_library("odbccp32", "")
-  have_library("user32", "")
+  have_library("odbc32")
+  have_library("odbccp32")
+  have_library("user32")
 elsif (testdlopen && PLATFORM !~ /(macos|darwin)/ && CONFIG["CC"] =~ /gcc/ && have_func("dlopen", "dlfcn.h") && have_library("dl", "dlopen")) then
   $LDFLAGS+=" -Wl,-init -Wl,ruby_odbc_init -Wl,-fini -Wl,ruby_odbc_fini"
   $CPPFLAGS+=" -DHAVE_SQLCONFIGDATASOURCE"

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.79 2018/02/28 15:15:24 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),
@@ -5203,6 +5212,7 @@ static struct {
     /* yielding ints */
     OPT_CONST_INT(SQL_AUTOCOMMIT, OPT_LEVEL_DBC),
+    OPT_CONST_INT(SQL_LOGIN_TIMEOUT, OPT_LEVEL_DBC),
     OPT_CONST_INT(SQL_NOSCAN, OPT_LEVEL_BOTH),
     OPT_CONST_INT(SQL_CONCURRENCY, OPT_LEVEL_BOTH),
     OPT_CONST_INT(SQL_QUERY_TIMEOUT, OPT_LEVEL_BOTH),
@@ -5220,12 +5230,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 +5255,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;
@@ -5326,6 +5341,7 @@ do_option(int argc, VALUE *argv, VALUE self, int isstmt, int op)
 	    (RTEST(val) ? SQL_NOSCAN_ON : SQL_NOSCAN_OFF);
 	break;
+    case SQL_LOGIN_TIMEOUT:
     case SQL_CONCURRENCY:
     case SQL_QUERY_TIMEOUT:
     case SQL_MAX_ROWS:
@@ -5385,6 +5401,12 @@ dbc_timeout(int argc, VALUE *argv, VALUE self)
     return do_option(argc, argv, self, 0, SQL_QUERY_TIMEOUT);
 }
+static VALUE
+dbc_login_timeout(int argc, VALUE *argv, VALUE self)
+{
+    return do_option(argc, argv, self, 0, SQL_LOGIN_TIMEOUT);
+}
 static VALUE
 dbc_maxlength(int argc, VALUE *argv, VALUE self)
 {
@@ -9238,6 +9260,8 @@ Init_odbc()
     rb_define_method(Cdbc, "maxrows=", dbc_maxrows, -1);
     rb_define_method(Cdbc, "timeout", dbc_timeout, -1);
     rb_define_method(Cdbc, "timeout=", dbc_timeout, -1);
+    rb_define_method(Cdbc, "login_timeout", dbc_login_timeout, -1);
+    rb_define_method(Cdbc, "login_timeout=", dbc_login_timeout, -1);
     rb_define_method(Cdbc, "maxlength", dbc_maxlength, -1);
     rb_define_method(Cdbc, "maxlength=", dbc_maxlength, -1);
     rb_define_method(Cdbc, "rowsetsize", dbc_rowsetsize, -1);

data/ext/utf8/extconf.rb CHANGED

@@ -113,9 +113,9 @@ if PLATFORM =~ /mswin32/ then
   have_func("SQLInstallerError", "odbcinst.h")
   have_func("SQLInstallerErrorW", "odbcinst.h")
 elsif PLATFORM =~ /(mingw|cygwin)/ then
-  have_library("odbc32", "")
-  have_library("odbccp32", "")
-  have_library("user32", "")
+  have_library("odbc32")
+  have_library("odbccp32")
+  have_library("user32")
   header = ["windows.h", "odbcinst.h"]
   have_func("SQLConfigDataSourceW", header)
   have_func("SQLWriteFileDSNW", header)

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.99999"
   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,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-odbc
 version: !ruby/object:Gem::Version
-  version: '0.99997'
+  version: '0.99999'
 platform: ruby
 authors:
 - Christian Werner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-17 00:00:00.000000000 Z
+date: 2018-02-28 00:00:00.000000000 Z
 dependencies: []
 description:
 email: chw @nospam@ ch-werner.de