ext/odbc.c in ruby-odbc-0.99998 vs ext/odbc.c in ruby-odbc-0.99999
- old
+ new
@@ -6,11 +6,11 @@
*
* See the file "COPYING" for information on usage
* and redistribution of this file and for a
* DISCLAIMER OF ALL WARRANTIES.
*
- * $Id: odbc.c,v 1.78 2017/02/15 10:04:30 chw Exp chw $
+ * $Id: odbc.c,v 1.79 2018/02/28 15:15:24 chw Exp chw $
*/
#undef ODBCVER
#if defined(_WIN32) || defined(__CYGWIN32__) || defined(__MINGW32__)
@@ -5210,10 +5210,11 @@
int level;
} option_map[] = {
/* 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),
OPT_CONST_INT(SQL_MAX_ROWS, OPT_LEVEL_BOTH),
OPT_CONST_INT(SQL_MAX_LENGTH, OPT_LEVEL_BOTH),
@@ -5338,10 +5339,11 @@
v = (TYPE(val) == T_FIXNUM) ?
(FIX2INT(val) ? SQL_NOSCAN_ON : SQL_NOSCAN_OFF) :
(RTEST(val) ? SQL_NOSCAN_ON : SQL_NOSCAN_OFF);
break;
+ case SQL_LOGIN_TIMEOUT:
case SQL_CONCURRENCY:
case SQL_QUERY_TIMEOUT:
case SQL_MAX_ROWS:
case SQL_MAX_LENGTH:
case SQL_ROWSET_SIZE:
@@ -5398,10 +5400,16 @@
{
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)
{
return do_option(argc, argv, self, 0, SQL_MAX_LENGTH);
}
@@ -9250,9 +9258,11 @@
rb_define_method(Cdbc, "concurrency=", dbc_concurrency, -1);
rb_define_method(Cdbc, "maxrows", dbc_maxrows, -1);
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);
rb_define_method(Cdbc, "cursortype", dbc_cursortype, -1);
rb_define_method(Cdbc, "cursortype=", dbc_cursortype, -1);