ruby-informix 0.7.1 → 0.7.2

data/Changelog

@@ -1,3 +1,13 @@
+0.7.2  2008-11-21
+------------------
+Bugs fixed:
+	* rb_cArray symbol was duplicated
+
+Caveats:
+	* Database#each and Database#each_hash renamed to Database#foreach and
+	  Database#foreach_hash respectively.
+
+
 0.7.1  04/02/2008
 ------------------
 Bugs fixed:

data/README

@@ -103,12 +103,12 @@ http://ruby-informix.rubyforge.org/examples.html
 
 NULL values can be inserted and are retrieved as +nil+.
 
-BYTE and TEXT are retrieved as Strings, but for supplying them as input
-parameters, a StringIO object, or a anyother IO-like object that provides
-a #read method must be used.
+Any IO-like object that provides a read method, e.g. StringIO or File objects,
+can be used to insert data in BYTE or TEXT fields. Data retrieved from
+BYTE and TEXT fields are stored in String objects.
 
-Strings can be used in the cases where Informix accepts them for non-character
-data types, like DATE, DATETIME, INTERVAL, BOOL, DECIMAL and MONEY
+Strings can be used where Informix accepts them for non-character data types,
+like DATE, DATETIME, INTERVAL, BOOL, DECIMAL and MONEY
 
 
 == Recommendations
@@ -140,7 +140,3 @@ questions directly to my mailbox or the following forums:
 Ruby/Informix is available under the three-clause BSD license
 
 :include: COPYRIGHT
-
------------------------------------------
-Gerardo Santana <gerardo.santana gmail>
-http://santanatechnotes.blogspot.com

data/ext/extconf.rb

@@ -2,20 +2,21 @@ require 'mkmf'
 
 env = nil
 informixdir = ENV["INFORMIXDIR"]
+MSWindows = /djgpp|(cyg|ms|bcc)win|mingw/
 
 if informixdir.nil?
-  informixdir = RUBY_PLATFORM =~ /mswin/ ? "C:\\informix" : "/usr/informix"
+  informixdir = RUBY_PLATFORM =~ MSWindows ? "C:/informix" : "/usr/informix"
 end
 
-esql = File.join(informixdir, "bin", "esql")
-idefault = File.join(informixdir, "incl", "esql")
-ldefault = [ File.join(informixdir, "lib") ]
-ldefault << File.join(informixdir, "lib", "esql") if RUBY_PLATFORM !~ /mswin/
+esql = informixdir + "/bin/esql"
+idefault = informixdir + "/incl/esql"
+ldefault = [ informixdir + "/lib" ]
+ldefault << informixdir + "/lib/esql" if RUBY_PLATFORM !~ MSWindows
 
 dir_config("informix", idefault, ldefault)
 
-if RUBY_PLATFORM =~ /mswin/
-  $libs += " isqlt09a.lib"
+if RUBY_PLATFORM =~ MSWindows
+  $libs += informixdir + "/lib/isqlt09a.lib"
 else
   env = "/usr/bin/env"
 

data/ext/informixc.c

@@ -1,7 +1,6 @@
 #include <sqlhdr.h>
 #include <sqliapi.h>
 #line 1 "informixc.ec"
-/* $Id: informixc.ec,v 1.28 2008/04/02 19:28:06 santana Exp $ */
 /*
  * Copyright (c) 2006-2008, Gerardo Santana Gomez Garrido <gerardo.santana@gmail.com>
  * All rights reserved.
@@ -31,8 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-static const char rcsid[] = "$Id: informixc.ec,v 1.28 2008/04/02 19:28:06 santana Exp $";
-
 #include "ruby.h"
 
 #include <sqlstype.h>
@@ -52,8 +49,6 @@ static VALUE rb_cStatement, rb_cCursorBase;
 static VALUE rb_cSequentialCursor, rb_cScrollCursor, rb_cInsertCursor;
 static VALUE rb_cIfxVersion;
 
-static VALUE rb_cArray;
-
 /* Exceptions */
 static VALUE rb_eError, rb_eWarning, rb_eInternalError;
 static VALUE rb_eProgrammingError, rb_eOperationalError, rb_eDatabaseError;
@@ -169,8 +164,8 @@ rbifx_ext_exception(VALUE exception_class)
 /*
  * 	EXEC SQL BEGIN DECLARE SECTION;
  */
-#line 166 "informixc.ec"
-#line 167 "informixc.ec"
+#line 161 "informixc.ec"
+#line 162 "informixc.ec"
 int4 sql_code;
   char sql_state[6];
   char class_origin_val[256];
@@ -185,72 +180,67 @@ mint i;
 /*
  * 	EXEC SQL END DECLARE SECTION;
  */
-#line 181 "informixc.ec"
+#line 176 "informixc.ec"
 
 
-    new_instance = rb_class_new_instance(0, 0, exception_class);
+	new_instance = rb_class_new_instance(0, 0, exception_class);
 
-    /* Check that instance of exception_class is derived from
-     * Informix::Error
-     */
-    if (!rb_obj_is_kind_of(new_instance, rb_eError) &&
-        !rb_obj_is_kind_of(new_instance, rb_eWarning)) {
-        rb_raise(rb_eRuntimeError,
-                "Can't instantiate exception from %s, only from %s or %s or their children",
-                rb_class2name(exception_class),
-                rb_class2name(rb_eWarning),
-                rb_class2name(rb_eError));
-    }
+	/* Check that instance of exception_class is derived from Informix::Error */
+	if (!rb_obj_is_kind_of(new_instance, rb_eError) &&
+		!rb_obj_is_kind_of(new_instance, rb_eWarning)) {
+		rb_raise(rb_eRuntimeError, "Can't instantiate exception from %s, "
+				"only from %s or %s or their children",
+				rb_class2name(exception_class),
+				rb_class2name(rb_eWarning),
+				rb_class2name(rb_eError));
+	}
 
 /*
- *     EXEC SQL GET DIAGNOSTICS :exc_count = NUMBER;
+ * 	EXEC SQL GET DIAGNOSTICS :exc_count = NUMBER;
  */
-#line 197 "informixc.ec"
+#line 190 "informixc.ec"
   {
-#line 197 "informixc.ec"
+#line 190 "informixc.ec"
   static ifx_hostvar_t _SQhtab[] =
     {
       { 0, 1, 102, sizeof(exc_count), 0, 0, 0, 0 },
       { 0, 0, 0, 0, 0, 0, 0, 0 }
-#line 197 "informixc.ec"
+#line 190 "informixc.ec"
     };
   _SQhtab[0].hostaddr = (char *)&exc_count;
-#line 197 "informixc.ec"
+#line 190 "informixc.ec"
   sqli_diag_get(ESQLINTVERSION, _SQhtab, -1);
-#line 197 "informixc.ec"
+#line 190 "informixc.ec"
   }
 
-    if (exc_count == 0) { /* Something went wrong */
-        char message[128];
-        snprintf(message,
-                 sizeof(message),
-                 "SQL ERROR: SQLCODE %d (sorry, no GET DIAGNOSTICS information available)",
-                 SQLCODE);
-
-        {
-            VALUE argv[] = { rb_str_new2(message) };
-            return rb_class_new_instance(NUM_ELEMS(argv), argv, rb_eOperationalError);
-        }
-    }
-
-    for (i = 0; i < exc_count; ++i) {
-        sql_exception_number = i + 1;
-
-/*
- *         EXEC SQL GET DIAGNOSTICS EXCEPTION :sql_exception_number
- *             :sql_code            = INFORMIX_SQLCODE,
- *             :sql_state           = RETURNED_SQLSTATE,
- *             :class_origin_val    = CLASS_ORIGIN,
- *             :subclass_origin_val = SUBCLASS_ORIGIN,
- *             :message             = MESSAGE_TEXT,
- *             :message_len         = MESSAGE_LENGTH,
- *             :server_name         = SERVER_NAME,
- *             :connection_name     = CONNECTION_NAME
- *             ;
- */
-#line 215 "informixc.ec"
+	if (exc_count == 0) { /* Something went wrong */
+		char message[128];
+		snprintf(message, sizeof(message), "SQL ERROR: SQLCODE %d "
+				"(sorry, no GET DIAGNOSTICS information available)", SQLCODE);
+		{
+		VALUE argv[] = { rb_str_new2(message) };
+		return rb_class_new_instance(NUM_ELEMS(argv),argv,rb_eOperationalError);
+		}
+	}
+
+	for (i = 0; i < exc_count; ++i) {
+		sql_exception_number = i + 1;
+
+/*
+ * 		EXEC SQL GET DIAGNOSTICS EXCEPTION :sql_exception_number
+ * 			:sql_code            = INFORMIX_SQLCODE,
+ * 			:sql_state           = RETURNED_SQLSTATE,
+ * 			:class_origin_val    = CLASS_ORIGIN,
+ * 			:subclass_origin_val = SUBCLASS_ORIGIN,
+ * 			:message             = MESSAGE_TEXT,
+ * 			:message_len         = MESSAGE_LENGTH,
+ * 			:server_name         = SERVER_NAME,
+ * 			:connection_name     = CONNECTION_NAME
+ * 			;
+ */
+#line 205 "informixc.ec"
   {
-#line 224 "informixc.ec"
+#line 214 "informixc.ec"
   static ifx_hostvar_t _SQhtab[] =
     {
       { 0, 11, 103, sizeof(sql_code), 0, 0, 0, 0 },
@@ -262,7 +252,7 @@ mint i;
       { 0, 9, 100, 256, 0, 0, 0, 0 },
       { 0, 10, 100, 256, 0, 0, 0, 0 },
       { 0, 0, 0, 0, 0, 0, 0, 0 }
-#line 224 "informixc.ec"
+#line 214 "informixc.ec"
     };
   _SQhtab[0].hostaddr = (char *)&sql_code;
   _SQhtab[1].hostaddr = (sql_state);
@@ -272,44 +262,41 @@ mint i;
   _SQhtab[5].hostaddr = (char *)&message_len;
   _SQhtab[6].hostaddr = (server_name);
   _SQhtab[7].hostaddr = (connection_name);
-#line 224 "informixc.ec"
+#line 214 "informixc.ec"
   sqli_diag_get(ESQLINTVERSION, _SQhtab, sql_exception_number);
-#line 224 "informixc.ec"
+#line 214 "informixc.ec"
   }
 
-        TRIM_BLANKS(class_origin_val);
-        TRIM_BLANKS(subclass_origin_val);
-        TRIM_BLANKS(server_name);
-        TRIM_BLANKS(connection_name);
-        message[message_len - 1] = '\0';
-        TRIM_BLANKS(message);
-
-        {
-            VALUE sprintf_args[] = { rb_str_new2(message), rb_str_new2(sqlca.sqlerrm) };
-            VALUE argv[] = {
-                INT2FIX(sql_code),
-                rb_str_new2(sql_state),
-                rb_str_new2(class_origin_val),
-                rb_str_new2(subclass_origin_val),
-                rb_f_sprintf(NUM_ELEMS(sprintf_args), sprintf_args),
-                rb_str_new2(server_name),
-                rb_str_new2(connection_name)
-            };
-
-			rb_funcall(new_instance, s_add_info, 1, rb_ary_new4(7, argv));
-        }
-    }
-
-    return new_instance;
+		TRIM_BLANKS(class_origin_val);
+		TRIM_BLANKS(subclass_origin_val);
+		TRIM_BLANKS(server_name);
+		TRIM_BLANKS(connection_name);
+		message[message_len - 1] = '\0';
+		TRIM_BLANKS(message);
+
+		{
+		VALUE sprintf_args[] = { rb_str_new2(message), rb_str_new2(sqlca.sqlerrm) };
+		VALUE argv[] = {
+			INT2FIX(sql_code),
+			rb_str_new2(sql_state),
+			rb_str_new2(class_origin_val),
+			rb_str_new2(subclass_origin_val),
+			rb_f_sprintf(NUM_ELEMS(sprintf_args), sprintf_args),
+			rb_str_new2(server_name),
+			rb_str_new2(connection_name)
+		};
+
+		rb_funcall(new_instance, s_add_info, 1, rb_ary_new4(7, argv));
+		}
+	}
+
+	return new_instance;
 }
 
-/*
- * C helper functions (see ifx_except.h for documentation)
- */
 static void
 raise_ifx_extended(void)
 {
-    rb_exc_raise(rbifx_ext_exception(rb_eDatabaseError));
+	rb_exc_raise(rbifx_ext_exception(rb_eDatabaseError));
 }
 /*
  *****************************************************************************
@@ -351,13 +338,13 @@ rb_slobstat_initialize(VALUE self, VALUE slob)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 297 "informixc.ec"
-#line 298 "informixc.ec"
+#line 284 "informixc.ec"
+#line 285 "informixc.ec"
   char *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 299 "informixc.ec"
+#line 286 "informixc.ec"
 
 
 	Data_Get_Struct(slob, slob_t, sb);
@@ -371,11 +358,11 @@ rb_slobstat_initialize(VALUE self, VALUE slob)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 309 "informixc.ec"
+#line 296 "informixc.ec"
   {
-#line 309 "informixc.ec"
+#line 296 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 309 "informixc.ec"
+#line 296 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -522,24 +509,24 @@ slob_free(slob_t *slob)
 /*
  * 		EXEC SQL begin declare section;
  */
-#line 452 "informixc.ec"
-#line 453 "informixc.ec"
+#line 439 "informixc.ec"
+#line 440 "informixc.ec"
   char *did;
 /*
  * 		EXEC SQL end   declare section;
  */
-#line 454 "informixc.ec"
+#line 441 "informixc.ec"
 
 
 		did = slob->database_id;
 /*
  * 		EXEC SQL set connection :did;
  */
-#line 457 "informixc.ec"
+#line 444 "informixc.ec"
   {
-#line 457 "informixc.ec"
+#line 444 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 457 "informixc.ec"
+#line 444 "informixc.ec"
   }
 		if (SQLCODE >= 0)
 			ifx_lo_close(slob->fd);
@@ -577,13 +564,13 @@ rb_slob_initialize(int argc, VALUE *argv, VALUE self)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 491 "informixc.ec"
-#line 492 "informixc.ec"
+#line 478 "informixc.ec"
+#line 479 "informixc.ec"
   char *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 493 "informixc.ec"
+#line 480 "informixc.ec"
 
 
 	rb_scan_args(argc, argv, "12", &db, &type, &options);
@@ -592,11 +579,11 @@ rb_slob_initialize(int argc, VALUE *argv, VALUE self)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 498 "informixc.ec"
+#line 485 "informixc.ec"
   {
-#line 498 "informixc.ec"
+#line 485 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 498 "informixc.ec"
+#line 485 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -704,13 +691,13 @@ rb_slob_open(int argc, VALUE *argv, VALUE self)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 602 "informixc.ec"
-#line 603 "informixc.ec"
+#line 589 "informixc.ec"
+#line 590 "informixc.ec"
   char *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 604 "informixc.ec"
+#line 591 "informixc.ec"
 
 
 	Data_Get_Struct(self, slob_t, slob);
@@ -722,11 +709,11 @@ rb_slob_open(int argc, VALUE *argv, VALUE self)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 612 "informixc.ec"
+#line 599 "informixc.ec"
   {
-#line 612 "informixc.ec"
+#line 599 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 612 "informixc.ec"
+#line 599 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -757,24 +744,24 @@ rb_slob_close(VALUE self)
 /*
  * 		EXEC SQL begin declare section;
  */
-#line 639 "informixc.ec"
-#line 640 "informixc.ec"
+#line 626 "informixc.ec"
+#line 627 "informixc.ec"
   char *did;
 /*
  * 		EXEC SQL end   declare section;
  */
-#line 641 "informixc.ec"
+#line 628 "informixc.ec"
 
 
 		did = slob->database_id;
 /*
  * 		EXEC SQL set connection :did;
  */
-#line 644 "informixc.ec"
+#line 631 "informixc.ec"
   {
-#line 644 "informixc.ec"
+#line 631 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 644 "informixc.ec"
+#line 631 "informixc.ec"
   }
 		if (SQLCODE < 0)
 			return self;
@@ -805,13 +792,13 @@ rb_slob_read(VALUE self, VALUE nbytes)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 671 "informixc.ec"
-#line 672 "informixc.ec"
+#line 658 "informixc.ec"
+#line 659 "informixc.ec"
   char *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 673 "informixc.ec"
+#line 660 "informixc.ec"
 
 
 
@@ -824,11 +811,11 @@ rb_slob_read(VALUE self, VALUE nbytes)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 682 "informixc.ec"
+#line 669 "informixc.ec"
   {
-#line 682 "informixc.ec"
+#line 669 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 682 "informixc.ec"
+#line 669 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -868,13 +855,13 @@ rb_slob_write(VALUE self, VALUE data)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 718 "informixc.ec"
-#line 719 "informixc.ec"
+#line 705 "informixc.ec"
+#line 706 "informixc.ec"
   char *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 720 "informixc.ec"
+#line 707 "informixc.ec"
 
 
 	Data_Get_Struct(self, slob_t, slob);
@@ -886,11 +873,11 @@ rb_slob_write(VALUE self, VALUE data)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 728 "informixc.ec"
+#line 715 "informixc.ec"
   {
-#line 728 "informixc.ec"
+#line 715 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 728 "informixc.ec"
+#line 715 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -952,13 +939,13 @@ rb_slob_seek(VALUE self, VALUE offset, VALUE whence)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 786 "informixc.ec"
-#line 787 "informixc.ec"
+#line 773 "informixc.ec"
+#line 774 "informixc.ec"
   char *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 788 "informixc.ec"
+#line 775 "informixc.ec"
 
 
 	Data_Get_Struct(self, slob_t, slob);
@@ -970,11 +957,11 @@ rb_slob_seek(VALUE self, VALUE offset, VALUE whence)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 796 "informixc.ec"
+#line 783 "informixc.ec"
   {
-#line 796 "informixc.ec"
+#line 783 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 796 "informixc.ec"
+#line 783 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -1030,13 +1017,13 @@ rb_slob_tell(VALUE self)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 848 "informixc.ec"
-#line 849 "informixc.ec"
+#line 835 "informixc.ec"
+#line 836 "informixc.ec"
   char *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 850 "informixc.ec"
+#line 837 "informixc.ec"
 
 
 	Data_Get_Struct(self, slob_t, slob);
@@ -1048,11 +1035,11 @@ rb_slob_tell(VALUE self)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 858 "informixc.ec"
+#line 845 "informixc.ec"
   {
-#line 858 "informixc.ec"
+#line 845 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 858 "informixc.ec"
+#line 845 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -1083,13 +1070,13 @@ rb_slob_truncate(VALUE self, VALUE offset)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 885 "informixc.ec"
-#line 886 "informixc.ec"
+#line 872 "informixc.ec"
+#line 873 "informixc.ec"
   char *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 887 "informixc.ec"
+#line 874 "informixc.ec"
 
 
 	Data_Get_Struct(self, slob_t, slob);
@@ -1101,11 +1088,11 @@ rb_slob_truncate(VALUE self, VALUE offset)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 895 "informixc.ec"
+#line 882 "informixc.ec"
   {
-#line 895 "informixc.ec"
+#line 882 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 895 "informixc.ec"
+#line 882 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -1155,13 +1142,13 @@ rb_slob_lock(VALUE self, VALUE offset, VALUE whence, VALUE range, VALUE mode)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 941 "informixc.ec"
-#line 942 "informixc.ec"
+#line 928 "informixc.ec"
+#line 929 "informixc.ec"
   char *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 943 "informixc.ec"
+#line 930 "informixc.ec"
 
 
 	Data_Get_Struct(self, slob_t, slob);
@@ -1173,11 +1160,11 @@ rb_slob_lock(VALUE self, VALUE offset, VALUE whence, VALUE range, VALUE mode)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 951 "informixc.ec"
+#line 938 "informixc.ec"
   {
-#line 951 "informixc.ec"
+#line 938 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 951 "informixc.ec"
+#line 938 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -1215,13 +1202,13 @@ rb_slob_unlock(VALUE self, VALUE offset, VALUE whence, VALUE range)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 985 "informixc.ec"
-#line 986 "informixc.ec"
+#line 972 "informixc.ec"
+#line 973 "informixc.ec"
   char *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 987 "informixc.ec"
+#line 974 "informixc.ec"
 
 
 	Data_Get_Struct(self, slob_t, slob);
@@ -1233,11 +1220,11 @@ rb_slob_unlock(VALUE self, VALUE offset, VALUE whence, VALUE range)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 995 "informixc.ec"
+#line 982 "informixc.ec"
   {
-#line 995 "informixc.ec"
+#line 982 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 995 "informixc.ec"
+#line 982 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -1272,13 +1259,13 @@ slob_specget(VALUE self, slob_option_t option)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 1026 "informixc.ec"
-#line 1027 "informixc.ec"
+#line 1013 "informixc.ec"
+#line 1014 "informixc.ec"
   char *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 1028 "informixc.ec"
+#line 1015 "informixc.ec"
 
 
 	Data_Get_Struct(self, slob_t, slob);
@@ -1290,11 +1277,11 @@ slob_specget(VALUE self, slob_option_t option)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 1036 "informixc.ec"
+#line 1023 "informixc.ec"
   {
-#line 1036 "informixc.ec"
+#line 1023 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 1036 "informixc.ec"
+#line 1023 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -1358,13 +1345,13 @@ slob_specset(VALUE self, slob_option_t option, VALUE value)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 1096 "informixc.ec"
-#line 1097 "informixc.ec"
+#line 1083 "informixc.ec"
+#line 1084 "informixc.ec"
   char *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 1098 "informixc.ec"
+#line 1085 "informixc.ec"
 
 
 	Data_Get_Struct(self, slob_t, slob);
@@ -1376,11 +1363,11 @@ slob_specset(VALUE self, slob_option_t option, VALUE value)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 1106 "informixc.ec"
+#line 1093 "informixc.ec"
   {
-#line 1106 "informixc.ec"
+#line 1093 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 1106 "informixc.ec"
+#line 1093 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -1516,13 +1503,13 @@ slob_stat(VALUE self, slob_stat_t stat)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 1238 "informixc.ec"
-#line 1239 "informixc.ec"
+#line 1225 "informixc.ec"
+#line 1226 "informixc.ec"
   char *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 1240 "informixc.ec"
+#line 1227 "informixc.ec"
 
 
 	Data_Get_Struct(self, slob_t, slob);
@@ -1535,11 +1522,11 @@ slob_stat(VALUE self, slob_stat_t stat)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 1249 "informixc.ec"
+#line 1236 "informixc.ec"
   {
-#line 1249 "informixc.ec"
+#line 1236 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 1249 "informixc.ec"
+#line 1236 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -1805,7 +1792,7 @@ free_output_slots(cursor_t *c)
 {
 	if (c->daOutput != NULL) {
 		struct sqlvar_struct *var = c->daOutput->sqlvar;
-		if (var) {
+		if (var != NULL) {
 			register int i;
 			for (i = 0; i < c->daOutput->sqld; i++, var++) {
 				if (ISBLOBTYPE(var->sqltype)) {
@@ -1816,6 +1803,7 @@ free_output_slots(cursor_t *c)
 				if (ISSMARTBLOB(var->sqltype, var->sqlxid))
 					xfree(var->sqldata);
 			}
+			c->daOutput->sqlvar = NULL;
 		}
 		xfree(c->daOutput);
 		c->daOutput = NULL;
@@ -2231,13 +2219,13 @@ database_free(void *p)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 1937 "informixc.ec"
-#line 1938 "informixc.ec"
+#line 1925 "informixc.ec"
+#line 1926 "informixc.ec"
   char *id;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 1939 "informixc.ec"
+#line 1927 "informixc.ec"
 
 
 	dbt = p;
@@ -2245,11 +2233,11 @@ database_free(void *p)
 /*
  * 	EXEC SQL disconnect :id;
  */
-#line 1943 "informixc.ec"
+#line 1931 "informixc.ec"
   {
-#line 1943 "informixc.ec"
+#line 1931 "informixc.ec"
   sqli_connect_close(0, id, 0, 0);
-#line 1943 "informixc.ec"
+#line 1931 "informixc.ec"
   }
 	xfree(p);
 }
@@ -2276,8 +2264,8 @@ rb_database_initialize(int argc, VALUE *argv, VALUE self)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 1966 "informixc.ec"
-#line 1967 "informixc.ec"
+#line 1954 "informixc.ec"
+#line 1955 "informixc.ec"
   char *dbname, *user = NULL, *pass = NULL;
   char *did, *cid, *sid;
 struct version_t
@@ -2288,7 +2276,7 @@ struct version_t
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 1973 "informixc.ec"
+#line 1961 "informixc.ec"
 
 
 	rb_scan_args(argc, argv, "12", &arg[0], &arg[1], &arg[2]);
@@ -2316,24 +2304,24 @@ struct version_t
  * 		EXEC SQL connect to :dbname as :did user :user
  * 			using :pass with concurrent transaction;
  */
-#line 1996 "informixc.ec"
+#line 1984 "informixc.ec"
   {
-#line 1997 "informixc.ec"
+#line 1985 "informixc.ec"
   ifx_conn_t      *_sqiconn;
   _sqiconn = (ifx_conn_t *)ifx_alloc_conn_user(user, pass);
   sqli_connect_open(ESQLINTVERSION, 0, dbname, did, _sqiconn, 1);
   ifx_free_conn_user(&_sqiconn);
-#line 1997 "informixc.ec"
+#line 1985 "informixc.ec"
   }
 	else
 /*
  * 		EXEC SQL connect to :dbname as :did with concurrent transaction;
  */
-#line 1999 "informixc.ec"
+#line 1987 "informixc.ec"
   {
-#line 1999 "informixc.ec"
+#line 1987 "informixc.ec"
   sqli_connect_open(ESQLINTVERSION, 0, dbname, did, (ifx_conn_t *)0, 1);
-#line 1999 "informixc.ec"
+#line 1987 "informixc.ec"
   }
 
 	if (SQLCODE < 0)
@@ -2350,11 +2338,11 @@ struct version_t
  * 		where c.tabid = ? and c.tabid = d.tabid and c.colno = d.colno
  * 		order by c.colno';
  */
-#line 2007 "informixc.ec"
+#line 1995 "informixc.ec"
   {
-#line 2012 "informixc.ec"
+#line 2000 "informixc.ec"
   sqli_prep(ESQLINTVERSION, sid, "select colname, coltype, collength, extended_id,			type, default, c.colno		from syscolumns c, outer sysdefaults d		where c.tabid = ? and c.tabid = d.tabid and c.colno = d.colno		order by c.colno",(ifx_literal_t *)0, (ifx_namelist_t *)0, 2, 0, 0 ); 
-#line 2012 "informixc.ec"
+#line 2000 "informixc.ec"
   }
 
 	if (SQLCODE < 0)
@@ -2363,11 +2351,11 @@ struct version_t
 /*
  * 	EXEC SQL declare :cid cursor for :sid;
  */
-#line 2017 "informixc.ec"
+#line 2005 "informixc.ec"
   {
-#line 2017 "informixc.ec"
+#line 2005 "informixc.ec"
   sqli_curs_decl_dynm(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 0), cid, sqli_curs_locate(ESQLINTVERSION, sid, 1), 0, 0);
-#line 2017 "informixc.ec"
+#line 2005 "informixc.ec"
   }
 
 	if (SQLCODE < 0)
@@ -2382,17 +2370,17 @@ struct version_t
  * 					dbinfo('version', 'full')
  * 			  into :c_version from systables where tabid = 1;
  */
-#line 2022 "informixc.ec"
+#line 2010 "informixc.ec"
   {
-#line 2028 "informixc.ec"
+#line 2016 "informixc.ec"
   static const char *sqlcmdtxt[] =
-#line 2028 "informixc.ec"
+#line 2016 "informixc.ec"
     {
-#line 2028 "informixc.ec"
+#line 2016 "informixc.ec"
     "select dbinfo ( 'version' , 'server-type' ) , dbinfo ( 'version' , 'major' ) , dbinfo ( 'version' , 'minor' ) , dbinfo ( 'version' , 'os' ) , dbinfo ( 'version' , 'level' ) , dbinfo ( 'version' , 'full' ) from systables where tabid = 1",
     0
     };
-#line 2028 "informixc.ec"
+#line 2016 "informixc.ec"
 static ifx_cursor_t _SQ0 = {0};
   static ifx_sqlvar_t _sqobind[] = 
     {
@@ -2402,23 +2390,23 @@ static ifx_cursor_t _SQ0 = {0};
       { 114, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
       { 114, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
       { 114, 61, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-#line 2028 "informixc.ec"
+#line 2016 "informixc.ec"
     };
-#line 2028 "informixc.ec"
+#line 2016 "informixc.ec"
   _sqobind[0].sqldata = (c_version).server_type;
-#line 2028 "informixc.ec"
+#line 2016 "informixc.ec"
   _sqobind[1].sqldata = (c_version).major;
-#line 2028 "informixc.ec"
+#line 2016 "informixc.ec"
   _sqobind[2].sqldata = (c_version).minor;
-#line 2028 "informixc.ec"
+#line 2016 "informixc.ec"
   _sqobind[3].sqldata = (c_version).os;
-#line 2028 "informixc.ec"
+#line 2016 "informixc.ec"
   _sqobind[4].sqldata = (c_version).level;
-#line 2028 "informixc.ec"
+#line 2016 "informixc.ec"
   _sqobind[5].sqldata = (c_version).full;
-#line 2028 "informixc.ec"
+#line 2016 "informixc.ec"
   sqli_slct(ESQLINTVERSION, &_SQ0,sqlcmdtxt,0,(ifx_sqlvar_t *)0,6,_sqobind,0,(ifx_literal_t *)0,(ifx_namelist_t *)0,0);
-#line 2028 "informixc.ec"
+#line 2016 "informixc.ec"
   }
 
 
@@ -2450,13 +2438,13 @@ rb_database_close(VALUE self)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 2056 "informixc.ec"
-#line 2057 "informixc.ec"
+#line 2044 "informixc.ec"
+#line 2045 "informixc.ec"
   char *id;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2058 "informixc.ec"
+#line 2046 "informixc.ec"
 
 
 	Data_Get_Struct(self, database_t, dbt);
@@ -2464,11 +2452,11 @@ rb_database_close(VALUE self)
 /*
  * 	EXEC SQL disconnect :id;
  */
-#line 2062 "informixc.ec"
+#line 2050 "informixc.ec"
   {
-#line 2062 "informixc.ec"
+#line 2050 "informixc.ec"
   sqli_connect_close(0, id, 0, 0);
-#line 2062 "informixc.ec"
+#line 2050 "informixc.ec"
   }
 
 	return Qnil;
@@ -2500,13 +2488,13 @@ rb_database_immediate(VALUE self, VALUE arg)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 2090 "informixc.ec"
-#line 2091 "informixc.ec"
+#line 2078 "informixc.ec"
+#line 2079 "informixc.ec"
   char *query, *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2092 "informixc.ec"
+#line 2080 "informixc.ec"
 
 
 	Data_Get_Struct(self, database_t, dbt);
@@ -2514,11 +2502,11 @@ rb_database_immediate(VALUE self, VALUE arg)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2096 "informixc.ec"
+#line 2084 "informixc.ec"
   {
-#line 2096 "informixc.ec"
+#line 2084 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 2096 "informixc.ec"
+#line 2084 "informixc.ec"
   }
 
 	if (SQLCODE < 0)
@@ -2528,11 +2516,11 @@ rb_database_immediate(VALUE self, VALUE arg)
 /*
  * 	EXEC SQL execute immediate :query;
  */
-#line 2102 "informixc.ec"
+#line 2090 "informixc.ec"
   {
-#line 2102 "informixc.ec"
+#line 2090 "informixc.ec"
   sqli_exec_immed(query);
-#line 2102 "informixc.ec"
+#line 2090 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -2553,13 +2541,13 @@ rb_database_rollback(VALUE self)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 2119 "informixc.ec"
-#line 2120 "informixc.ec"
+#line 2107 "informixc.ec"
+#line 2108 "informixc.ec"
   char *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2121 "informixc.ec"
+#line 2109 "informixc.ec"
 
 
 	Data_Get_Struct(self, database_t, dbt);
@@ -2567,11 +2555,11 @@ rb_database_rollback(VALUE self)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2125 "informixc.ec"
+#line 2113 "informixc.ec"
   {
-#line 2125 "informixc.ec"
+#line 2113 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 2125 "informixc.ec"
+#line 2113 "informixc.ec"
   }
 
 	if (SQLCODE < 0)
@@ -2580,11 +2568,11 @@ rb_database_rollback(VALUE self)
 /*
  * 	EXEC SQL rollback;
  */
-#line 2130 "informixc.ec"
+#line 2118 "informixc.ec"
   {
-#line 2130 "informixc.ec"
+#line 2118 "informixc.ec"
   sqli_trans_rollback();
-#line 2130 "informixc.ec"
+#line 2118 "informixc.ec"
   }
 
 	return self;
@@ -2603,13 +2591,13 @@ rb_database_commit(VALUE self)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 2145 "informixc.ec"
-#line 2146 "informixc.ec"
+#line 2133 "informixc.ec"
+#line 2134 "informixc.ec"
   char *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2147 "informixc.ec"
+#line 2135 "informixc.ec"
 
 
 	Data_Get_Struct(self, database_t, dbt);
@@ -2617,11 +2605,11 @@ rb_database_commit(VALUE self)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2151 "informixc.ec"
+#line 2139 "informixc.ec"
   {
-#line 2151 "informixc.ec"
+#line 2139 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 2151 "informixc.ec"
+#line 2139 "informixc.ec"
   }
 
 	if (SQLCODE < 0)
@@ -2630,11 +2618,11 @@ rb_database_commit(VALUE self)
 /*
  * 	EXEC SQL commit;
  */
-#line 2156 "informixc.ec"
+#line 2144 "informixc.ec"
   {
-#line 2156 "informixc.ec"
+#line 2144 "informixc.ec"
   sqli_trans_commit();
-#line 2156 "informixc.ec"
+#line 2144 "informixc.ec"
   }
 
 	return self;
@@ -2679,13 +2667,13 @@ rb_database_transaction(VALUE self)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 2197 "informixc.ec"
-#line 2198 "informixc.ec"
+#line 2185 "informixc.ec"
+#line 2186 "informixc.ec"
   char *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2199 "informixc.ec"
+#line 2187 "informixc.ec"
 
 
 	Data_Get_Struct(self, database_t, dbt);
@@ -2693,11 +2681,11 @@ rb_database_transaction(VALUE self)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2203 "informixc.ec"
+#line 2191 "informixc.ec"
   {
-#line 2203 "informixc.ec"
+#line 2191 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 2203 "informixc.ec"
+#line 2191 "informixc.ec"
   }
 
 	if (SQLCODE < 0)
@@ -2706,20 +2694,20 @@ rb_database_transaction(VALUE self)
 /*
  * 	EXEC SQL commit;
  */
-#line 2208 "informixc.ec"
+#line 2196 "informixc.ec"
   {
-#line 2208 "informixc.ec"
+#line 2196 "informixc.ec"
   sqli_trans_commit();
-#line 2208 "informixc.ec"
+#line 2196 "informixc.ec"
   }
 /*
  * 	EXEC SQL begin work;
  */
-#line 2209 "informixc.ec"
+#line 2197 "informixc.ec"
   {
-#line 2209 "informixc.ec"
+#line 2197 "informixc.ec"
   sqli_trans_begin2((mint)1);
-#line 2209 "informixc.ec"
+#line 2197 "informixc.ec"
   }
 	ret = rb_rescue(rb_yield, self, database_transfail, self);
 
@@ -2729,11 +2717,11 @@ rb_database_transaction(VALUE self)
 /*
  * 	EXEC SQL commit;
  */
-#line 2215 "informixc.ec"
+#line 2203 "informixc.ec"
   {
-#line 2215 "informixc.ec"
+#line 2203 "informixc.ec"
   sqli_trans_commit();
-#line 2215 "informixc.ec"
+#line 2203 "informixc.ec"
   }
 
 	return self;
@@ -2766,8 +2754,8 @@ rb_database_columns(VALUE self, VALUE tablename)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 2244 "informixc.ec"
-#line 2245 "informixc.ec"
+#line 2232 "informixc.ec"
+#line 2233 "informixc.ec"
   char *did, *cid;
   char *tabname;
 int tabid, xid;
@@ -2778,7 +2766,7 @@ short coltype, collength;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2252 "informixc.ec"
+#line 2240 "informixc.ec"
 
 
 	Data_Get_Struct(self, database_t, dbt);
@@ -2786,11 +2774,11 @@ short coltype, collength;
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2256 "informixc.ec"
+#line 2244 "informixc.ec"
   {
-#line 2256 "informixc.ec"
+#line 2244 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 2256 "informixc.ec"
+#line 2244 "informixc.ec"
   }
 
 	if (SQLCODE < 0)
@@ -2801,35 +2789,35 @@ short coltype, collength;
 /*
  * 	EXEC SQL select tabid into :tabid from systables where tabname = :tabname;
  */
-#line 2263 "informixc.ec"
+#line 2251 "informixc.ec"
   {
-#line 2263 "informixc.ec"
+#line 2251 "informixc.ec"
   static const char *sqlcmdtxt[] =
-#line 2263 "informixc.ec"
+#line 2251 "informixc.ec"
     {
-#line 2263 "informixc.ec"
+#line 2251 "informixc.ec"
     "select tabid from systables where tabname = ?",
     0
     };
-#line 2263 "informixc.ec"
+#line 2251 "informixc.ec"
 static ifx_cursor_t _SQ0 = {0};
   static ifx_sqlvar_t _sqibind[] = 
     {
       { 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-#line 2263 "informixc.ec"
+#line 2251 "informixc.ec"
     };
   static ifx_sqlvar_t _sqobind[] = 
     {
       { 102, sizeof(tabid), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-#line 2263 "informixc.ec"
+#line 2251 "informixc.ec"
     };
-#line 2263 "informixc.ec"
+#line 2251 "informixc.ec"
   _sqibind[0].sqldata = tabname;
-#line 2263 "informixc.ec"
+#line 2251 "informixc.ec"
   _sqobind[0].sqldata = (char *) &tabid;
-#line 2263 "informixc.ec"
+#line 2251 "informixc.ec"
   sqli_slct(ESQLINTVERSION, &_SQ0,sqlcmdtxt,1,_sqibind,1,_sqobind,0,(ifx_literal_t *)0,(ifx_namelist_t *)0,0);
-#line 2263 "informixc.ec"
+#line 2251 "informixc.ec"
   }
 
 	if (SQLCODE == SQLNOTFOUND)
@@ -2840,19 +2828,19 @@ static ifx_cursor_t _SQ0 = {0};
 /*
  * 	EXEC SQL open :cid using :tabid;
  */
-#line 2270 "informixc.ec"
+#line 2258 "informixc.ec"
   {
-#line 2270 "informixc.ec"
+#line 2258 "informixc.ec"
   static ifx_sqlvar_t _sqibind[] = 
     {
       { 102, sizeof(tabid), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-#line 2270 "informixc.ec"
+#line 2258 "informixc.ec"
     };
   static ifx_sqlda_t _SD0 = { 1, _sqibind, {0}, 1, 0 };
-#line 2270 "informixc.ec"
+#line 2258 "informixc.ec"
   _sqibind[0].sqldata = (char *) &tabid;
   sqli_curs_open(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 256), &_SD0, (char *)0, (struct value *)0, 1, 0);
-#line 2270 "informixc.ec"
+#line 2258 "informixc.ec"
   }
 
 	if (SQLCODE < 0)
@@ -2863,9 +2851,9 @@ static ifx_cursor_t _SQ0 = {0};
  * 		EXEC SQL fetch :cid into :colname, :coltype, :collength, :xid,
  * 			:deftype, :defvalue;
  */
-#line 2276 "informixc.ec"
+#line 2264 "informixc.ec"
   {
-#line 2277 "informixc.ec"
+#line 2265 "informixc.ec"
   static ifx_sqlvar_t _sqobind[] = 
     {
       { 114, 129, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
@@ -2874,24 +2862,24 @@ static ifx_cursor_t _SQ0 = {0};
       { 102, sizeof(xid), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
       { 100, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
       { 114, 257, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-#line 2277 "informixc.ec"
+#line 2265 "informixc.ec"
     };
   static ifx_sqlda_t _SD0 = { 6, _sqobind, {0}, 6, 0 };
   static _FetchSpec _FS1 = { 0, 1, 0 };
-#line 2277 "informixc.ec"
+#line 2265 "informixc.ec"
   _sqobind[0].sqldata = colname;
-#line 2277 "informixc.ec"
+#line 2265 "informixc.ec"
   _sqobind[1].sqldata = (char *) &coltype;
-#line 2277 "informixc.ec"
+#line 2265 "informixc.ec"
   _sqobind[2].sqldata = (char *) &collength;
-#line 2277 "informixc.ec"
+#line 2265 "informixc.ec"
   _sqobind[3].sqldata = (char *) &xid;
-#line 2277 "informixc.ec"
+#line 2265 "informixc.ec"
   _sqobind[4].sqldata = deftype;
-#line 2277 "informixc.ec"
+#line 2265 "informixc.ec"
   _sqobind[5].sqldata = defvalue;
   sqli_curs_fetch(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 256), (ifx_sqlda_t *)0, &_SD0, (char *)0, &_FS1);
-#line 2277 "informixc.ec"
+#line 2265 "informixc.ec"
   }
 		if (SQLCODE < 0)
 			raise_ifx_extended();
@@ -2989,11 +2977,11 @@ static ifx_cursor_t _SQ0 = {0};
 /*
  * 	EXEC SQL close :cid;
  */
-#line 2371 "informixc.ec"
+#line 2359 "informixc.ec"
   {
-#line 2371 "informixc.ec"
+#line 2359 "informixc.ec"
   sqli_curs_close(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 256));
-#line 2371 "informixc.ec"
+#line 2359 "informixc.ec"
   }
 
 	return result;
@@ -3019,13 +3007,13 @@ st_free(cursor_t *c)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 2393 "informixc.ec"
-#line 2394 "informixc.ec"
+#line 2381 "informixc.ec"
+#line 2382 "informixc.ec"
   char *sid, *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2395 "informixc.ec"
+#line 2383 "informixc.ec"
 
 
 	free_input_slots(c);
@@ -3035,11 +3023,11 @@ st_free(cursor_t *c)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2401 "informixc.ec"
+#line 2389 "informixc.ec"
   {
-#line 2401 "informixc.ec"
+#line 2389 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 2401 "informixc.ec"
+#line 2389 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		return;
@@ -3048,11 +3036,11 @@ st_free(cursor_t *c)
 /*
  * 	EXEC SQL free :sid;
  */
-#line 2406 "informixc.ec"
+#line 2394 "informixc.ec"
   {
-#line 2406 "informixc.ec"
+#line 2394 "informixc.ec"
   sqli_curs_free(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, sid, 258));
-#line 2406 "informixc.ec"
+#line 2394 "informixc.ec"
   }
 }
 
@@ -3083,13 +3071,13 @@ rb_statement_initialize(VALUE self, VALUE db, VALUE query)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 2433 "informixc.ec"
-#line 2434 "informixc.ec"
+#line 2421 "informixc.ec"
+#line 2422 "informixc.ec"
   char *c_query, *sid, *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2435 "informixc.ec"
+#line 2423 "informixc.ec"
 
 
 	Data_Get_Struct(db, database_t, dbt);
@@ -3097,11 +3085,11 @@ rb_statement_initialize(VALUE self, VALUE db, VALUE query)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2439 "informixc.ec"
+#line 2427 "informixc.ec"
   {
-#line 2439 "informixc.ec"
+#line 2427 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 2439 "informixc.ec"
+#line 2427 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -3117,11 +3105,11 @@ rb_statement_initialize(VALUE self, VALUE db, VALUE query)
 /*
  * 	EXEC SQL prepare :sid from :c_query;
  */
-#line 2451 "informixc.ec"
+#line 2439 "informixc.ec"
   {
-#line 2451 "informixc.ec"
+#line 2439 "informixc.ec"
   sqli_prep(ESQLINTVERSION, sid, c_query,(ifx_literal_t *)0, (ifx_namelist_t *)0, -1, 0, 0 ); 
-#line 2451 "informixc.ec"
+#line 2439 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -3130,11 +3118,11 @@ rb_statement_initialize(VALUE self, VALUE db, VALUE query)
 /*
  * 	EXEC SQL describe :sid into output;
  */
-#line 2456 "informixc.ec"
+#line 2444 "informixc.ec"
   {
-#line 2456 "informixc.ec"
+#line 2444 "informixc.ec"
   sqli_describe_stmt(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, sid, 257), &output, 0);
-#line 2456 "informixc.ec"
+#line 2444 "informixc.ec"
   }
 	c->daOutput = output;
 
@@ -3181,13 +3169,13 @@ rb_statement_call(int argc, VALUE *argv, VALUE self)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 2499 "informixc.ec"
-#line 2500 "informixc.ec"
+#line 2487 "informixc.ec"
+#line 2488 "informixc.ec"
   char *sid, *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2501 "informixc.ec"
+#line 2489 "informixc.ec"
 
 
 	Data_Get_Struct(self, cursor_t, c);
@@ -3196,11 +3184,11 @@ rb_statement_call(int argc, VALUE *argv, VALUE self)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2506 "informixc.ec"
+#line 2494 "informixc.ec"
   {
-#line 2506 "informixc.ec"
+#line 2494 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 2506 "informixc.ec"
+#line 2494 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -3220,11 +3208,11 @@ rb_statement_call(int argc, VALUE *argv, VALUE self)
  * 			EXEC SQL execute :sid into descriptor output
  * 				using descriptor input;
  */
-#line 2521 "informixc.ec"
+#line 2509 "informixc.ec"
   {
-#line 2522 "informixc.ec"
+#line 2510 "informixc.ec"
   sqli_exec(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, sid, 257), input, (char *)0, (struct value *)0, output, (char *)0, (struct value *)0, 0);
-#line 2522 "informixc.ec"
+#line 2510 "informixc.ec"
   }
 			clean_input_slots(c);
 		}
@@ -3232,11 +3220,11 @@ rb_statement_call(int argc, VALUE *argv, VALUE self)
 /*
  * 			EXEC SQL execute :sid into descriptor output;
  */
-#line 2526 "informixc.ec"
+#line 2514 "informixc.ec"
   {
-#line 2526 "informixc.ec"
+#line 2514 "informixc.ec"
   sqli_exec(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, sid, 257), (ifx_sqlda_t *)0, (char *)0, (struct value *)0, output, (char *)0, (struct value *)0, 0);
-#line 2526 "informixc.ec"
+#line 2514 "informixc.ec"
   }
 
 		if (SQLCODE < 0)
@@ -3252,11 +3240,11 @@ rb_statement_call(int argc, VALUE *argv, VALUE self)
 /*
  * 			EXEC SQL execute :sid using descriptor input;
  */
-#line 2538 "informixc.ec"
+#line 2526 "informixc.ec"
   {
-#line 2538 "informixc.ec"
+#line 2526 "informixc.ec"
   sqli_exec(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, sid, 257), input, (char *)0, (struct value *)0, (ifx_sqlda_t *)0, (char *)0, (struct value *)0, 0);
-#line 2538 "informixc.ec"
+#line 2526 "informixc.ec"
   }
 			clean_input_slots(c);
 		}
@@ -3264,11 +3252,11 @@ rb_statement_call(int argc, VALUE *argv, VALUE self)
 /*
  * 			EXEC SQL execute :sid;
  */
-#line 2542 "informixc.ec"
+#line 2530 "informixc.ec"
   {
-#line 2542 "informixc.ec"
+#line 2530 "informixc.ec"
   sqli_exec(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, sid, 257), (ifx_sqlda_t *)0, (char *)0, (struct value *)0, (ifx_sqlda_t *)0, (char *)0, (struct value *)0, 0);
-#line 2542 "informixc.ec"
+#line 2530 "informixc.ec"
   }
 	}
 	if (SQLCODE < 0)
@@ -3330,13 +3318,13 @@ fetch(VALUE self, VALUE type, VALUE bang)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 2600 "informixc.ec"
-#line 2601 "informixc.ec"
+#line 2588 "informixc.ec"
+#line 2589 "informixc.ec"
   char *cid, *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2602 "informixc.ec"
+#line 2590 "informixc.ec"
 
 	short c_bang;
 	cursor_t *c;
@@ -3351,11 +3339,11 @@ fetch(VALUE self, VALUE type, VALUE bang)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2613 "informixc.ec"
+#line 2601 "informixc.ec"
   {
-#line 2613 "informixc.ec"
+#line 2601 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 2613 "informixc.ec"
+#line 2601 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -3366,12 +3354,12 @@ fetch(VALUE self, VALUE type, VALUE bang)
 /*
  * 	EXEC SQL fetch :cid using descriptor output;
  */
-#line 2620 "informixc.ec"
+#line 2608 "informixc.ec"
   {
-#line 2620 "informixc.ec"
+#line 2608 "informixc.ec"
   static _FetchSpec _FS0 = { 0, 1, 0 };
   sqli_curs_fetch(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 256), (ifx_sqlda_t *)0, output, (char *)0, &_FS0);
-#line 2620 "informixc.ec"
+#line 2608 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -3393,13 +3381,13 @@ fetch_many(VALUE self, VALUE n, VALUE type)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 2638 "informixc.ec"
-#line 2639 "informixc.ec"
+#line 2626 "informixc.ec"
+#line 2627 "informixc.ec"
   char *cid, *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2640 "informixc.ec"
+#line 2628 "informixc.ec"
 
 	cursor_t *c;
 	struct sqlda *output;
@@ -3415,11 +3403,11 @@ fetch_many(VALUE self, VALUE n, VALUE type)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2652 "informixc.ec"
+#line 2640 "informixc.ec"
   {
-#line 2652 "informixc.ec"
+#line 2640 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 2652 "informixc.ec"
+#line 2640 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -3439,12 +3427,12 @@ fetch_many(VALUE self, VALUE n, VALUE type)
 /*
  * 		EXEC SQL fetch :cid using descriptor output;
  */
-#line 2668 "informixc.ec"
+#line 2656 "informixc.ec"
   {
-#line 2668 "informixc.ec"
+#line 2656 "informixc.ec"
   static _FetchSpec _FS0 = { 0, 1, 0 };
   sqli_curs_fetch(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 256), (ifx_sqlda_t *)0, output, (char *)0, &_FS0);
-#line 2668 "informixc.ec"
+#line 2656 "informixc.ec"
   }
 		if (SQLCODE < 0)
 			raise_ifx_extended();
@@ -3473,13 +3461,13 @@ each(VALUE self, VALUE type, VALUE bang)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 2693 "informixc.ec"
-#line 2694 "informixc.ec"
+#line 2681 "informixc.ec"
+#line 2682 "informixc.ec"
   char *cid, *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2695 "informixc.ec"
+#line 2683 "informixc.ec"
 
 	short c_bang;
 	struct sqlda *output;
@@ -3493,11 +3481,11 @@ each(VALUE self, VALUE type, VALUE bang)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2705 "informixc.ec"
+#line 2693 "informixc.ec"
   {
-#line 2705 "informixc.ec"
+#line 2693 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 2705 "informixc.ec"
+#line 2693 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -3509,12 +3497,12 @@ each(VALUE self, VALUE type, VALUE bang)
 /*
  * 		EXEC SQL fetch :cid using descriptor output;
  */
-#line 2713 "informixc.ec"
+#line 2701 "informixc.ec"
   {
-#line 2713 "informixc.ec"
+#line 2701 "informixc.ec"
   static _FetchSpec _FS0 = { 0, 1, 0 };
   sqli_curs_fetch(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 256), (ifx_sqlda_t *)0, output, (char *)0, &_FS0);
-#line 2713 "informixc.ec"
+#line 2701 "informixc.ec"
   }
 		if (SQLCODE < 0)
 			raise_ifx_extended();
@@ -3576,13 +3564,13 @@ rb_inscur_put(int argc, VALUE *argv, VALUE self)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 2771 "informixc.ec"
-#line 2772 "informixc.ec"
+#line 2759 "informixc.ec"
+#line 2760 "informixc.ec"
   char *cid, *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2773 "informixc.ec"
+#line 2761 "informixc.ec"
 
 
 	Data_Get_Struct(self, cursor_t, c);
@@ -3593,11 +3581,11 @@ rb_inscur_put(int argc, VALUE *argv, VALUE self)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2780 "informixc.ec"
+#line 2768 "informixc.ec"
   {
-#line 2780 "informixc.ec"
+#line 2768 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 2780 "informixc.ec"
+#line 2768 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -3613,11 +3601,11 @@ rb_inscur_put(int argc, VALUE *argv, VALUE self)
 /*
  * 	EXEC SQL put :cid using descriptor input;
  */
-#line 2792 "informixc.ec"
+#line 2780 "informixc.ec"
   {
-#line 2792 "informixc.ec"
+#line 2780 "informixc.ec"
   sqli_curs_put(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 256), input, (char *)0);
-#line 2792 "informixc.ec"
+#line 2780 "informixc.ec"
   }
 	clean_input_slots(c);
 	if (SQLCODE < 0)
@@ -3642,13 +3630,13 @@ rb_inscur_flush(VALUE self)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 2813 "informixc.ec"
-#line 2814 "informixc.ec"
+#line 2801 "informixc.ec"
+#line 2802 "informixc.ec"
   char *cid, *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2815 "informixc.ec"
+#line 2803 "informixc.ec"
 
 
 	Data_Get_Struct(self, cursor_t, c);
@@ -3659,11 +3647,11 @@ rb_inscur_flush(VALUE self)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2822 "informixc.ec"
+#line 2810 "informixc.ec"
   {
-#line 2822 "informixc.ec"
+#line 2810 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 2822 "informixc.ec"
+#line 2810 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -3672,11 +3660,11 @@ rb_inscur_flush(VALUE self)
 /*
  * 	EXEC SQL flush :cid;
  */
-#line 2827 "informixc.ec"
+#line 2815 "informixc.ec"
   {
-#line 2827 "informixc.ec"
+#line 2815 "informixc.ec"
   sqli_curs_flush(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 256));
-#line 2827 "informixc.ec"
+#line 2815 "informixc.ec"
   }
 	return self;
 }
@@ -3697,14 +3685,14 @@ rb_scrollcur_entry(VALUE self, VALUE index, VALUE type, VALUE bang)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 2844 "informixc.ec"
-#line 2845 "informixc.ec"
+#line 2832 "informixc.ec"
+#line 2833 "informixc.ec"
   char *cid, *did;
 long pos;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2847 "informixc.ec"
+#line 2835 "informixc.ec"
 
 
 	Data_Get_Struct(self, cursor_t, c);
@@ -3715,11 +3703,11 @@ long pos;
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2854 "informixc.ec"
+#line 2842 "informixc.ec"
   {
-#line 2854 "informixc.ec"
+#line 2842 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 2854 "informixc.ec"
+#line 2842 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		return Qnil;
@@ -3731,60 +3719,60 @@ long pos;
 /*
  * 		EXEC SQL fetch current :cid using descriptor output;
  */
-#line 2862 "informixc.ec"
+#line 2850 "informixc.ec"
   {
-#line 2862 "informixc.ec"
+#line 2850 "informixc.ec"
   static _FetchSpec _FS0 = { 0, 5, 0 };
   sqli_curs_fetch(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 256), (ifx_sqlda_t *)0, output, (char *)0, &_FS0);
-#line 2862 "informixc.ec"
+#line 2850 "informixc.ec"
   }
 	else if ((pos = NUM2LONG(index) + 1) > 0)
 /*
  * 		EXEC SQL fetch absolute :pos :cid using descriptor output;
  */
-#line 2864 "informixc.ec"
+#line 2852 "informixc.ec"
   {
-#line 2864 "informixc.ec"
+#line 2852 "informixc.ec"
   static ifx_sqlvar_t _sqibind[] = 
     {
       { 103, sizeof(pos), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-#line 2864 "informixc.ec"
+#line 2852 "informixc.ec"
     };
   static ifx_sqlda_t _SD0 = { 1, _sqibind, {0}, 1, 0 };
   static _FetchSpec _FS1 = { 0, 6, 0 };
-#line 2864 "informixc.ec"
+#line 2852 "informixc.ec"
   _sqibind[0].sqldata = (char *) &pos;
   sqli_curs_fetch(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 256), &_SD0, output, (char *)0, &_FS1);
-#line 2864 "informixc.ec"
+#line 2852 "informixc.ec"
   }
 	else {
 /*
  * 		EXEC SQL fetch last :cid;
  */
-#line 2866 "informixc.ec"
+#line 2854 "informixc.ec"
   {
-#line 2866 "informixc.ec"
+#line 2854 "informixc.ec"
   static _FetchSpec _FS0 = { 0, 4, 0 };
   sqli_curs_fetch(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 256), (ifx_sqlda_t *)0, (ifx_sqlda_t *)0, (char *)0, &_FS0);
-#line 2866 "informixc.ec"
+#line 2854 "informixc.ec"
   }
 /*
  * 		EXEC SQL fetch relative :pos :cid using descriptor output;
  */
-#line 2867 "informixc.ec"
+#line 2855 "informixc.ec"
   {
-#line 2867 "informixc.ec"
+#line 2855 "informixc.ec"
   static ifx_sqlvar_t _sqibind[] = 
     {
       { 103, sizeof(pos), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-#line 2867 "informixc.ec"
+#line 2855 "informixc.ec"
     };
   static ifx_sqlda_t _SD0 = { 1, _sqibind, {0}, 1, 0 };
   static _FetchSpec _FS1 = { 0, 7, 0 };
-#line 2867 "informixc.ec"
+#line 2855 "informixc.ec"
   _sqibind[0].sqldata = (char *) &pos;
   sqli_curs_fetch(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 256), &_SD0, output, (char *)0, &_FS1);
-#line 2867 "informixc.ec"
+#line 2855 "informixc.ec"
   }
 	}
 
@@ -3812,14 +3800,14 @@ rb_scrollcur_rel(VALUE self, VALUE offset, VALUE type, VALUE bang)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 2891 "informixc.ec"
-#line 2892 "informixc.ec"
+#line 2879 "informixc.ec"
+#line 2880 "informixc.ec"
   char *cid, *did;
 long pos;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2894 "informixc.ec"
+#line 2882 "informixc.ec"
 
 
 	Data_Get_Struct(self, cursor_t, c);
@@ -3830,11 +3818,11 @@ long pos;
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2901 "informixc.ec"
+#line 2889 "informixc.ec"
   {
-#line 2901 "informixc.ec"
+#line 2889 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 2901 "informixc.ec"
+#line 2889 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		return Qnil;
@@ -3846,20 +3834,20 @@ long pos;
 /*
  * 	EXEC SQL fetch relative :pos :cid using descriptor output;
  */
-#line 2909 "informixc.ec"
+#line 2897 "informixc.ec"
   {
-#line 2909 "informixc.ec"
+#line 2897 "informixc.ec"
   static ifx_sqlvar_t _sqibind[] = 
     {
       { 103, sizeof(pos), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-#line 2909 "informixc.ec"
+#line 2897 "informixc.ec"
     };
   static ifx_sqlda_t _SD0 = { 1, _sqibind, {0}, 1, 0 };
   static _FetchSpec _FS1 = { 0, 7, 0 };
-#line 2909 "informixc.ec"
+#line 2897 "informixc.ec"
   _sqibind[0].sqldata = (char *) &pos;
   sqli_curs_fetch(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 256), &_SD0, output, (char *)0, &_FS1);
-#line 2909 "informixc.ec"
+#line 2897 "informixc.ec"
   }
 
 	if (SQLCODE == SQLNOTFOUND)
@@ -3881,13 +3869,13 @@ cursorbase_close_or_free(cursor_t *c, short op)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 2927 "informixc.ec"
-#line 2928 "informixc.ec"
-  char *cid, *sid, *did;
+#line 2915 "informixc.ec"
+#line 2916 "informixc.ec"
+  char *cid, *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2929 "informixc.ec"
+#line 2917 "informixc.ec"
 
 
 	if (op == 1 && !c->is_open)
@@ -3903,11 +3891,11 @@ cursorbase_close_or_free(cursor_t *c, short op)
 /*
  * 		EXEC SQL set connection :did;
  */
-#line 2941 "informixc.ec"
+#line 2929 "informixc.ec"
   {
-#line 2941 "informixc.ec"
+#line 2929 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 2941 "informixc.ec"
+#line 2929 "informixc.ec"
   }
 		if (SQLCODE < 0)
 			return;
@@ -3915,22 +3903,22 @@ cursorbase_close_or_free(cursor_t *c, short op)
 /*
  * 		EXEC SQL close :cid;
  */
-#line 2945 "informixc.ec"
+#line 2933 "informixc.ec"
   {
-#line 2945 "informixc.ec"
+#line 2933 "informixc.ec"
   sqli_curs_close(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 256));
-#line 2945 "informixc.ec"
+#line 2933 "informixc.ec"
   }
 		if (op == 1)
 			break;
 /*
  * 		EXEC SQL free :cid;
  */
-#line 2948 "informixc.ec"
+#line 2936 "informixc.ec"
   {
-#line 2948 "informixc.ec"
+#line 2936 "informixc.ec"
   sqli_curs_free(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 258));
-#line 2948 "informixc.ec"
+#line 2936 "informixc.ec"
   }
 		st_free(c);
 		break;
@@ -3998,13 +3986,13 @@ rb_cursorbase_open(int argc, VALUE *argv, VALUE self)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 3012 "informixc.ec"
-#line 3013 "informixc.ec"
+#line 3000 "informixc.ec"
+#line 3001 "informixc.ec"
   char *cid, *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 3014 "informixc.ec"
+#line 3002 "informixc.ec"
 
 
 	Data_Get_Struct(self, cursor_t, c);
@@ -4016,11 +4004,11 @@ rb_cursorbase_open(int argc, VALUE *argv, VALUE self)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 3022 "informixc.ec"
+#line 3010 "informixc.ec"
   {
-#line 3022 "informixc.ec"
+#line 3010 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 3022 "informixc.ec"
+#line 3010 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -4039,11 +4027,11 @@ rb_cursorbase_open(int argc, VALUE *argv, VALUE self)
  * 			EXEC SQL open :cid using descriptor input
  * 				with reoptimization;
  */
-#line 3036 "informixc.ec"
+#line 3024 "informixc.ec"
   {
-#line 3037 "informixc.ec"
+#line 3025 "informixc.ec"
   sqli_curs_open(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 256), input, (char *)0, (struct value *)0, 1, 1);
-#line 3037 "informixc.ec"
+#line 3025 "informixc.ec"
   }
 			clean_input_slots(c);
 		}
@@ -4051,22 +4039,22 @@ rb_cursorbase_open(int argc, VALUE *argv, VALUE self)
 /*
  * 			EXEC SQL open :cid with reoptimization;
  */
-#line 3041 "informixc.ec"
+#line 3029 "informixc.ec"
   {
-#line 3041 "informixc.ec"
+#line 3029 "informixc.ec"
   sqli_curs_open(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 256), (ifx_sqlda_t *)0, (char *)0, (struct value *)0, 0, 1);
-#line 3041 "informixc.ec"
+#line 3029 "informixc.ec"
   }
 	}
 	else
 /*
  * 		EXEC SQL open :cid;
  */
-#line 3044 "informixc.ec"
+#line 3032 "informixc.ec"
   {
-#line 3044 "informixc.ec"
+#line 3032 "informixc.ec"
   sqli_curs_open(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 256), (ifx_sqlda_t *)0, (char *)0, (struct value *)0, 0, 0);
-#line 3044 "informixc.ec"
+#line 3032 "informixc.ec"
   }
 
 	if (SQLCODE < 0)
@@ -4128,30 +4116,28 @@ rb_cursor_s_new0(int argc, VALUE *argv, VALUE self)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 3102 "informixc.ec"
-#line 3103 "informixc.ec"
+#line 3090 "informixc.ec"
+#line 3091 "informixc.ec"
   char *c_query;
   char *cid, *sid, *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 3105 "informixc.ec"
+#line 3093 "informixc.ec"
 
 
 	memset(&c, 0, sizeof(c));
 	rb_scan_args(argc, argv, "21", &db, &query, &options);
 	Data_Get_Struct(db, database_t, dbt);
 	did = dbt->database_id;
-	fprintf(stderr, "%s\n", did);
-	fflush(stderr);
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 3113 "informixc.ec"
+#line 3099 "informixc.ec"
   {
-#line 3113 "informixc.ec"
+#line 3099 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 3113 "informixc.ec"
+#line 3099 "informixc.ec"
   }
 
 	if (SQLCODE < 0)
@@ -4160,7 +4146,6 @@ rb_cursor_s_new0(int argc, VALUE *argv, VALUE self)
 	c.db = db;
 	c.database_id = did;
 	scroll = hold = Qfalse;
-	/*id = random();*/
 	id = dbt->idcount++;
 	snprintf(c.cursor_id, sizeof(c.cursor_id), "CUR%lX", id);
 	snprintf(c.stmt_id, sizeof(c.stmt_id), "STMT%lX", id);
@@ -4176,11 +4161,11 @@ rb_cursor_s_new0(int argc, VALUE *argv, VALUE self)
 /*
  * 	EXEC SQL prepare :sid from :c_query;
  */
-#line 3134 "informixc.ec"
+#line 3119 "informixc.ec"
   {
-#line 3134 "informixc.ec"
+#line 3119 "informixc.ec"
   sqli_prep(ESQLINTVERSION, sid, c_query,(ifx_literal_t *)0, (ifx_namelist_t *)0, -1, 0, 0 ); 
-#line 3134 "informixc.ec"
+#line 3119 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -4189,41 +4174,41 @@ rb_cursor_s_new0(int argc, VALUE *argv, VALUE self)
 /*
  * 		EXEC SQL declare :cid scroll cursor with hold for :sid;
  */
-#line 3139 "informixc.ec"
+#line 3124 "informixc.ec"
   {
-#line 3139 "informixc.ec"
+#line 3124 "informixc.ec"
   sqli_curs_decl_dynm(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 0), cid, sqli_curs_locate(ESQLINTVERSION, sid, 1), 4128, 0);
-#line 3139 "informixc.ec"
+#line 3124 "informixc.ec"
   }
 	else if (RTEST(hold))
 /*
  * 		EXEC SQL declare :cid cursor with hold for :sid;
  */
-#line 3141 "informixc.ec"
+#line 3126 "informixc.ec"
   {
-#line 3141 "informixc.ec"
+#line 3126 "informixc.ec"
   sqli_curs_decl_dynm(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 0), cid, sqli_curs_locate(ESQLINTVERSION, sid, 1), 4096, 0);
-#line 3141 "informixc.ec"
+#line 3126 "informixc.ec"
   }
 	else if (RTEST(scroll))
 /*
  * 		EXEC SQL declare :cid scroll cursor for :sid;
  */
-#line 3143 "informixc.ec"
+#line 3128 "informixc.ec"
   {
-#line 3143 "informixc.ec"
+#line 3128 "informixc.ec"
   sqli_curs_decl_dynm(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 0), cid, sqli_curs_locate(ESQLINTVERSION, sid, 1), 32, 0);
-#line 3143 "informixc.ec"
+#line 3128 "informixc.ec"
   }
 	else
 /*
  * 		EXEC SQL declare :cid cursor for :sid;
  */
-#line 3145 "informixc.ec"
+#line 3130 "informixc.ec"
   {
-#line 3145 "informixc.ec"
+#line 3130 "informixc.ec"
   sqli_curs_decl_dynm(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 0), cid, sqli_curs_locate(ESQLINTVERSION, sid, 1), 0, 0);
-#line 3145 "informixc.ec"
+#line 3130 "informixc.ec"
   }
 
 	if (SQLCODE < 0)
@@ -4233,11 +4218,11 @@ rb_cursor_s_new0(int argc, VALUE *argv, VALUE self)
 /*
  * 	EXEC SQL describe :sid into output;
  */
-#line 3151 "informixc.ec"
+#line 3136 "informixc.ec"
   {
-#line 3151 "informixc.ec"
+#line 3136 "informixc.ec"
   sqli_describe_stmt(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, sid, 257), &output, 0);
-#line 3151 "informixc.ec"
+#line 3136 "informixc.ec"
   }
 	c.daOutput = output;
 
@@ -4474,8 +4459,6 @@ void Init_informixc(void)
 	rb_define_singleton_method(rb_mCursor, "new0", rb_cursor_s_new0, -1);
 
 	/* Global constants --------------------------------------------------- */
-	rb_cArray = rb_const_get(rb_cObject, rb_intern("Array"));
-
 	rb_require("date");
 	rb_cDate = rb_const_get(rb_cObject, rb_intern("Date"));
 
@@ -4530,4 +4513,4 @@ void Init_informixc(void)
 	sym_params = ID2SYM(rb_intern("params"));
 }
 
-#line 3441 "informixc.ec"
+#line 3424 "informixc.ec"