RubyGems - ruby-odbc - Versions diffs - 0.99994 → 0.99995 - Mend

ruby-odbc 0.99994 → 0.99995

Files changed (8) hide show

checksums.yaml ADDED

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c7479d33fa9c59ff9ddceda117a54eff5b755a40
+  data.tar.gz: ffe877023d88272ddb59da531bf1fda03cdf6c35
+SHA512:
+  metadata.gz: 95b9dd91fe942297cd879cfc83c82af7fe9a2aeaabcff01a65a9870b89886e8a7d729f8a2119241d46363282081bfeb9d8c0a21daf8836b619807deea947d0e8
+  data.tar.gz: 328aa7cff9af2f30af215560abc65d947879468299e31e449d7c919cb146a84effde0f88e9816fd7633230c70ecded79417db8dae00d1cb882f76b114f2d6040

data/ChangeLog CHANGED

@@ -1,6 +1,12 @@
 ODBC binding for Ruby
 ---------------------
+Wed Mar 13 2013 version 0.99995 released
+	* added ODBC::Database.use_sql_column_name= flag to switch
+	  usage of SQLColAttributes(SQL_COLUMN_LABEL) to
+	  SQLColAttributes(SQL_COLUMN_NAME) on per connection basis
 Sat Jan 15 2011 version 0.99994 released
 	* fixed column key caching, thanks Sean Noonan for bug report

data/README CHANGED

@@ -1,6 +1,6 @@
-# $Id: README,v 1.41 2011/01/15 08:03:22 chw Exp chw $
+# $Id: README,v 1.42 2013/03/13 19:24:03 chw Exp chw $
-ruby-odbc-0.99994
+ruby-odbc-0.99995
 This is an ODBC binding for Ruby. So far it has been tested with
@@ -18,6 +18,8 @@ This is an ODBC binding for Ruby. So far it has been tested with
     - Ruby 1.8.*, SQLite/ODBC >= 0.67, libiodbc 3.52.4 on Fedora Core 3 x86
+    - Ruby 2.0.0, SQLite/ODBC >= 0.93, unixODBC 2.2.14 on Ubuntu 12.04 x86
     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: Thu, 16 September 2010
+      Last update: Wed, 13 March 2013
     </div>
     <hr>
     <div>
@@ -706,6 +706,12 @@ aproc.statement.drop</pre>
 	  SQL_TIMESTAMP data types to Ruby objects. When true,
 	  Ruby Date and Time objects are represented in UTC, when
 	  false (default) in the local timezone.
+	<dt><a name="use_sql_column_name">
+	  <code>use_sql_column_name[=<var>bool</var>]</code></a>
+	<dd>Sets or queries the flag controlling how column names are
+	  read from the data source. When false (default), the ODBC
+	  API <code>SQLColAttributes(SQL_COLUMN_LABEL)</code> is used,
+	  otherwise <code>SQLColAttributes(SQL_COLUMN_NAME)</code> is used.
       </dl>
       <h3>singleton methods:</h3>
       <dl>

data/ext/odbc.c CHANGED

@@ -1,6 +1,6 @@
 /*
  * ODBC-Ruby binding
- * Copyright (c) 2001-2011 Christian Werner <chw@ch-werner.de>
+ * Copyright (c) 2001-2013 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.72 2011/01/15 08:02:55 chw Exp chw $
+ * $Id: odbc.c,v 1.75 2013/03/13 19:31:13 chw Exp chw $
  */
 #undef ODBCVER
@@ -168,6 +168,7 @@ typedef struct dbc {
     VALUE rbtime;
     VALUE gmtime;
     int upc;
+    VALUE use_sql_column_name;
 } DBC;
 typedef struct {
@@ -1954,6 +1955,7 @@ dbc_new(int argc, VALUE *argv, VALUE self)
     list_init(&p->stmts, offsetof(STMT, link));
     p->hdbc = SQL_NULL_HDBC;
     p->upc = 0;
+    p->use_sql_column_name = Qfalse;
 #endif
     if (env != Qnil) {
 	ENV *e;
@@ -2194,6 +2196,20 @@ dbc_timeutc(int argc, VALUE *argv, VALUE self)
     }
     return p->gmtime;
 }
+static VALUE
+dbc_use_scn(int argc, VALUE *argv, VALUE self)
+{
+    DBC *p = get_dbc(self);
+    VALUE val;
+    if (argc > 0) {
+	rb_scan_args(argc, argv, "1", &val);
+	p->use_sql_column_name =
+	    (val != Qnil && val != Qfalse) ? Qtrue : Qfalse;
+    }
+    return p->use_sql_column_name;
+}
 /*
  *----------------------------------------------------------------------
@@ -3183,7 +3199,7 @@ make_coltypes(SQLHSTMT hstmt, int ncols, char **msgp)
 {
     int i;
     COLTYPE *ret = NULL;
-    SQLLEN type, size;
+    SQLLEN type, size = 0;
     for (i = 0; i < ncols; i++) {
 	SQLUSMALLINT ic = i + 1;
@@ -3565,7 +3581,7 @@ upcase_if(char *string, int upc)
  */
 static VALUE
-make_column(SQLHSTMT hstmt, int i, int upc)
+make_column(SQLHSTMT hstmt, int i, int upc, int use_scn)
 {
     VALUE obj, v;
     SQLUSMALLINT ic = i + 1;
@@ -3580,10 +3596,12 @@ make_column(SQLHSTMT hstmt, int i, int upc)
     name[0] = 0;
     if (!succeeded(SQL_NULL_HENV, SQL_NULL_HDBC, hstmt,
-		   SQLColAttributes(hstmt, ic, SQL_COLUMN_LABEL, name,
+		   SQLColAttributes(hstmt, ic, use_scn ? SQL_COLUMN_NAME :
+				    SQL_COLUMN_LABEL, name,
 				    (SQLSMALLINT) sizeof (name),
 				    &name_len, NULL),
-		   &msg, "SQLColAttributes(SQL_COLUMN_LABEL)")) {
+		   &msg, use_scn ? "SQLColAttributes(SQL_COLUMN_NAME)" :
+		   "SQLColAttributes(SQL_COLUMN_LABEL)")) {
 	rb_raise(Cerror, "%s", msg);
     }
     obj = rb_obj_alloc(Ccolumn);
@@ -5823,27 +5841,34 @@ stmt_column(int argc, VALUE *argv, VALUE self)
 {
     STMT *q;
     VALUE col;
+    int use_scn = 0;
     rb_scan_args(argc, argv, "1", &col);
     Check_Type(col, T_FIXNUM);
     Data_Get_Struct(self, STMT, q);
     check_ncols(q);
-    return make_column(q->hstmt, FIX2INT(col), q->upc);
+    if (q->dbcp != NULL && q->dbcp->use_sql_column_name == Qtrue) {
+	use_scn = 1;
+    }
+    return make_column(q->hstmt, FIX2INT(col), q->upc, use_scn);
 }
 static VALUE
 stmt_columns(int argc, VALUE *argv, VALUE self)
 {
     STMT *q;
-    int i;
+    int i, use_scn = 0;
     VALUE res, as_ary = Qfalse;
     rb_scan_args(argc, argv, "01", &as_ary);
     Data_Get_Struct(self, STMT, q);
     check_ncols(q);
+    if (q->dbcp != NULL && q->dbcp->use_sql_column_name == Qtrue) {
+	use_scn = 1;
+    }
     if (rb_block_given_p()) {
 	for (i = 0; i < q->ncols; i++) {
-	    rb_yield(make_column(q->hstmt, i, q->upc));
+	    rb_yield(make_column(q->hstmt, i, q->upc, use_scn));
 	}
 	return self;
     }
@@ -5855,7 +5880,7 @@ stmt_columns(int argc, VALUE *argv, VALUE self)
     for (i = 0; i < q->ncols; i++) {
 	VALUE obj;
-	obj = make_column(q->hstmt, i, q->upc);
+	obj = make_column(q->hstmt, i, q->upc, use_scn);
 	if (RTEST(as_ary)) {
 	    rb_ary_store(res, i, obj);
 	} else {
@@ -5918,7 +5943,7 @@ stmt_params(VALUE self)
 static VALUE
 do_fetch(STMT *q, int mode)
 {
-    int i, offc;
+    int i, use_scn = 0, offc;
     char **bufs, *msg;
     VALUE res;
@@ -5958,6 +5983,9 @@ do_fetch(STMT *q, int mode)
 	    }
 	}
     }
+    if (q->dbcp != NULL && q->dbcp->use_sql_column_name == Qtrue) {
+	use_scn = 1;
+    }
     switch (mode & DOFETCH_MODES) {
     case DOFETCH_HASH:
     case DOFETCH_HASH2:
@@ -6008,10 +6036,13 @@ do_fetch(STMT *q, int mode)
 		if (!succeeded(SQL_NULL_HENV, SQL_NULL_HDBC, q->hstmt,
 			       SQLColAttributes(q->hstmt,
 						(SQLUSMALLINT) (i + 1),
+						use_scn ? SQL_COLUMN_NAME :
 						SQL_COLUMN_LABEL, name,
 						sizeof (name),
 						&name_len, NULL),
-			       &msg, "SQLColAttributes(SQL_COLUMN_LABEL)")) {
+			       &msg, use_scn ?
+			       "SQLColAttributes(SQL_COLUMN_NAME)" :
+			       "SQLColAttributes(SQL_COLUMN_LABEL)")) {
 		    rb_raise(Cerror, "%s", msg);
 		}
 		if (name_len >= (SQLSMALLINT) sizeof (name)) {
@@ -6064,8 +6095,10 @@ do_fetch(STMT *q, int mode)
 		name[0] = 0;
 		callsql(SQL_NULL_HENV, SQL_NULL_HDBC, q->hstmt,
 			SQLColAttributes(q->hstmt, (SQLUSMALLINT) (i + 1),
+					 use_scn ? SQL_COLUMN_NAME :
 					 SQL_COLUMN_LABEL, name,
 					 sizeof (name), &name_len, NULL),
+			use_scn ? "SQLColAttributes(SQL_COLUMN_NAME)" :
 			"SQLColAttributes(SQL_COLUMN_LABEL)");
 		if (name_len >= (SQLSMALLINT) sizeof (name)) {
 		    name_len = sizeof (name) - 1;
@@ -8247,6 +8280,8 @@ Init_odbc()
     rb_define_method(Cdbc, "use_time=", dbc_timefmt, -1);
     rb_define_method(Cdbc, "use_utc", dbc_timeutc, -1);
     rb_define_method(Cdbc, "use_utc=", dbc_timeutc, -1);
+    rb_define_method(Cdbc, "use_sql_column_name", dbc_use_scn, -1);
+    rb_define_method(Cdbc, "use_sql_column_name=", dbc_use_scn, -1);
     /* connection options */
     rb_define_method(Cdbc, "get_option", dbc_getsetoption, -1);

data/ext/utf8/extconf.rb CHANGED

@@ -112,16 +112,16 @@ if PLATFORM =~ /mswin32/ then
   have_func("SQLReadFileDSNW", "odbcinst.h")
   have_func("SQLInstallerError", "odbcinst.h")
   have_func("SQLInstallerErrorW", "odbcinst.h")
-# mingw untested !!!
 elsif PLATFORM =~ /(mingw|cygwin)/ then
   have_library("odbc32", "")
   have_library("odbccp32", "")
   have_library("user32", "")
-  have_func("SQLConfigDataSourceW", "odbcinst.h")
-  have_func("SQLWriteFileDSNW", "odbcinst.h")
-  have_func("SQLReadFileDSNW", "odbcinst.h")
-  have_func("SQLInstallerError", "odbcinst.h")
-  have_func("SQLInstallerErrorW", "odbcinst.h")
+  header = ["windows.h", "odbcinst.h"]
+  have_func("SQLConfigDataSourceW", header)
+  have_func("SQLWriteFileDSNW", header)
+  have_func("SQLReadFileDSNW", header)
+  have_func("SQLInstallerError", header)
+  have_func("SQLInstallerErrorW", header)
 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/ruby-odbc.gemspec CHANGED

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

metadata CHANGED

@@ -1,91 +1,73 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification
 name: ruby-odbc
-version: !ruby/object:Gem::Version
-  prerelease: false
-  segments:
-  - 0
-  - 99994
-  version: "0.99994"
+version: !ruby/object:Gem::Version
+  version: '0.99995'
 platform: ruby
-authors:
+authors:
 - Christian Werner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-01-15 00:00:00 +01:00
-default_executable:
+date: 2013-03-13 00:00:00.000000000 Z
 dependencies: []
 description:
 email: chw @nospam@ ch-werner.de
 executables: []
-extensions:
+extensions:
 - ext/extconf.rb
 - ext/utf8/extconf.rb
-extra_rdoc_files:
+extra_rdoc_files:
 - README
 - COPYING
 - ChangeLog
 - GPL
 - doc/odbc.html
-files:
-- lib/cqgen.rb
-- doc/odbc.html
-- GPL
-- ruby-odbc.gemspec
-- ChangeLog
-- MANIFEST
-- README
+files:
+- COPYING
 - ext/init.c
+- ext/extconf.rb
+- ext/odbc.c
 - ext/utf8/init.c
 - ext/utf8/extconf.rb
 - ext/utf8/odbc.c
-- ext/extconf.rb
-- ext/odbc.c
-- test/utf8/test.rb
-- test/test.rb
-- test/70close.rb
+- ruby-odbc.gemspec
+- README
+- MANIFEST
+- doc/odbc.html
+- ChangeLog
 - test/20insert.rb
-- test/30select.rb
 - test/10create_table.rb
-- test/00connect.rb
+- test/test.rb
 - test/50drop_table.rb
+- test/30select.rb
+- test/utf8/test.rb
+- test/70close.rb
 - test/40update.rb
-- COPYING
-has_rdoc: true
+- test/00connect.rb
+- lib/cqgen.rb
+- GPL
 homepage: http://www.ch-werner.de/rubyodbc
 licenses: []
+metadata: {}
 post_install_message:
 rdoc_options: []
-require_paths:
+require_paths:
 - lib
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      segments:
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      segments:
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 1.3.7
+rubygems_version: 2.0.0
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: ODBC binding for Ruby
 test_files: []