ruby-informix 0.7.3 → 0.8.0

data/COPYRIGHT

@@ -1,4 +1,4 @@
- Copyright (c) 2006-2010, Gerardo Santana Gomez Garrido <gerardo.santana@gmail.com>
+ Copyright (c) 2006-2012, Gerardo Santana Gomez Garrido <gerardo.santana@gmail.com>
  All rights reserved.
  
  Redistribution and use in source and binary forms, with or without

data/Changelog

@@ -1,3 +1,21 @@
+0.8.0  2012-04-17
+------------------
+Bugs fixed:
+	* test cases were not loading the just built extension
+
+New features:
+	* Ruby 1.9.3 compatibility
+	* Rake task for running tests
+
+Minor changes:
+	* Warns to set the Informix environment variables when installing the gem
+	* gemspec file added
+
+Caveats:
+	* It's no longer compatible with Ruby 1.8
+	* test cases require test-unit
+
+
 0.7.3  2010-02-02
 ------------------
 Bugs fixed:

data/README

@@ -56,7 +56,7 @@ http://ruby-informix.rubyforge.org/doc
 
 === Traversing a table
 
-    db.each('select * from stock') do |r|
+    db.foreach('select * from stock') do |r|
       # do something with the record
     end
 
@@ -76,7 +76,7 @@ http://ruby-informix.rubyforge.org/doc
 
 === Iterating over a table using a hash (shortcut)
 
-    db.each_hash('select * from customers') do |cust|
+    db.foreach_hash('select * from customers') do |cust|
       puts "#{cust['firstname']} #{cust['lastname']}"
     end
 

data/ext/extconf.rb

@@ -5,7 +5,8 @@ informixdir = ENV["INFORMIXDIR"]
 MSWindows = /djgpp|(cyg|ms|bcc)win|mingw/
 
 if informixdir.nil?
-  informixdir = RUBY_PLATFORM =~ MSWindows ? "C:/informix" : "/usr/informix"
+  warn "Set the Informix environment variables before installing this library"
+  exit 1
 end
 
 esql = informixdir + "/bin/esql"

data/ext/informixc.c

@@ -2,7 +2,7 @@
 #include <sqliapi.h>
 #line 1 "informixc.ec"
 /*
- * Copyright (c) 2006-2008, Gerardo Santana Gomez Garrido <gerardo.santana@gmail.com>
+ * Copyright (c) 2006-2012, Gerardo Santana Gomez Garrido <gerardo.santana@gmail.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,7 +35,7 @@
 #include <sqlstype.h>
 #include <sqltypes.h>
 
-static VALUE rb_cDate, rb_cBigDecimal, rb_cRational;
+static VALUE rb_cDate, rb_cBigDecimal;
 
 /* Modules */
 static VALUE rb_mInformix;
@@ -243,7 +243,7 @@ mint i;
 #line 214 "informixc.ec"
   static ifx_hostvar_t _SQhtab[] =
     {
-      { 0, 11, 103, sizeof(sql_code), 0, 0, 0, 0 },
+      { 0, 11, 102, sizeof(sql_code), 0, 0, 0, 0 },
       { 0, 3, 100, 6, 0, 0, 0, 0 },
       { 0, 4, 100, 256, 0, 0, 0, 0 },
       { 0, 5, 100, 256, 0, 0, 0, 0 },
@@ -1241,7 +1241,7 @@ rb_slob_unlock(VALUE self, VALUE offset, VALUE whence, VALUE range)
 typedef enum {
 	slob_estbytes, slob_extsz, slob_flags, slob_maxbytes, slob_sbspace
 } slob_option_t;
-static char *str_slob_options[] = {
+static const char *str_slob_options[] = {
 	"estbytes", "extsz", "flags", "maxbytes", "sbspace"};
 /*
  * Base function for getting storage charasteristics
@@ -1485,7 +1485,7 @@ rb_slob_set_flags(VALUE self, VALUE value)
 }
 
 typedef enum { slob_atime, slob_ctime, slob_mtime, slob_refcnt, slob_size } slob_stat_t;
-static char *str_slob_stats[] = {
+static const char *str_slob_stats[] = {
 	"atime", "ctime", "mtime", "refcnt", "size"
 };
 
@@ -2136,8 +2136,7 @@ make_result(cursor_t *c, VALUE record)
 				value = rb_funcall(value, s_add, 1, LONG2FIX(sign*seconds));
 
 				if (usec != 0) {
-					VALUE argv[2] = { INT2FIX(sign*usec), LONG2FIX(1000000L) };
-					VALUE frac = rb_class_new_instance(2, argv, rb_cRational);
+					VALUE frac = rb_Rational(INT2FIX(sign*usec), LONG2FIX(1000000L));
 					value = rb_funcall(frac, s_add, 1, value);
 				}
 			}
@@ -2203,8 +2202,8 @@ make_result(cursor_t *c, VALUE record)
 		if (BUILTIN_TYPE(record) == T_ARRAY) {
 			rb_ary_store(record, i, item);
 		}
-        else {
-			rb_hash_aset(record, RARRAY(c->field_names)->ptr[i], item);
+		else {
+			rb_hash_aset(record, RARRAY_PTR(c->field_names)[i], item);
 		}
 	}
 	return record;
@@ -2219,13 +2218,13 @@ database_free(void *p)
 /*
  * 	EXEC SQL begin declare section;
  */
+#line 1924 "informixc.ec"
 #line 1925 "informixc.ec"
-#line 1926 "informixc.ec"
   char *id;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 1927 "informixc.ec"
+#line 1926 "informixc.ec"
 
 
 	dbt = p;
@@ -2233,11 +2232,11 @@ database_free(void *p)
 /*
  * 	EXEC SQL disconnect :id;
  */
-#line 1931 "informixc.ec"
+#line 1930 "informixc.ec"
   {
-#line 1931 "informixc.ec"
+#line 1930 "informixc.ec"
   sqli_connect_close(0, id, 0, 0);
-#line 1931 "informixc.ec"
+#line 1930 "informixc.ec"
   }
 	xfree(p);
 }
@@ -2264,8 +2263,8 @@ rb_database_initialize(int argc, VALUE *argv, VALUE self)
 /*
  * 	EXEC SQL begin declare section;
  */
+#line 1953 "informixc.ec"
 #line 1954 "informixc.ec"
-#line 1955 "informixc.ec"
   char *dbname, *user = NULL, *pass = NULL;
   char *did, *cid, *sid;
 struct version_t
@@ -2276,7 +2275,7 @@ struct version_t
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 1961 "informixc.ec"
+#line 1960 "informixc.ec"
 
 
 	rb_scan_args(argc, argv, "12", &arg[0], &arg[1], &arg[2]);
@@ -2304,24 +2303,24 @@ struct version_t
  * 		EXEC SQL connect to :dbname as :did user :user
  * 			using :pass with concurrent transaction;
  */
-#line 1984 "informixc.ec"
+#line 1983 "informixc.ec"
   {
-#line 1985 "informixc.ec"
+#line 1984 "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 1985 "informixc.ec"
+#line 1984 "informixc.ec"
   }
 	else
 /*
  * 		EXEC SQL connect to :dbname as :did with concurrent transaction;
  */
-#line 1987 "informixc.ec"
+#line 1986 "informixc.ec"
   {
-#line 1987 "informixc.ec"
+#line 1986 "informixc.ec"
   sqli_connect_open(ESQLINTVERSION, 0, dbname, did, (ifx_conn_t *)0, 1);
-#line 1987 "informixc.ec"
+#line 1986 "informixc.ec"
   }
 
 	if (SQLCODE < 0)
@@ -2338,11 +2337,11 @@ struct version_t
  * 		where c.tabid = ? and c.tabid = d.tabid and c.colno = d.colno
  * 		order by c.colno';
  */
-#line 1995 "informixc.ec"
+#line 1994 "informixc.ec"
   {
-#line 2000 "informixc.ec"
+#line 1999 "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 2000 "informixc.ec"
+#line 1999 "informixc.ec"
   }
 
 	if (SQLCODE < 0)
@@ -2351,11 +2350,11 @@ struct version_t
 /*
  * 	EXEC SQL declare :cid cursor for :sid;
  */
-#line 2005 "informixc.ec"
+#line 2004 "informixc.ec"
   {
-#line 2005 "informixc.ec"
+#line 2004 "informixc.ec"
   sqli_curs_decl_dynm(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 0), cid, sqli_curs_locate(ESQLINTVERSION, sid, 1), 0, 0);
-#line 2005 "informixc.ec"
+#line 2004 "informixc.ec"
   }
 
 	if (SQLCODE < 0)
@@ -2370,17 +2369,17 @@ struct version_t
  * 					dbinfo('version', 'full')
  * 			  into :c_version from systables where tabid = 1;
  */
-#line 2010 "informixc.ec"
+#line 2009 "informixc.ec"
   {
-#line 2016 "informixc.ec"
+#line 2015 "informixc.ec"
   static const char *sqlcmdtxt[] =
-#line 2016 "informixc.ec"
+#line 2015 "informixc.ec"
     {
-#line 2016 "informixc.ec"
+#line 2015 "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 2016 "informixc.ec"
+#line 2015 "informixc.ec"
 static ifx_cursor_t _SQ0 = {0};
   static ifx_sqlvar_t _sqobind[] = 
     {
@@ -2390,23 +2389,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 2016 "informixc.ec"
+#line 2015 "informixc.ec"
     };
-#line 2016 "informixc.ec"
+#line 2015 "informixc.ec"
   _sqobind[0].sqldata = (c_version).server_type;
-#line 2016 "informixc.ec"
+#line 2015 "informixc.ec"
   _sqobind[1].sqldata = (c_version).major;
-#line 2016 "informixc.ec"
+#line 2015 "informixc.ec"
   _sqobind[2].sqldata = (c_version).minor;
-#line 2016 "informixc.ec"
+#line 2015 "informixc.ec"
   _sqobind[3].sqldata = (c_version).os;
-#line 2016 "informixc.ec"
+#line 2015 "informixc.ec"
   _sqobind[4].sqldata = (c_version).level;
-#line 2016 "informixc.ec"
+#line 2015 "informixc.ec"
   _sqobind[5].sqldata = (c_version).full;
-#line 2016 "informixc.ec"
+#line 2015 "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 2016 "informixc.ec"
+#line 2015 "informixc.ec"
   }
 
 
@@ -2438,13 +2437,13 @@ rb_database_close(VALUE self)
 /*
  * 	EXEC SQL begin declare section;
  */
+#line 2043 "informixc.ec"
 #line 2044 "informixc.ec"
-#line 2045 "informixc.ec"
   char *id;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2046 "informixc.ec"
+#line 2045 "informixc.ec"
 
 
 	Data_Get_Struct(self, database_t, dbt);
@@ -2452,11 +2451,11 @@ rb_database_close(VALUE self)
 /*
  * 	EXEC SQL disconnect :id;
  */
-#line 2050 "informixc.ec"
+#line 2049 "informixc.ec"
   {
-#line 2050 "informixc.ec"
+#line 2049 "informixc.ec"
   sqli_connect_close(0, id, 0, 0);
-#line 2050 "informixc.ec"
+#line 2049 "informixc.ec"
   }
 
 	return Qnil;
@@ -2488,13 +2487,13 @@ rb_database_immediate(VALUE self, VALUE arg)
 /*
  * 	EXEC SQL begin declare section;
  */
+#line 2077 "informixc.ec"
 #line 2078 "informixc.ec"
-#line 2079 "informixc.ec"
   char *query, *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2080 "informixc.ec"
+#line 2079 "informixc.ec"
 
 
 	Data_Get_Struct(self, database_t, dbt);
@@ -2502,11 +2501,11 @@ rb_database_immediate(VALUE self, VALUE arg)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2084 "informixc.ec"
+#line 2083 "informixc.ec"
   {
-#line 2084 "informixc.ec"
+#line 2083 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 2084 "informixc.ec"
+#line 2083 "informixc.ec"
   }
 
 	if (SQLCODE < 0)
@@ -2516,11 +2515,11 @@ rb_database_immediate(VALUE self, VALUE arg)
 /*
  * 	EXEC SQL execute immediate :query;
  */
-#line 2090 "informixc.ec"
+#line 2089 "informixc.ec"
   {
-#line 2090 "informixc.ec"
+#line 2089 "informixc.ec"
   sqli_exec_immed(query);
-#line 2090 "informixc.ec"
+#line 2089 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -2541,13 +2540,13 @@ rb_database_rollback(VALUE self)
 /*
  * 	EXEC SQL begin declare section;
  */
+#line 2106 "informixc.ec"
 #line 2107 "informixc.ec"
-#line 2108 "informixc.ec"
   char *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2109 "informixc.ec"
+#line 2108 "informixc.ec"
 
 
 	Data_Get_Struct(self, database_t, dbt);
@@ -2555,11 +2554,11 @@ rb_database_rollback(VALUE self)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2113 "informixc.ec"
+#line 2112 "informixc.ec"
   {
-#line 2113 "informixc.ec"
+#line 2112 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 2113 "informixc.ec"
+#line 2112 "informixc.ec"
   }
 
 	if (SQLCODE < 0)
@@ -2568,11 +2567,11 @@ rb_database_rollback(VALUE self)
 /*
  * 	EXEC SQL rollback;
  */
-#line 2118 "informixc.ec"
+#line 2117 "informixc.ec"
   {
-#line 2118 "informixc.ec"
+#line 2117 "informixc.ec"
   sqli_trans_rollback();
-#line 2118 "informixc.ec"
+#line 2117 "informixc.ec"
   }
 
 	return self;
@@ -2591,13 +2590,13 @@ rb_database_commit(VALUE self)
 /*
  * 	EXEC SQL begin declare section;
  */
+#line 2132 "informixc.ec"
 #line 2133 "informixc.ec"
-#line 2134 "informixc.ec"
   char *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2135 "informixc.ec"
+#line 2134 "informixc.ec"
 
 
 	Data_Get_Struct(self, database_t, dbt);
@@ -2605,11 +2604,11 @@ rb_database_commit(VALUE self)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2139 "informixc.ec"
+#line 2138 "informixc.ec"
   {
-#line 2139 "informixc.ec"
+#line 2138 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 2139 "informixc.ec"
+#line 2138 "informixc.ec"
   }
 
 	if (SQLCODE < 0)
@@ -2618,11 +2617,11 @@ rb_database_commit(VALUE self)
 /*
  * 	EXEC SQL commit;
  */
-#line 2144 "informixc.ec"
+#line 2143 "informixc.ec"
   {
-#line 2144 "informixc.ec"
+#line 2143 "informixc.ec"
   sqli_trans_commit();
-#line 2144 "informixc.ec"
+#line 2143 "informixc.ec"
   }
 
 	return self;
@@ -2667,13 +2666,13 @@ rb_database_transaction(VALUE self)
 /*
  * 	EXEC SQL begin declare section;
  */
+#line 2184 "informixc.ec"
 #line 2185 "informixc.ec"
-#line 2186 "informixc.ec"
   char *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2187 "informixc.ec"
+#line 2186 "informixc.ec"
 
 
 	Data_Get_Struct(self, database_t, dbt);
@@ -2681,11 +2680,11 @@ rb_database_transaction(VALUE self)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2191 "informixc.ec"
+#line 2190 "informixc.ec"
   {
-#line 2191 "informixc.ec"
+#line 2190 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 2191 "informixc.ec"
+#line 2190 "informixc.ec"
   }
 
 	if (SQLCODE < 0)
@@ -2694,20 +2693,20 @@ rb_database_transaction(VALUE self)
 /*
  * 	EXEC SQL commit;
  */
-#line 2196 "informixc.ec"
+#line 2195 "informixc.ec"
   {
-#line 2196 "informixc.ec"
+#line 2195 "informixc.ec"
   sqli_trans_commit();
-#line 2196 "informixc.ec"
+#line 2195 "informixc.ec"
   }
 /*
  * 	EXEC SQL begin work;
  */
-#line 2197 "informixc.ec"
+#line 2196 "informixc.ec"
   {
-#line 2197 "informixc.ec"
+#line 2196 "informixc.ec"
   sqli_trans_begin2((mint)1);
-#line 2197 "informixc.ec"
+#line 2196 "informixc.ec"
   }
 	ret = rb_rescue(rb_yield, self, database_transfail, self);
 
@@ -2717,11 +2716,11 @@ rb_database_transaction(VALUE self)
 /*
  * 	EXEC SQL commit;
  */
-#line 2203 "informixc.ec"
+#line 2202 "informixc.ec"
   {
-#line 2203 "informixc.ec"
+#line 2202 "informixc.ec"
   sqli_trans_commit();
-#line 2203 "informixc.ec"
+#line 2202 "informixc.ec"
   }
 
 	return self;
@@ -2737,8 +2736,8 @@ static VALUE
 rb_database_columns(VALUE self, VALUE tablename)
 {
 	VALUE v, column, result;
-	char *stype;
-	static char *stypes[] = {
+	const char *stype;
+	static const char *stypes[] = {
 		"CHAR", "SMALLINT", "INTEGER", "FLOAT", "SMALLFLOAT", "DECIMAL",
 		"SERIAL", "DATE", "MONEY", "NULL", "DATETIME", "BYTE",
 		"TEXT", "VARCHAR", "INTERVAL", "NCHAR", "NVARCHAR", "INT8",
@@ -2746,7 +2745,7 @@ rb_database_columns(VALUE self, VALUE tablename)
 		"VARIABLE-LENGTH OPAQUE TYPE"
 	};
 
-	static char *qualifiers[] = {
+	static const char *qualifiers[] = {
 		"YEAR", "MONTH", "DAY", "HOUR", "MINUTE", "SECOND"
 	};
 
@@ -2754,8 +2753,8 @@ rb_database_columns(VALUE self, VALUE tablename)
 /*
  * 	EXEC SQL begin declare section;
  */
+#line 2231 "informixc.ec"
 #line 2232 "informixc.ec"
-#line 2233 "informixc.ec"
   char *did, *cid;
   char *tabname;
 int tabid, xid;
@@ -2766,7 +2765,7 @@ short coltype, collength;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2240 "informixc.ec"
+#line 2239 "informixc.ec"
 
 
 	Data_Get_Struct(self, database_t, dbt);
@@ -2774,11 +2773,11 @@ short coltype, collength;
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2244 "informixc.ec"
+#line 2243 "informixc.ec"
   {
-#line 2244 "informixc.ec"
+#line 2243 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 2244 "informixc.ec"
+#line 2243 "informixc.ec"
   }
 
 	if (SQLCODE < 0)
@@ -2789,35 +2788,35 @@ short coltype, collength;
 /*
  * 	EXEC SQL select tabid into :tabid from systables where tabname = :tabname;
  */
-#line 2251 "informixc.ec"
+#line 2250 "informixc.ec"
   {
-#line 2251 "informixc.ec"
+#line 2250 "informixc.ec"
   static const char *sqlcmdtxt[] =
-#line 2251 "informixc.ec"
+#line 2250 "informixc.ec"
     {
-#line 2251 "informixc.ec"
+#line 2250 "informixc.ec"
     "select tabid from systables where tabname = ?",
     0
     };
-#line 2251 "informixc.ec"
+#line 2250 "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 2251 "informixc.ec"
+#line 2250 "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 2251 "informixc.ec"
+#line 2250 "informixc.ec"
     };
-#line 2251 "informixc.ec"
+#line 2250 "informixc.ec"
   _sqibind[0].sqldata = tabname;
-#line 2251 "informixc.ec"
+#line 2250 "informixc.ec"
   _sqobind[0].sqldata = (char *) &tabid;
-#line 2251 "informixc.ec"
+#line 2250 "informixc.ec"
   sqli_slct(ESQLINTVERSION, &_SQ0,sqlcmdtxt,1,_sqibind,1,_sqobind,0,(ifx_literal_t *)0,(ifx_namelist_t *)0,0);
-#line 2251 "informixc.ec"
+#line 2250 "informixc.ec"
   }
 
 	if (SQLCODE == SQLNOTFOUND)
@@ -2828,19 +2827,19 @@ static ifx_cursor_t _SQ0 = {0};
 /*
  * 	EXEC SQL open :cid using :tabid;
  */
-#line 2258 "informixc.ec"
+#line 2257 "informixc.ec"
   {
-#line 2258 "informixc.ec"
+#line 2257 "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 2258 "informixc.ec"
+#line 2257 "informixc.ec"
     };
   static ifx_sqlda_t _SD0 = { 1, _sqibind, {0}, 1, 0 };
-#line 2258 "informixc.ec"
+#line 2257 "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 2258 "informixc.ec"
+#line 2257 "informixc.ec"
   }
 
 	if (SQLCODE < 0)
@@ -2851,9 +2850,9 @@ static ifx_cursor_t _SQ0 = {0};
  * 		EXEC SQL fetch :cid into :colname, :coltype, :collength, :xid,
  * 			:deftype, :defvalue;
  */
-#line 2264 "informixc.ec"
+#line 2263 "informixc.ec"
   {
-#line 2265 "informixc.ec"
+#line 2264 "informixc.ec"
   static ifx_sqlvar_t _sqobind[] = 
     {
       { 114, 129, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
@@ -2862,24 +2861,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 2265 "informixc.ec"
+#line 2264 "informixc.ec"
     };
   static ifx_sqlda_t _SD0 = { 6, _sqobind, {0}, 6, 0 };
   static _FetchSpec _FS1 = { 0, 1, 0 };
-#line 2265 "informixc.ec"
+#line 2264 "informixc.ec"
   _sqobind[0].sqldata = colname;
-#line 2265 "informixc.ec"
+#line 2264 "informixc.ec"
   _sqobind[1].sqldata = (char *) &coltype;
-#line 2265 "informixc.ec"
+#line 2264 "informixc.ec"
   _sqobind[2].sqldata = (char *) &collength;
-#line 2265 "informixc.ec"
+#line 2264 "informixc.ec"
   _sqobind[3].sqldata = (char *) &xid;
-#line 2265 "informixc.ec"
+#line 2264 "informixc.ec"
   _sqobind[4].sqldata = deftype;
-#line 2265 "informixc.ec"
+#line 2264 "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 2265 "informixc.ec"
+#line 2264 "informixc.ec"
   }
 		if (SQLCODE < 0)
 			raise_ifx_extended();
@@ -2977,11 +2976,11 @@ static ifx_cursor_t _SQ0 = {0};
 /*
  * 	EXEC SQL close :cid;
  */
-#line 2359 "informixc.ec"
+#line 2358 "informixc.ec"
   {
-#line 2359 "informixc.ec"
+#line 2358 "informixc.ec"
   sqli_curs_close(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 256));
-#line 2359 "informixc.ec"
+#line 2358 "informixc.ec"
   }
 
 	return result;
@@ -3007,13 +3006,13 @@ st_free(cursor_t *c)
 /*
  * 	EXEC SQL begin declare section;
  */
+#line 2380 "informixc.ec"
 #line 2381 "informixc.ec"
-#line 2382 "informixc.ec"
   char *sid, *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2383 "informixc.ec"
+#line 2382 "informixc.ec"
 
 
 	free_input_slots(c);
@@ -3023,11 +3022,11 @@ st_free(cursor_t *c)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2389 "informixc.ec"
+#line 2388 "informixc.ec"
   {
-#line 2389 "informixc.ec"
+#line 2388 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 2389 "informixc.ec"
+#line 2388 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		return;
@@ -3036,11 +3035,11 @@ st_free(cursor_t *c)
 /*
  * 	EXEC SQL free :sid;
  */
-#line 2394 "informixc.ec"
+#line 2393 "informixc.ec"
   {
-#line 2394 "informixc.ec"
+#line 2393 "informixc.ec"
   sqli_curs_free(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, sid, 258));
-#line 2394 "informixc.ec"
+#line 2393 "informixc.ec"
   }
 }
 
@@ -3071,13 +3070,13 @@ rb_statement_initialize(VALUE self, VALUE db, VALUE query)
 /*
  * 	EXEC SQL begin declare section;
  */
+#line 2420 "informixc.ec"
 #line 2421 "informixc.ec"
-#line 2422 "informixc.ec"
   char *c_query, *sid, *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2423 "informixc.ec"
+#line 2422 "informixc.ec"
 
 
 	Data_Get_Struct(db, database_t, dbt);
@@ -3085,11 +3084,11 @@ rb_statement_initialize(VALUE self, VALUE db, VALUE query)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2427 "informixc.ec"
+#line 2426 "informixc.ec"
   {
-#line 2427 "informixc.ec"
+#line 2426 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 2427 "informixc.ec"
+#line 2426 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -3105,11 +3104,11 @@ rb_statement_initialize(VALUE self, VALUE db, VALUE query)
 /*
  * 	EXEC SQL prepare :sid from :c_query;
  */
-#line 2439 "informixc.ec"
+#line 2438 "informixc.ec"
   {
-#line 2439 "informixc.ec"
+#line 2438 "informixc.ec"
   sqli_prep(ESQLINTVERSION, sid, c_query,(ifx_literal_t *)0, (ifx_namelist_t *)0, -1, 0, 0 ); 
-#line 2439 "informixc.ec"
+#line 2438 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -3118,11 +3117,11 @@ rb_statement_initialize(VALUE self, VALUE db, VALUE query)
 /*
  * 	EXEC SQL describe :sid into output;
  */
-#line 2444 "informixc.ec"
+#line 2443 "informixc.ec"
   {
-#line 2444 "informixc.ec"
+#line 2443 "informixc.ec"
   sqli_describe_stmt(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, sid, 257), &output, 0);
-#line 2444 "informixc.ec"
+#line 2443 "informixc.ec"
   }
 	c->daOutput = output;
 
@@ -3169,13 +3168,13 @@ rb_statement_call(int argc, VALUE *argv, VALUE self)
 /*
  * 	EXEC SQL begin declare section;
  */
+#line 2486 "informixc.ec"
 #line 2487 "informixc.ec"
-#line 2488 "informixc.ec"
   char *sid, *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2489 "informixc.ec"
+#line 2488 "informixc.ec"
 
 
 	Data_Get_Struct(self, cursor_t, c);
@@ -3184,11 +3183,11 @@ rb_statement_call(int argc, VALUE *argv, VALUE self)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2494 "informixc.ec"
+#line 2493 "informixc.ec"
   {
-#line 2494 "informixc.ec"
+#line 2493 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 2494 "informixc.ec"
+#line 2493 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -3208,11 +3207,11 @@ rb_statement_call(int argc, VALUE *argv, VALUE self)
  * 			EXEC SQL execute :sid into descriptor output
  * 				using descriptor input;
  */
-#line 2509 "informixc.ec"
+#line 2508 "informixc.ec"
   {
-#line 2510 "informixc.ec"
+#line 2509 "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 2510 "informixc.ec"
+#line 2509 "informixc.ec"
   }
 			clean_input_slots(c);
 		}
@@ -3220,11 +3219,11 @@ rb_statement_call(int argc, VALUE *argv, VALUE self)
 /*
  * 			EXEC SQL execute :sid into descriptor output;
  */
-#line 2514 "informixc.ec"
+#line 2513 "informixc.ec"
   {
-#line 2514 "informixc.ec"
+#line 2513 "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 2514 "informixc.ec"
+#line 2513 "informixc.ec"
   }
 
 		if (SQLCODE < 0)
@@ -3240,11 +3239,11 @@ rb_statement_call(int argc, VALUE *argv, VALUE self)
 /*
  * 			EXEC SQL execute :sid using descriptor input;
  */
-#line 2526 "informixc.ec"
+#line 2525 "informixc.ec"
   {
-#line 2526 "informixc.ec"
+#line 2525 "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 2526 "informixc.ec"
+#line 2525 "informixc.ec"
   }
 			clean_input_slots(c);
 		}
@@ -3252,11 +3251,11 @@ rb_statement_call(int argc, VALUE *argv, VALUE self)
 /*
  * 			EXEC SQL execute :sid;
  */
-#line 2530 "informixc.ec"
+#line 2529 "informixc.ec"
   {
-#line 2530 "informixc.ec"
+#line 2529 "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 2530 "informixc.ec"
+#line 2529 "informixc.ec"
   }
 	}
 	if (SQLCODE < 0)
@@ -3318,13 +3317,13 @@ fetch(VALUE self, VALUE type, VALUE bang)
 /*
  * 	EXEC SQL begin declare section;
  */
+#line 2587 "informixc.ec"
 #line 2588 "informixc.ec"
-#line 2589 "informixc.ec"
   char *cid, *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2590 "informixc.ec"
+#line 2589 "informixc.ec"
 
 	short c_bang;
 	cursor_t *c;
@@ -3339,11 +3338,11 @@ fetch(VALUE self, VALUE type, VALUE bang)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2601 "informixc.ec"
+#line 2600 "informixc.ec"
   {
-#line 2601 "informixc.ec"
+#line 2600 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 2601 "informixc.ec"
+#line 2600 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -3354,12 +3353,12 @@ fetch(VALUE self, VALUE type, VALUE bang)
 /*
  * 	EXEC SQL fetch :cid using descriptor output;
  */
-#line 2608 "informixc.ec"
+#line 2607 "informixc.ec"
   {
-#line 2608 "informixc.ec"
+#line 2607 "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 2608 "informixc.ec"
+#line 2607 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -3381,13 +3380,13 @@ fetch_many(VALUE self, VALUE n, VALUE type)
 /*
  * 	EXEC SQL begin declare section;
  */
+#line 2625 "informixc.ec"
 #line 2626 "informixc.ec"
-#line 2627 "informixc.ec"
   char *cid, *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2628 "informixc.ec"
+#line 2627 "informixc.ec"
 
 	cursor_t *c;
 	struct sqlda *output;
@@ -3403,11 +3402,11 @@ fetch_many(VALUE self, VALUE n, VALUE type)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2640 "informixc.ec"
+#line 2639 "informixc.ec"
   {
-#line 2640 "informixc.ec"
+#line 2639 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 2640 "informixc.ec"
+#line 2639 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -3427,12 +3426,12 @@ fetch_many(VALUE self, VALUE n, VALUE type)
 /*
  * 		EXEC SQL fetch :cid using descriptor output;
  */
-#line 2656 "informixc.ec"
+#line 2655 "informixc.ec"
   {
-#line 2656 "informixc.ec"
+#line 2655 "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 2656 "informixc.ec"
+#line 2655 "informixc.ec"
   }
 		if (SQLCODE < 0)
 			raise_ifx_extended();
@@ -3461,13 +3460,13 @@ each(VALUE self, VALUE type, VALUE bang)
 /*
  * 	EXEC SQL begin declare section;
  */
+#line 2680 "informixc.ec"
 #line 2681 "informixc.ec"
-#line 2682 "informixc.ec"
   char *cid, *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2683 "informixc.ec"
+#line 2682 "informixc.ec"
 
 	short c_bang;
 	struct sqlda *output;
@@ -3481,11 +3480,11 @@ each(VALUE self, VALUE type, VALUE bang)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2693 "informixc.ec"
+#line 2692 "informixc.ec"
   {
-#line 2693 "informixc.ec"
+#line 2692 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 2693 "informixc.ec"
+#line 2692 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -3497,12 +3496,12 @@ each(VALUE self, VALUE type, VALUE bang)
 /*
  * 		EXEC SQL fetch :cid using descriptor output;
  */
-#line 2701 "informixc.ec"
+#line 2700 "informixc.ec"
   {
-#line 2701 "informixc.ec"
+#line 2700 "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 2701 "informixc.ec"
+#line 2700 "informixc.ec"
   }
 		if (SQLCODE < 0)
 			raise_ifx_extended();
@@ -3525,7 +3524,7 @@ each_by(VALUE self, VALUE n, VALUE type)
 
 	for(;;) {
 		records = fetch_many(self, n, type);
-		if (RARRAY(records)->len == 0)
+		if (RARRAY_LEN(records) == 0)
 			return self;
 		rb_yield(records);
 	}
@@ -3564,13 +3563,13 @@ rb_inscur_put(int argc, VALUE *argv, VALUE self)
 /*
  * 	EXEC SQL begin declare section;
  */
+#line 2758 "informixc.ec"
 #line 2759 "informixc.ec"
-#line 2760 "informixc.ec"
   char *cid, *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2761 "informixc.ec"
+#line 2760 "informixc.ec"
 
 
 	Data_Get_Struct(self, cursor_t, c);
@@ -3581,11 +3580,11 @@ rb_inscur_put(int argc, VALUE *argv, VALUE self)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2768 "informixc.ec"
+#line 2767 "informixc.ec"
   {
-#line 2768 "informixc.ec"
+#line 2767 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 2768 "informixc.ec"
+#line 2767 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -3601,11 +3600,11 @@ rb_inscur_put(int argc, VALUE *argv, VALUE self)
 /*
  * 	EXEC SQL put :cid using descriptor input;
  */
-#line 2780 "informixc.ec"
+#line 2779 "informixc.ec"
   {
-#line 2780 "informixc.ec"
+#line 2779 "informixc.ec"
   sqli_curs_put(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 256), input, (char *)0);
-#line 2780 "informixc.ec"
+#line 2779 "informixc.ec"
   }
 	clean_input_slots(c);
 	if (SQLCODE < 0)
@@ -3630,13 +3629,13 @@ rb_inscur_flush(VALUE self)
 /*
  * 	EXEC SQL begin declare section;
  */
+#line 2800 "informixc.ec"
 #line 2801 "informixc.ec"
-#line 2802 "informixc.ec"
   char *cid, *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2803 "informixc.ec"
+#line 2802 "informixc.ec"
 
 
 	Data_Get_Struct(self, cursor_t, c);
@@ -3647,11 +3646,11 @@ rb_inscur_flush(VALUE self)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2810 "informixc.ec"
+#line 2809 "informixc.ec"
   {
-#line 2810 "informixc.ec"
+#line 2809 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 2810 "informixc.ec"
+#line 2809 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -3660,11 +3659,11 @@ rb_inscur_flush(VALUE self)
 /*
  * 	EXEC SQL flush :cid;
  */
-#line 2815 "informixc.ec"
+#line 2814 "informixc.ec"
   {
-#line 2815 "informixc.ec"
+#line 2814 "informixc.ec"
   sqli_curs_flush(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 256));
-#line 2815 "informixc.ec"
+#line 2814 "informixc.ec"
   }
 	return self;
 }
@@ -3685,14 +3684,14 @@ rb_scrollcur_entry(VALUE self, VALUE index, VALUE type, VALUE bang)
 /*
  * 	EXEC SQL begin declare section;
  */
+#line 2831 "informixc.ec"
 #line 2832 "informixc.ec"
-#line 2833 "informixc.ec"
   char *cid, *did;
 long pos;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2835 "informixc.ec"
+#line 2834 "informixc.ec"
 
 
 	Data_Get_Struct(self, cursor_t, c);
@@ -3703,11 +3702,11 @@ long pos;
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2842 "informixc.ec"
+#line 2841 "informixc.ec"
   {
-#line 2842 "informixc.ec"
+#line 2841 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 2842 "informixc.ec"
+#line 2841 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		return Qnil;
@@ -3719,60 +3718,60 @@ long pos;
 /*
  * 		EXEC SQL fetch current :cid using descriptor output;
  */
-#line 2850 "informixc.ec"
+#line 2849 "informixc.ec"
   {
-#line 2850 "informixc.ec"
+#line 2849 "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 2850 "informixc.ec"
+#line 2849 "informixc.ec"
   }
 	else if ((pos = NUM2LONG(index) + 1) > 0)
 /*
  * 		EXEC SQL fetch absolute :pos :cid using descriptor output;
  */
-#line 2852 "informixc.ec"
+#line 2851 "informixc.ec"
   {
-#line 2852 "informixc.ec"
+#line 2851 "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 2852 "informixc.ec"
+#line 2851 "informixc.ec"
     };
   static ifx_sqlda_t _SD0 = { 1, _sqibind, {0}, 1, 0 };
   static _FetchSpec _FS1 = { 0, 6, 0 };
-#line 2852 "informixc.ec"
+#line 2851 "informixc.ec"
   _sqibind[0].sqldata = (char *) &pos;
   sqli_curs_fetch(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 256), &_SD0, output, (char *)0, &_FS1);
-#line 2852 "informixc.ec"
+#line 2851 "informixc.ec"
   }
 	else {
 /*
  * 		EXEC SQL fetch last :cid;
  */
-#line 2854 "informixc.ec"
+#line 2853 "informixc.ec"
   {
-#line 2854 "informixc.ec"
+#line 2853 "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 2854 "informixc.ec"
+#line 2853 "informixc.ec"
   }
 /*
  * 		EXEC SQL fetch relative :pos :cid using descriptor output;
  */
-#line 2855 "informixc.ec"
+#line 2854 "informixc.ec"
   {
-#line 2855 "informixc.ec"
+#line 2854 "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 2855 "informixc.ec"
+#line 2854 "informixc.ec"
     };
   static ifx_sqlda_t _SD0 = { 1, _sqibind, {0}, 1, 0 };
   static _FetchSpec _FS1 = { 0, 7, 0 };
-#line 2855 "informixc.ec"
+#line 2854 "informixc.ec"
   _sqibind[0].sqldata = (char *) &pos;
   sqli_curs_fetch(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 256), &_SD0, output, (char *)0, &_FS1);
-#line 2855 "informixc.ec"
+#line 2854 "informixc.ec"
   }
 	}
 
@@ -3800,14 +3799,14 @@ rb_scrollcur_rel(VALUE self, VALUE offset, VALUE type, VALUE bang)
 /*
  * 	EXEC SQL begin declare section;
  */
+#line 2878 "informixc.ec"
 #line 2879 "informixc.ec"
-#line 2880 "informixc.ec"
   char *cid, *did;
 long pos;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2882 "informixc.ec"
+#line 2881 "informixc.ec"
 
 
 	Data_Get_Struct(self, cursor_t, c);
@@ -3818,11 +3817,11 @@ long pos;
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2889 "informixc.ec"
+#line 2888 "informixc.ec"
   {
-#line 2889 "informixc.ec"
+#line 2888 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 2889 "informixc.ec"
+#line 2888 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		return Qnil;
@@ -3834,20 +3833,20 @@ long pos;
 /*
  * 	EXEC SQL fetch relative :pos :cid using descriptor output;
  */
-#line 2897 "informixc.ec"
+#line 2896 "informixc.ec"
   {
-#line 2897 "informixc.ec"
+#line 2896 "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 2897 "informixc.ec"
+#line 2896 "informixc.ec"
     };
   static ifx_sqlda_t _SD0 = { 1, _sqibind, {0}, 1, 0 };
   static _FetchSpec _FS1 = { 0, 7, 0 };
-#line 2897 "informixc.ec"
+#line 2896 "informixc.ec"
   _sqibind[0].sqldata = (char *) &pos;
   sqli_curs_fetch(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 256), &_SD0, output, (char *)0, &_FS1);
-#line 2897 "informixc.ec"
+#line 2896 "informixc.ec"
   }
 
 	if (SQLCODE == SQLNOTFOUND)
@@ -3869,13 +3868,13 @@ cursorbase_close_or_free(cursor_t *c, short op)
 /*
  * 	EXEC SQL begin declare section;
  */
+#line 2914 "informixc.ec"
 #line 2915 "informixc.ec"
-#line 2916 "informixc.ec"
   char *cid, *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2917 "informixc.ec"
+#line 2916 "informixc.ec"
 
 
 	if (op == 1 && !c->is_open)
@@ -3891,11 +3890,11 @@ cursorbase_close_or_free(cursor_t *c, short op)
 /*
  * 		EXEC SQL set connection :did;
  */
-#line 2929 "informixc.ec"
+#line 2928 "informixc.ec"
   {
-#line 2929 "informixc.ec"
+#line 2928 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 2929 "informixc.ec"
+#line 2928 "informixc.ec"
   }
 		if (SQLCODE < 0)
 			return;
@@ -3903,22 +3902,22 @@ cursorbase_close_or_free(cursor_t *c, short op)
 /*
  * 		EXEC SQL close :cid;
  */
-#line 2933 "informixc.ec"
+#line 2932 "informixc.ec"
   {
-#line 2933 "informixc.ec"
+#line 2932 "informixc.ec"
   sqli_curs_close(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 256));
-#line 2933 "informixc.ec"
+#line 2932 "informixc.ec"
   }
 		if (op == 1)
 			break;
 /*
  * 		EXEC SQL free :cid;
  */
-#line 2936 "informixc.ec"
+#line 2935 "informixc.ec"
   {
-#line 2936 "informixc.ec"
+#line 2935 "informixc.ec"
   sqli_curs_free(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 258));
-#line 2936 "informixc.ec"
+#line 2935 "informixc.ec"
   }
 		st_free(c);
 		break;
@@ -3986,13 +3985,13 @@ rb_cursorbase_open(int argc, VALUE *argv, VALUE self)
 /*
  * 	EXEC SQL begin declare section;
  */
+#line 2999 "informixc.ec"
 #line 3000 "informixc.ec"
-#line 3001 "informixc.ec"
   char *cid, *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 3002 "informixc.ec"
+#line 3001 "informixc.ec"
 
 
 	Data_Get_Struct(self, cursor_t, c);
@@ -4004,11 +4003,11 @@ rb_cursorbase_open(int argc, VALUE *argv, VALUE self)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 3010 "informixc.ec"
+#line 3009 "informixc.ec"
   {
-#line 3010 "informixc.ec"
+#line 3009 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 3010 "informixc.ec"
+#line 3009 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -4027,11 +4026,11 @@ rb_cursorbase_open(int argc, VALUE *argv, VALUE self)
  * 			EXEC SQL open :cid using descriptor input
  * 				with reoptimization;
  */
-#line 3024 "informixc.ec"
+#line 3023 "informixc.ec"
   {
-#line 3025 "informixc.ec"
+#line 3024 "informixc.ec"
   sqli_curs_open(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 256), input, (char *)0, (struct value *)0, 1, 1);
-#line 3025 "informixc.ec"
+#line 3024 "informixc.ec"
   }
 			clean_input_slots(c);
 		}
@@ -4039,22 +4038,22 @@ rb_cursorbase_open(int argc, VALUE *argv, VALUE self)
 /*
  * 			EXEC SQL open :cid with reoptimization;
  */
-#line 3029 "informixc.ec"
+#line 3028 "informixc.ec"
   {
-#line 3029 "informixc.ec"
+#line 3028 "informixc.ec"
   sqli_curs_open(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 256), (ifx_sqlda_t *)0, (char *)0, (struct value *)0, 0, 1);
-#line 3029 "informixc.ec"
+#line 3028 "informixc.ec"
   }
 	}
 	else
 /*
  * 		EXEC SQL open :cid;
  */
-#line 3032 "informixc.ec"
+#line 3031 "informixc.ec"
   {
-#line 3032 "informixc.ec"
+#line 3031 "informixc.ec"
   sqli_curs_open(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 256), (ifx_sqlda_t *)0, (char *)0, (struct value *)0, 0, 0);
-#line 3032 "informixc.ec"
+#line 3031 "informixc.ec"
   }
 
 	if (SQLCODE < 0)
@@ -4116,14 +4115,14 @@ rb_cursor_s_new0(int argc, VALUE *argv, VALUE self)
 /*
  * 	EXEC SQL begin declare section;
  */
+#line 3089 "informixc.ec"
 #line 3090 "informixc.ec"
-#line 3091 "informixc.ec"
   char *c_query;
   char *cid, *sid, *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 3093 "informixc.ec"
+#line 3092 "informixc.ec"
 
 
 	memset(&c, 0, sizeof(c));
@@ -4133,11 +4132,11 @@ rb_cursor_s_new0(int argc, VALUE *argv, VALUE self)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 3099 "informixc.ec"
+#line 3098 "informixc.ec"
   {
-#line 3099 "informixc.ec"
+#line 3098 "informixc.ec"
   sqli_connect_set(0, did, 0);
-#line 3099 "informixc.ec"
+#line 3098 "informixc.ec"
   }
 
 	if (SQLCODE < 0)
@@ -4161,11 +4160,11 @@ rb_cursor_s_new0(int argc, VALUE *argv, VALUE self)
 /*
  * 	EXEC SQL prepare :sid from :c_query;
  */
-#line 3119 "informixc.ec"
+#line 3118 "informixc.ec"
   {
-#line 3119 "informixc.ec"
+#line 3118 "informixc.ec"
   sqli_prep(ESQLINTVERSION, sid, c_query,(ifx_literal_t *)0, (ifx_namelist_t *)0, -1, 0, 0 ); 
-#line 3119 "informixc.ec"
+#line 3118 "informixc.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -4174,41 +4173,41 @@ rb_cursor_s_new0(int argc, VALUE *argv, VALUE self)
 /*
  * 		EXEC SQL declare :cid scroll cursor with hold for :sid;
  */
-#line 3124 "informixc.ec"
+#line 3123 "informixc.ec"
   {
-#line 3124 "informixc.ec"
+#line 3123 "informixc.ec"
   sqli_curs_decl_dynm(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 0), cid, sqli_curs_locate(ESQLINTVERSION, sid, 1), 4128, 0);
-#line 3124 "informixc.ec"
+#line 3123 "informixc.ec"
   }
 	else if (RTEST(hold))
 /*
  * 		EXEC SQL declare :cid cursor with hold for :sid;
  */
-#line 3126 "informixc.ec"
+#line 3125 "informixc.ec"
   {
-#line 3126 "informixc.ec"
+#line 3125 "informixc.ec"
   sqli_curs_decl_dynm(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 0), cid, sqli_curs_locate(ESQLINTVERSION, sid, 1), 4096, 0);
-#line 3126 "informixc.ec"
+#line 3125 "informixc.ec"
   }
 	else if (RTEST(scroll))
 /*
  * 		EXEC SQL declare :cid scroll cursor for :sid;
  */
-#line 3128 "informixc.ec"
+#line 3127 "informixc.ec"
   {
-#line 3128 "informixc.ec"
+#line 3127 "informixc.ec"
   sqli_curs_decl_dynm(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 0), cid, sqli_curs_locate(ESQLINTVERSION, sid, 1), 32, 0);
-#line 3128 "informixc.ec"
+#line 3127 "informixc.ec"
   }
 	else
 /*
  * 		EXEC SQL declare :cid cursor for :sid;
  */
-#line 3130 "informixc.ec"
+#line 3129 "informixc.ec"
   {
-#line 3130 "informixc.ec"
+#line 3129 "informixc.ec"
   sqli_curs_decl_dynm(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 0), cid, sqli_curs_locate(ESQLINTVERSION, sid, 1), 0, 0);
-#line 3130 "informixc.ec"
+#line 3129 "informixc.ec"
   }
 
 	if (SQLCODE < 0)
@@ -4218,11 +4217,11 @@ rb_cursor_s_new0(int argc, VALUE *argv, VALUE self)
 /*
  * 	EXEC SQL describe :sid into output;
  */
-#line 3136 "informixc.ec"
+#line 3135 "informixc.ec"
   {
-#line 3136 "informixc.ec"
+#line 3135 "informixc.ec"
   sqli_describe_stmt(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, sid, 257), &output, 0);
-#line 3136 "informixc.ec"
+#line 3135 "informixc.ec"
   }
 	c.daOutput = output;
 
@@ -4465,8 +4464,6 @@ void Init_informixc(void)
 	rb_require("bigdecimal");
 	rb_cBigDecimal = rb_const_get(rb_cObject, rb_intern("BigDecimal"));
 
-	rb_cRational = rb_const_get(rb_cObject, rb_intern("Rational"));
-
 	rb_require("informix/exceptions");
 	rb_eError = rb_const_get(rb_mInformix, rb_intern("Error"));
 	rb_eWarning = rb_const_get(rb_mInformix, rb_intern("Warning"));
@@ -4513,4 +4510,4 @@ void Init_informixc(void)
 	sym_params = ID2SYM(rb_intern("params"));
 }
 
-#line 3424 "informixc.ec"
+#line 3421 "informixc.ec"