ruby-odbc 0.9999 → 0.99991

data/ChangeLog

@@ -1,6 +1,11 @@
 ODBC binding for Ruby
 ---------------------
 
+Sun Apr 25 2010 version 0.99991 released
+
+	* detect HAVE_LONG_LONG for builds with unixODBC
+	* UTF-8 coding/decoding fix for range 0x80..0xBF
+
 Thu Feb 18 2010 version 0.9999 released
 
 	* integrated Bosko Ivanisevic's fixes in ext/utf8/extconf.rb

data/README

@@ -1,6 +1,6 @@
-# $Id: README,v 1.37 2010/02/18 12:32:13 chw Exp chw $
+# $Id: README,v 1.38 2010/04/25 12:27:18 chw Exp chw $
 
-ruby-odbc-0.9999
+ruby-odbc-0.99991
 
 This is an ODBC binding for Ruby. So far it has been tested with
 

data/ext/extconf.rb

@@ -98,6 +98,11 @@ elsif (testdlopen && PLATFORM !~ /(macos|darwin)/ && CONFIG["CC"] =~ /gcc/ && ha
   $CPPFLAGS+=" -DHAVE_SQLCONFIGDATASOURCE"
   $CPPFLAGS+=" -DHAVE_SQLINSTALLERERROR"
   $CPPFLAGS+=" -DUSE_DLOPEN_FOR_ODBC_LIBS"
+  if defined? have_type then
+    if have_type("SQLBIGINT", "sqltypes.h", "-DHAVE_LONG_LONG") then
+      $CPPFLAGS+=" -DHAVE_LONG_LONG"
+    end
+  end
 else
   have_library("odbc", "SQLAllocConnect") ||
     have_library("iodbc", "SQLAllocConnect")
@@ -107,6 +112,11 @@ else
     have_library("iodbcinst", "SQLConfigDataSource"))
   $have_odbcinst_h &&
     have_func("SQLInstallerError", "odbcinst.h")
+  if defined? have_type then
+    if have_type("SQLBIGINT", "sqltypes.h", "-DHAVE_LONG_LONG") then
+      $CPPFLAGS+=" -DHAVE_LONG_LONG"
+    end
+  end
 end
 
 create_makefile("odbc")

data/ext/odbc.c

@@ -8,7 +8,7 @@
  * and redistribution of this file and for a
  * DISCLAIMER OF ALL WARRANTIES.
  *
- * $Id: odbc.c,v 1.61 2009/05/20 05:30:03 chw Exp chw $
+ * $Id: odbc.c,v 1.62 2010/04/25 12:26:37 chw Exp chw $
  */
 
 #undef ODBCVER
@@ -363,7 +363,7 @@ mkutf(char *dest, SQLWCHAR *src, int len)
 	if (sizeof (SQLWCHAR) == (2 * sizeof (char))) {
 	    c &= 0xffff;
 	}
-	if (c < 0xc0) {
+	if (c < 0x80) {
 	    *cp++ = c;
 	} else if (c < 0x800) {
 	    *cp++ = 0xc0 | ((c >> 6) & 0x1f);
@@ -491,9 +491,12 @@ uc_from_utf(unsigned char *str, int len)
 	    while (str < strend) {
 		unsigned char c = str[0];
 
-		if (c < 0xc0) {
+		if (c < 0x80) {
 		    uc[i++] = c;
 		    ++str;
+		} else if (c <= 0xc1 || (c >= 0xf5 && c <= 0xff)) {
+		    /* illegal, ignored */
+		    ++str;
 		} else if (c < 0xe0) {
 		    if ((str[1] & 0xc0) == 0x80) {
 			unsigned long t = ((c & 0x1f) << 6) | (str[1] & 0x3f);

data/ruby-odbc.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-odbc
 version: !ruby/object:Gem::Version 
-  version: "0.9999"
+  version: "0.99991"
 platform: ruby
 authors: 
 - Christian Werner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-18 00:00:00 +01:00
+date: 2010-04-25 00:00:00 +02:00
 default_executable: 
 dependencies: []