ruby-informix 0.6.0 → 0.6.1

data/Changelog

@@ -1,3 +1,17 @@
+0.6.1  13/10/2007
+------------------
+Bugs fixed:
+	* Database#columns was returning an empty array from within the
+	  Informix ActiveRecord adapter
+	  (ActiveRecord::ConnectionAdapters::InformixAdapter#columns) if
+	  called for different tables. This bug was raising the following
+	  error in Ruby on Rails:
+
+		undefined method columname=
+
+	  Noticed by Andr�s Rafael <aandresrafael at gmail dot com>
+
+
 0.6.0  08/28/2007
 ------------------
 New features:

data/README

@@ -18,9 +18,9 @@ Ruby/Informix has been tested succesfully on the following platforms:
 
 Operating System    Architecture       Informix	      CSDK
 -------------------------------------------------------------
-Solaris 10             SPARC          11.10.UC1      3.00UC2
-Solaris 10             SPARC           9.40FC6       3.00UC2
-Solaris 9              SPARC           9.40FC6       2.90UC3
+Solaris 10             SPARC64        11.10.UC1      3.00UC2
+Solaris 10             SPARC64         9.40FC6       3.00UC2
+Solaris 9              SPARC64         9.40FC6       2.90UC3
 Fedora Core 5            x86          10.00.UC3R1    2.90UC4
 Fedora Core 4            x86          10.00.UC3R1    2.90UC4
 SuSE Linux 9.3           x86           9.30TC1       2.90UC4
@@ -65,9 +65,8 @@ Objects (CLOB/BLOB).
 
 * use #drop for prepared statements and cursors or use them with blocks,
   to release Informix resources.
-* you can optimize cursor execution by changing the fetch and insert buffers,
-  setting the environment variable FET_BUF_SIZE to up to 32767 for Informix 9.x,
-  or BIG_FET_BUF_SIZE for Informix 10.x
+* you can optimize cursor execution by changing the size of fetch and insert
+  buffers, setting the environment variable FET_BUF_SIZE to up to 32767.
 
 
 5. Caveats
@@ -77,7 +76,8 @@ Objects (CLOB/BLOB).
 6. Support
 
 Feel free to send me bug reports, feature requests, comments, patches or
-questions to my mailbox or Ruby/Informix's forums at Rubyforge.
+questions to my mailbox or Ruby/Informix's forums and mailing list at
+Rubyforge (http://rubyforge.org/projects/ruby-informix/)
 
 
 -----------------------------------------

data/informix.c

@@ -1,7 +1,7 @@
 #include <sqlhdr.h>
 #include <sqliapi.h>
 #line 1 "informix.ec"
-/* $Id: informix.ec,v 1.10 2007/08/23 02:32:56 santana Exp $ */
+/* $Id: informix.ec,v 1.12 2007/10/14 00:18:50 santana Exp $ */
 /*
 * Copyright (c) 2006-2007, Gerardo Santana Gomez Garrido <gerardo.santana@gmail.com>
 * All rights reserved.
@@ -31,7 +31,7 @@
 * POSSIBILITY OF SUCH DAMAGE.
 */
 
-static const char rcsid[] = "$Id: informix.ec,v 1.10 2007/08/23 02:32:56 santana Exp $";
+static const char rcsid[] = "$Id: informix.ec,v 1.12 2007/10/14 00:18:50 santana Exp $";
 
 #include "ruby.h"
 #include "ifx_except.h"
@@ -2018,7 +2018,7 @@ rb_informix_connect(int argc, VALUE *argv, VALUE self)
  */
 static VALUE rb_informix_version(void)
 {
-	static const char * const ver = "0.6.0";
+	static const char * const ver = "0.6.1";
 	static VALUE driver_version;
 
 	if (driver_version == 0)
@@ -2614,39 +2614,46 @@ static ifx_cursor_t _SQ0 = {0};
 	result = rb_ary_new();
 
 	cid = did + IDSIZE;
+
 	if (!*cid) {
-		snprintf(cid, IDSIZE, "COLS%lX", self);
 /*
- * 		EXEC SQL declare :cid cursor for
- * 			select colname, coltype, collength, extended_id,
+ * 		EXEC SQL begin declare section;
+ */
+#line 2149 "informix.ec"
+#line 2150 "informix.ec"
+  char sid[IDSIZE];
+/*
+ * 		EXEC SQL end   declare section;
+ */
+#line 2151 "informix.ec"
+
+
+		snprintf(sid, IDSIZE, "COLS%lX", self);
+		snprintf(cid, IDSIZE, "COLC%lX", self);
+
+/*
+ * 		EXEC SQL prepare :sid from
+ * 			'select colname, coltype, collength, extended_id,
  * 				type, default, c.colno
  * 			from syscolumns c, outer sysdefaults d
- * 			where c.tabid = :tabid and c.tabid = d.tabid
+ * 			where c.tabid = ? and c.tabid = d.tabid
  * 				and c.colno = d.colno
- * 			order by c.colno;
+ * 			order by c.colno';
  */
-#line 2149 "informix.ec"
+#line 2156 "informix.ec"
   {
-#line 2155 "informix.ec"
-  static const char *sqlcmdtxt[] =
-#line 2155 "informix.ec"
-    {
-#line 2155 "informix.ec"
-    "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",
-    0
-    };
-#line 2155 "informix.ec"
-  static ifx_sqlvar_t _sqibind[] = 
-    {
-      { 102, sizeof(tabid), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-#line 2155 "informix.ec"
-    };
-  static ifx_sqlda_t _SD0 = { 1, _sqibind, {0}, 1, 0 };
-#line 2155 "informix.ec"
-  _sqibind[0].sqldata = (char *) &tabid;
-#line 2155 "informix.ec"
-sqli_curs_decl_stat(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 0), cid, sqlcmdtxt, &_SD0, (ifx_sqlda_t *)0, 0, (ifx_literal_t *)0, (ifx_namelist_t *)0, 2, 0, 0);
-#line 2155 "informix.ec"
+#line 2162 "informix.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 2162 "informix.ec"
+  }
+/*
+ * 		EXEC SQL declare :cid cursor for :sid;
+ */
+#line 2163 "informix.ec"
+  {
+#line 2163 "informix.ec"
+  sqli_curs_decl_dynm(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 0), cid, sqli_curs_locate(ESQLINTVERSION, sid, 1), 0, 0);
+#line 2163 "informix.ec"
   }
 		if (SQLCODE < 0) {
 			cid[0] = 0;
@@ -2655,13 +2662,21 @@ sqli_curs_decl_stat(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 0), ci
 	}
 
 /*
- * 	EXEC SQL open :cid;
+ * 	EXEC SQL open :cid using :tabid;
  */
-#line 2162 "informix.ec"
+#line 2170 "informix.ec"
   {
-#line 2162 "informix.ec"
-  sqli_curs_open(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 256), (ifx_sqlda_t *)0, (char *)0, (struct value *)0, 0, 0);
-#line 2162 "informix.ec"
+#line 2170 "informix.ec"
+  static ifx_sqlvar_t _sqibind[] = 
+    {
+      { 102, sizeof(tabid), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+#line 2170 "informix.ec"
+    };
+  static ifx_sqlda_t _SD0 = { 1, _sqibind, {0}, 1, 0 };
+#line 2170 "informix.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 2170 "informix.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -2671,9 +2686,9 @@ sqli_curs_decl_stat(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 0), ci
  * 		EXEC SQL fetch :cid into :colname, :coltype, :collength, :xid,
  * 			:deftype, :defvalue;
  */
-#line 2167 "informix.ec"
+#line 2175 "informix.ec"
   {
-#line 2168 "informix.ec"
+#line 2176 "informix.ec"
   static ifx_sqlvar_t _sqobind[] = 
     {
       { 114, 129, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
@@ -2682,24 +2697,24 @@ sqli_curs_decl_stat(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 0), ci
       { 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 2168 "informix.ec"
+#line 2176 "informix.ec"
     };
   static ifx_sqlda_t _SD0 = { 6, _sqobind, {0}, 6, 0 };
   static _FetchSpec _FS1 = { 0, 1, 0 };
-#line 2168 "informix.ec"
+#line 2176 "informix.ec"
   _sqobind[0].sqldata = colname;
-#line 2168 "informix.ec"
+#line 2176 "informix.ec"
   _sqobind[1].sqldata = (char *) &coltype;
-#line 2168 "informix.ec"
+#line 2176 "informix.ec"
   _sqobind[2].sqldata = (char *) &collength;
-#line 2168 "informix.ec"
+#line 2176 "informix.ec"
   _sqobind[3].sqldata = (char *) &xid;
-#line 2168 "informix.ec"
+#line 2176 "informix.ec"
   _sqobind[4].sqldata = deftype;
-#line 2168 "informix.ec"
+#line 2176 "informix.ec"
   _sqobind[5].sqldata = defvalue;
   sqli_curs_fetch(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 256), (ifx_sqlda_t *)0, &_SD0, (char *)0, &_FS1);
-#line 2168 "informix.ec"
+#line 2176 "informix.ec"
   }
 		if (SQLCODE < 0)
 			raise_ifx_extended();
@@ -2797,11 +2812,11 @@ sqli_curs_decl_stat(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 0), ci
 /*
  * 	EXEC SQL close :cid;
  */
-#line 2262 "informix.ec"
+#line 2270 "informix.ec"
   {
-#line 2262 "informix.ec"
+#line 2270 "informix.ec"
   sqli_curs_close(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 256));
-#line 2262 "informix.ec"
+#line 2270 "informix.ec"
   }
 
 	return result;
@@ -2827,13 +2842,13 @@ statement_free(void *p)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 2284 "informix.ec"
-#line 2285 "informix.ec"
+#line 2292 "informix.ec"
+#line 2293 "informix.ec"
   char *sid, *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2286 "informix.ec"
+#line 2294 "informix.ec"
 
 
 	free_input_slots(p);
@@ -2843,22 +2858,22 @@ statement_free(void *p)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2292 "informix.ec"
+#line 2300 "informix.ec"
   {
-#line 2292 "informix.ec"
+#line 2300 "informix.ec"
   sqli_connect_set(0, did, 0);
-#line 2292 "informix.ec"
+#line 2300 "informix.ec"
   }
 	if (SQLCODE >= 0) {
 		sid = ((cursor_t *)p)->stmt_id;
 /*
  * 		EXEC SQL free :sid;
  */
-#line 2295 "informix.ec"
+#line 2303 "informix.ec"
   {
-#line 2295 "informix.ec"
+#line 2303 "informix.ec"
   sqli_curs_free(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, sid, 258));
-#line 2295 "informix.ec"
+#line 2303 "informix.ec"
   }
 	}
 
@@ -2883,24 +2898,24 @@ statement_initialize(VALUE self, VALUE db, VALUE query)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 2316 "informix.ec"
-#line 2317 "informix.ec"
+#line 2324 "informix.ec"
+#line 2325 "informix.ec"
   char *c_query, *sid, *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2318 "informix.ec"
+#line 2326 "informix.ec"
 
 
 	Data_Get_Struct(db, char, did);
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2321 "informix.ec"
+#line 2329 "informix.ec"
   {
-#line 2321 "informix.ec"
+#line 2329 "informix.ec"
   sqli_connect_set(0, did, 0);
-#line 2321 "informix.ec"
+#line 2329 "informix.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -2916,11 +2931,11 @@ statement_initialize(VALUE self, VALUE db, VALUE query)
 /*
  * 	EXEC SQL prepare :sid from :c_query;
  */
-#line 2333 "informix.ec"
+#line 2341 "informix.ec"
   {
-#line 2333 "informix.ec"
+#line 2341 "informix.ec"
   sqli_prep(ESQLINTVERSION, sid, c_query,(ifx_literal_t *)0, (ifx_namelist_t *)0, -1, 0, 0 ); 
-#line 2333 "informix.ec"
+#line 2341 "informix.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -2929,11 +2944,11 @@ statement_initialize(VALUE self, VALUE db, VALUE query)
 /*
  * 	EXEC SQL describe :sid into output;
  */
-#line 2338 "informix.ec"
+#line 2346 "informix.ec"
   {
-#line 2338 "informix.ec"
+#line 2346 "informix.ec"
   sqli_describe_stmt(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, sid, 257), &output, 0);
-#line 2338 "informix.ec"
+#line 2346 "informix.ec"
   }
 	c->daOutput = output;
 
@@ -2997,13 +3012,13 @@ statement_call(int argc, VALUE *argv, VALUE self)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 2398 "informix.ec"
-#line 2399 "informix.ec"
+#line 2406 "informix.ec"
+#line 2407 "informix.ec"
   char *sid, *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2400 "informix.ec"
+#line 2408 "informix.ec"
 
 
 	Data_Get_Struct(self, cursor_t, c);
@@ -3012,11 +3027,11 @@ statement_call(int argc, VALUE *argv, VALUE self)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2405 "informix.ec"
+#line 2413 "informix.ec"
   {
-#line 2405 "informix.ec"
+#line 2413 "informix.ec"
   sqli_connect_set(0, did, 0);
-#line 2405 "informix.ec"
+#line 2413 "informix.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -3036,11 +3051,11 @@ statement_call(int argc, VALUE *argv, VALUE self)
  * 			EXEC SQL execute :sid into descriptor output
  * 				using descriptor input;
  */
-#line 2420 "informix.ec"
+#line 2428 "informix.ec"
   {
-#line 2421 "informix.ec"
+#line 2429 "informix.ec"
   sqli_exec(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, sid, 257), input, (char *)0, (struct value *)0, output, (char *)0, (struct value *)0, 0);
-#line 2421 "informix.ec"
+#line 2429 "informix.ec"
   }
 			clean_input_slots(c);
 		}
@@ -3048,11 +3063,11 @@ statement_call(int argc, VALUE *argv, VALUE self)
 /*
  * 			EXEC SQL execute :sid into descriptor output;
  */
-#line 2425 "informix.ec"
+#line 2433 "informix.ec"
   {
-#line 2425 "informix.ec"
+#line 2433 "informix.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 2425 "informix.ec"
+#line 2433 "informix.ec"
   }
 
 		if (SQLCODE < 0)
@@ -3068,11 +3083,11 @@ statement_call(int argc, VALUE *argv, VALUE self)
 /*
  * 			EXEC SQL execute :sid using descriptor input;
  */
-#line 2437 "informix.ec"
+#line 2445 "informix.ec"
   {
-#line 2437 "informix.ec"
+#line 2445 "informix.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 2437 "informix.ec"
+#line 2445 "informix.ec"
   }
 			clean_input_slots(c);
 		}
@@ -3080,11 +3095,11 @@ statement_call(int argc, VALUE *argv, VALUE self)
 /*
  * 			EXEC SQL execute :sid;
  */
-#line 2441 "informix.ec"
+#line 2449 "informix.ec"
   {
-#line 2441 "informix.ec"
+#line 2449 "informix.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 2441 "informix.ec"
+#line 2449 "informix.ec"
   }
 	}
 	if (SQLCODE < 0)
@@ -3106,13 +3121,13 @@ statement_drop(VALUE self)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 2459 "informix.ec"
-#line 2460 "informix.ec"
+#line 2467 "informix.ec"
+#line 2468 "informix.ec"
   char *sid, *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2461 "informix.ec"
+#line 2469 "informix.ec"
 
 
 	Data_Get_Struct(self, cursor_t, c);
@@ -3123,11 +3138,11 @@ statement_drop(VALUE self)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2468 "informix.ec"
+#line 2476 "informix.ec"
   {
-#line 2468 "informix.ec"
+#line 2476 "informix.ec"
   sqli_connect_set(0, did, 0);
-#line 2468 "informix.ec"
+#line 2476 "informix.ec"
   }
 	if (SQLCODE < 0)
 		return Qnil;
@@ -3135,11 +3150,11 @@ statement_drop(VALUE self)
 /*
  * 	EXEC SQL free :sid;
  */
-#line 2472 "informix.ec"
+#line 2480 "informix.ec"
   {
-#line 2472 "informix.ec"
+#line 2480 "informix.ec"
   sqli_curs_free(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, sid, 258));
-#line 2472 "informix.ec"
+#line 2480 "informix.ec"
   }
 
 	return Qnil;
@@ -3181,13 +3196,13 @@ fetch(VALUE self, VALUE type, int bang)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 2510 "informix.ec"
-#line 2511 "informix.ec"
+#line 2518 "informix.ec"
+#line 2519 "informix.ec"
   char *cid, *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2512 "informix.ec"
+#line 2520 "informix.ec"
 
 	cursor_t *c;
 	struct sqlda *output;
@@ -3201,11 +3216,11 @@ fetch(VALUE self, VALUE type, int bang)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2522 "informix.ec"
+#line 2530 "informix.ec"
   {
-#line 2522 "informix.ec"
+#line 2530 "informix.ec"
   sqli_connect_set(0, did, 0);
-#line 2522 "informix.ec"
+#line 2530 "informix.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -3216,12 +3231,12 @@ fetch(VALUE self, VALUE type, int bang)
 /*
  * 	EXEC SQL fetch :cid using descriptor output;
  */
-#line 2529 "informix.ec"
+#line 2537 "informix.ec"
   {
-#line 2529 "informix.ec"
+#line 2537 "informix.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 2529 "informix.ec"
+#line 2537 "informix.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -3304,13 +3319,13 @@ fetch_many(VALUE self, VALUE n, VALUE type)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 2608 "informix.ec"
-#line 2609 "informix.ec"
+#line 2616 "informix.ec"
+#line 2617 "informix.ec"
   char *cid, *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2610 "informix.ec"
+#line 2618 "informix.ec"
 
 	cursor_t *c;
 	struct sqlda *output;
@@ -3326,11 +3341,11 @@ fetch_many(VALUE self, VALUE n, VALUE type)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2622 "informix.ec"
+#line 2630 "informix.ec"
   {
-#line 2622 "informix.ec"
+#line 2630 "informix.ec"
   sqli_connect_set(0, did, 0);
-#line 2622 "informix.ec"
+#line 2630 "informix.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -3350,12 +3365,12 @@ fetch_many(VALUE self, VALUE n, VALUE type)
 /*
  * 		EXEC SQL fetch :cid using descriptor output;
  */
-#line 2638 "informix.ec"
+#line 2646 "informix.ec"
   {
-#line 2638 "informix.ec"
+#line 2646 "informix.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 2638 "informix.ec"
+#line 2646 "informix.ec"
   }
 		if (SQLCODE < 0)
 			raise_ifx_extended();
@@ -3434,13 +3449,13 @@ each(VALUE self, VALUE type, int bang)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 2713 "informix.ec"
-#line 2714 "informix.ec"
+#line 2721 "informix.ec"
+#line 2722 "informix.ec"
   char *cid, *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2715 "informix.ec"
+#line 2723 "informix.ec"
 
 	struct sqlda *output;
 	VALUE record;
@@ -3453,11 +3468,11 @@ each(VALUE self, VALUE type, int bang)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2724 "informix.ec"
+#line 2732 "informix.ec"
   {
-#line 2724 "informix.ec"
+#line 2732 "informix.ec"
   sqli_connect_set(0, did, 0);
-#line 2724 "informix.ec"
+#line 2732 "informix.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -3469,12 +3484,12 @@ each(VALUE self, VALUE type, int bang)
 /*
  * 		EXEC SQL fetch :cid using descriptor output;
  */
-#line 2732 "informix.ec"
+#line 2740 "informix.ec"
   {
-#line 2732 "informix.ec"
+#line 2740 "informix.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 2732 "informix.ec"
+#line 2740 "informix.ec"
   }
 		if (SQLCODE < 0)
 			raise_ifx_extended();
@@ -3613,13 +3628,13 @@ inscur_put(int argc, VALUE *argv, VALUE self)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 2867 "informix.ec"
-#line 2868 "informix.ec"
+#line 2875 "informix.ec"
+#line 2876 "informix.ec"
   char *cid, *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2869 "informix.ec"
+#line 2877 "informix.ec"
 
 
 	Data_Get_Struct(self, cursor_t, c);
@@ -3630,11 +3645,11 @@ inscur_put(int argc, VALUE *argv, VALUE self)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2876 "informix.ec"
+#line 2884 "informix.ec"
   {
-#line 2876 "informix.ec"
+#line 2884 "informix.ec"
   sqli_connect_set(0, did, 0);
-#line 2876 "informix.ec"
+#line 2884 "informix.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -3650,11 +3665,11 @@ inscur_put(int argc, VALUE *argv, VALUE self)
 /*
  * 	EXEC SQL put :cid using descriptor input;
  */
-#line 2888 "informix.ec"
+#line 2896 "informix.ec"
   {
-#line 2888 "informix.ec"
+#line 2896 "informix.ec"
   sqli_curs_put(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 256), input, (char *)0);
-#line 2888 "informix.ec"
+#line 2896 "informix.ec"
   }
 	clean_input_slots(c);
 	if (SQLCODE < 0)
@@ -3679,13 +3694,13 @@ inscur_flush(VALUE self)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 2909 "informix.ec"
-#line 2910 "informix.ec"
+#line 2917 "informix.ec"
+#line 2918 "informix.ec"
   char *cid, *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2911 "informix.ec"
+#line 2919 "informix.ec"
 
 
 	Data_Get_Struct(self, cursor_t, c);
@@ -3696,11 +3711,11 @@ inscur_flush(VALUE self)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2918 "informix.ec"
+#line 2926 "informix.ec"
   {
-#line 2918 "informix.ec"
+#line 2926 "informix.ec"
   sqli_connect_set(0, did, 0);
-#line 2918 "informix.ec"
+#line 2926 "informix.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -3709,11 +3724,11 @@ inscur_flush(VALUE self)
 /*
  * 	EXEC SQL flush :cid;
  */
-#line 2923 "informix.ec"
+#line 2931 "informix.ec"
   {
-#line 2923 "informix.ec"
+#line 2931 "informix.ec"
   sqli_curs_flush(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 256));
-#line 2923 "informix.ec"
+#line 2931 "informix.ec"
   }
 	return self;
 }
@@ -3733,14 +3748,14 @@ scrollcur_entry(VALUE self, VALUE index, VALUE type, int bang)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 2939 "informix.ec"
-#line 2940 "informix.ec"
+#line 2947 "informix.ec"
+#line 2948 "informix.ec"
   char *cid, *did;
 long pos;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2942 "informix.ec"
+#line 2950 "informix.ec"
 
 
 	Data_Get_Struct(self, cursor_t, c);
@@ -3751,11 +3766,11 @@ long pos;
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 2949 "informix.ec"
+#line 2957 "informix.ec"
   {
-#line 2949 "informix.ec"
+#line 2957 "informix.ec"
   sqli_connect_set(0, did, 0);
-#line 2949 "informix.ec"
+#line 2957 "informix.ec"
   }
 	if (SQLCODE < 0)
 		return Qnil;
@@ -3767,60 +3782,60 @@ long pos;
 /*
  * 		EXEC SQL fetch current :cid using descriptor output;
  */
-#line 2957 "informix.ec"
+#line 2965 "informix.ec"
   {
-#line 2957 "informix.ec"
+#line 2965 "informix.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 2957 "informix.ec"
+#line 2965 "informix.ec"
   }
 	else if ((pos = NUM2LONG(index) + 1) > 0)
 /*
  * 		EXEC SQL fetch absolute :pos :cid using descriptor output;
  */
-#line 2959 "informix.ec"
+#line 2967 "informix.ec"
   {
-#line 2959 "informix.ec"
+#line 2967 "informix.ec"
   static ifx_sqlvar_t _sqibind[] = 
     {
       { 103, sizeof(pos), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-#line 2959 "informix.ec"
+#line 2967 "informix.ec"
     };
   static ifx_sqlda_t _SD0 = { 1, _sqibind, {0}, 1, 0 };
   static _FetchSpec _FS1 = { 0, 6, 0 };
-#line 2959 "informix.ec"
+#line 2967 "informix.ec"
   _sqibind[0].sqldata = (char *) &pos;
   sqli_curs_fetch(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 256), &_SD0, output, (char *)0, &_FS1);
-#line 2959 "informix.ec"
+#line 2967 "informix.ec"
   }
 	else {
 /*
  * 		EXEC SQL fetch last :cid;
  */
-#line 2961 "informix.ec"
+#line 2969 "informix.ec"
   {
-#line 2961 "informix.ec"
+#line 2969 "informix.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 2961 "informix.ec"
+#line 2969 "informix.ec"
   }
 /*
  * 		EXEC SQL fetch relative :pos :cid using descriptor output;
  */
-#line 2962 "informix.ec"
+#line 2970 "informix.ec"
   {
-#line 2962 "informix.ec"
+#line 2970 "informix.ec"
   static ifx_sqlvar_t _sqibind[] = 
     {
       { 103, sizeof(pos), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-#line 2962 "informix.ec"
+#line 2970 "informix.ec"
     };
   static ifx_sqlda_t _SD0 = { 1, _sqibind, {0}, 1, 0 };
   static _FetchSpec _FS1 = { 0, 7, 0 };
-#line 2962 "informix.ec"
+#line 2970 "informix.ec"
   _sqibind[0].sqldata = (char *) &pos;
   sqli_curs_fetch(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 256), &_SD0, output, (char *)0, &_FS1);
-#line 2962 "informix.ec"
+#line 2970 "informix.ec"
   }
 	}
 
@@ -3845,13 +3860,13 @@ scrollcur_subseq(VALUE self, VALUE start, VALUE length, VALUE type)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 2983 "informix.ec"
-#line 2984 "informix.ec"
+#line 2991 "informix.ec"
+#line 2992 "informix.ec"
 long pos;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 2985 "informix.ec"
+#line 2993 "informix.ec"
 
 
 	first = scrollcur_entry(self, start, type, 0);
@@ -3983,14 +3998,14 @@ scrollcur_rel(int argc, VALUE *argv, VALUE self, int dir, VALUE type, int bang)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 3113 "informix.ec"
-#line 3114 "informix.ec"
+#line 3121 "informix.ec"
+#line 3122 "informix.ec"
   char *cid, *did;
 long pos;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 3116 "informix.ec"
+#line 3124 "informix.ec"
 
 
 	Data_Get_Struct(self, cursor_t, c);
@@ -4001,11 +4016,11 @@ long pos;
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 3123 "informix.ec"
+#line 3131 "informix.ec"
   {
-#line 3123 "informix.ec"
+#line 3131 "informix.ec"
   sqli_connect_set(0, did, 0);
-#line 3123 "informix.ec"
+#line 3131 "informix.ec"
   }
 	if (SQLCODE < 0)
 		return Qnil;
@@ -4018,20 +4033,20 @@ long pos;
 /*
  * 	EXEC SQL fetch relative :pos :cid using descriptor output;
  */
-#line 3132 "informix.ec"
+#line 3140 "informix.ec"
   {
-#line 3132 "informix.ec"
+#line 3140 "informix.ec"
   static ifx_sqlvar_t _sqibind[] = 
     {
       { 103, sizeof(pos), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-#line 3132 "informix.ec"
+#line 3140 "informix.ec"
     };
   static ifx_sqlda_t _SD0 = { 1, _sqibind, {0}, 1, 0 };
   static _FetchSpec _FS1 = { 0, 7, 0 };
-#line 3132 "informix.ec"
+#line 3140 "informix.ec"
   _sqibind[0].sqldata = (char *) &pos;
   sqli_curs_fetch(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 256), &_SD0, output, (char *)0, &_FS1);
-#line 3132 "informix.ec"
+#line 3140 "informix.ec"
   }
 
 	if (SQLCODE == SQLNOTFOUND)
@@ -4331,13 +4346,13 @@ cursor_close_or_free(cursor_t *c, short op)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 3428 "informix.ec"
-#line 3429 "informix.ec"
+#line 3436 "informix.ec"
+#line 3437 "informix.ec"
   char *cid, *sid, *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 3430 "informix.ec"
+#line 3438 "informix.ec"
 
 
 	if (op == 1 && !c->is_open)
@@ -4355,11 +4370,11 @@ cursor_close_or_free(cursor_t *c, short op)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 3444 "informix.ec"
+#line 3452 "informix.ec"
   {
-#line 3444 "informix.ec"
+#line 3452 "informix.ec"
   sqli_connect_set(0, did, 0);
-#line 3444 "informix.ec"
+#line 3452 "informix.ec"
   }
 	if (SQLCODE < 0)
 		return;
@@ -4368,11 +4383,11 @@ cursor_close_or_free(cursor_t *c, short op)
 /*
  * 	EXEC SQL close :cid;
  */
-#line 3449 "informix.ec"
+#line 3457 "informix.ec"
   {
-#line 3449 "informix.ec"
+#line 3457 "informix.ec"
   sqli_curs_close(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 256));
-#line 3449 "informix.ec"
+#line 3457 "informix.ec"
   }
 
 	if (op == 2) {
@@ -4380,20 +4395,20 @@ cursor_close_or_free(cursor_t *c, short op)
 /*
  * 		EXEC SQL free :cid;
  */
-#line 3453 "informix.ec"
+#line 3461 "informix.ec"
   {
-#line 3453 "informix.ec"
+#line 3461 "informix.ec"
   sqli_curs_free(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 258));
-#line 3453 "informix.ec"
+#line 3461 "informix.ec"
   }
 /*
  *                       EXEC SQL free :sid;
  */
-#line 3453 "informix.ec"
+#line 3461 "informix.ec"
   {
-#line 3453 "informix.ec"
+#line 3461 "informix.ec"
   sqli_curs_free(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, sid, 258));
-#line 3453 "informix.ec"
+#line 3461 "informix.ec"
   }
 	}
 }
@@ -4437,14 +4452,14 @@ cursor_initialize(int argc, VALUE *argv, VALUE self)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 3493 "informix.ec"
-#line 3494 "informix.ec"
+#line 3501 "informix.ec"
+#line 3502 "informix.ec"
   char *c_query;
   char *cid, *sid, *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 3496 "informix.ec"
+#line 3504 "informix.ec"
 
 
 	rb_scan_args(argc, argv, "21", &db, &query, &options);
@@ -4453,11 +4468,11 @@ cursor_initialize(int argc, VALUE *argv, VALUE self)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 3501 "informix.ec"
+#line 3509 "informix.ec"
   {
-#line 3501 "informix.ec"
+#line 3509 "informix.ec"
   sqli_connect_set(0, did, 0);
-#line 3501 "informix.ec"
+#line 3509 "informix.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -4480,11 +4495,11 @@ cursor_initialize(int argc, VALUE *argv, VALUE self)
 /*
  * 	EXEC SQL prepare :sid from :c_query;
  */
-#line 3520 "informix.ec"
+#line 3528 "informix.ec"
   {
-#line 3520 "informix.ec"
+#line 3528 "informix.ec"
   sqli_prep(ESQLINTVERSION, sid, c_query,(ifx_literal_t *)0, (ifx_namelist_t *)0, -1, 0, 0 ); 
-#line 3520 "informix.ec"
+#line 3528 "informix.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -4493,41 +4508,41 @@ cursor_initialize(int argc, VALUE *argv, VALUE self)
 /*
  * 		EXEC SQL declare :cid scroll cursor with hold for :sid;
  */
-#line 3525 "informix.ec"
+#line 3533 "informix.ec"
   {
-#line 3525 "informix.ec"
+#line 3533 "informix.ec"
   sqli_curs_decl_dynm(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 0), cid, sqli_curs_locate(ESQLINTVERSION, sid, 1), 4128, 0);
-#line 3525 "informix.ec"
+#line 3533 "informix.ec"
   }
 	else if (RTEST(hold))
 /*
  * 		EXEC SQL declare :cid cursor with hold for :sid;
  */
-#line 3527 "informix.ec"
+#line 3535 "informix.ec"
   {
-#line 3527 "informix.ec"
+#line 3535 "informix.ec"
   sqli_curs_decl_dynm(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 0), cid, sqli_curs_locate(ESQLINTVERSION, sid, 1), 4096, 0);
-#line 3527 "informix.ec"
+#line 3535 "informix.ec"
   }
 	else if (RTEST(scroll))
 /*
  * 		EXEC SQL declare :cid scroll cursor for :sid;
  */
-#line 3529 "informix.ec"
+#line 3537 "informix.ec"
   {
-#line 3529 "informix.ec"
+#line 3537 "informix.ec"
   sqli_curs_decl_dynm(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 0), cid, sqli_curs_locate(ESQLINTVERSION, sid, 1), 32, 0);
-#line 3529 "informix.ec"
+#line 3537 "informix.ec"
   }
 	else
 /*
  * 		EXEC SQL declare :cid cursor for :sid;
  */
-#line 3531 "informix.ec"
+#line 3539 "informix.ec"
   {
-#line 3531 "informix.ec"
+#line 3539 "informix.ec"
   sqli_curs_decl_dynm(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 0), cid, sqli_curs_locate(ESQLINTVERSION, sid, 1), 0, 0);
-#line 3531 "informix.ec"
+#line 3539 "informix.ec"
   }
 
 	if (SQLCODE < 0)
@@ -4537,11 +4552,11 @@ cursor_initialize(int argc, VALUE *argv, VALUE self)
 /*
  * 	EXEC SQL describe :sid into output;
  */
-#line 3537 "informix.ec"
+#line 3545 "informix.ec"
   {
-#line 3537 "informix.ec"
+#line 3545 "informix.ec"
   sqli_describe_stmt(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, sid, 257), &output, 0);
-#line 3537 "informix.ec"
+#line 3545 "informix.ec"
   }
 	c->daOutput = output;
 
@@ -4669,13 +4684,13 @@ cursor_open(int argc, VALUE *argv, VALUE self)
 /*
  * 	EXEC SQL begin declare section;
  */
-#line 3661 "informix.ec"
-#line 3662 "informix.ec"
+#line 3669 "informix.ec"
+#line 3670 "informix.ec"
   char *cid, *did;
 /*
  * 	EXEC SQL end   declare section;
  */
-#line 3663 "informix.ec"
+#line 3671 "informix.ec"
 
 
 	Data_Get_Struct(self, cursor_t, c);
@@ -4687,11 +4702,11 @@ cursor_open(int argc, VALUE *argv, VALUE self)
 /*
  * 	EXEC SQL set connection :did;
  */
-#line 3671 "informix.ec"
+#line 3679 "informix.ec"
   {
-#line 3671 "informix.ec"
+#line 3679 "informix.ec"
   sqli_connect_set(0, did, 0);
-#line 3671 "informix.ec"
+#line 3679 "informix.ec"
   }
 	if (SQLCODE < 0)
 		raise_ifx_extended();
@@ -4710,11 +4725,11 @@ cursor_open(int argc, VALUE *argv, VALUE self)
  * 			EXEC SQL open :cid using descriptor input
  * 				with reoptimization;
  */
-#line 3685 "informix.ec"
+#line 3693 "informix.ec"
   {
-#line 3686 "informix.ec"
+#line 3694 "informix.ec"
   sqli_curs_open(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 256), input, (char *)0, (struct value *)0, 1, 1);
-#line 3686 "informix.ec"
+#line 3694 "informix.ec"
   }
 			clean_input_slots(c);
 		}
@@ -4722,22 +4737,22 @@ cursor_open(int argc, VALUE *argv, VALUE self)
 /*
  * 			EXEC SQL open :cid with reoptimization;
  */
-#line 3690 "informix.ec"
+#line 3698 "informix.ec"
   {
-#line 3690 "informix.ec"
+#line 3698 "informix.ec"
   sqli_curs_open(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 256), (ifx_sqlda_t *)0, (char *)0, (struct value *)0, 0, 1);
-#line 3690 "informix.ec"
+#line 3698 "informix.ec"
   }
 	}
 	else
 /*
  * 		EXEC SQL open :cid;
  */
-#line 3693 "informix.ec"
+#line 3701 "informix.ec"
   {
-#line 3693 "informix.ec"
+#line 3701 "informix.ec"
   sqli_curs_open(ESQLINTVERSION, sqli_curs_locate(ESQLINTVERSION, cid, 256), (ifx_sqlda_t *)0, (char *)0, (struct value *)0, 0, 0);
-#line 3693 "informix.ec"
+#line 3701 "informix.ec"
   }
 
 	if (SQLCODE < 0)
@@ -5003,4 +5018,4 @@ void Init_informix(void)
 	rbifx_except_init(rb_mInformix, &esyms);
 }
 
-#line 3956 "informix.ec"
+#line 3964 "informix.ec"

data/informix.ec

@@ -1,4 +1,4 @@
-/* $Id: informix.ec,v 1.10 2007/08/23 02:32:56 santana Exp $ */
+/* $Id: informix.ec,v 1.12 2007/10/14 00:18:50 santana Exp $ */
 /*
 * Copyright (c) 2006-2007, Gerardo Santana Gomez Garrido <gerardo.santana@gmail.com>
 * All rights reserved.
@@ -28,7 +28,7 @@
 * POSSIBILITY OF SUCH DAMAGE.
 */
 
-static const char rcsid[] = "$Id: informix.ec,v 1.10 2007/08/23 02:32:56 santana Exp $";
+static const char rcsid[] = "$Id: informix.ec,v 1.12 2007/10/14 00:18:50 santana Exp $";
 
 #include "ruby.h"
 #include "ifx_except.h"
@@ -1775,7 +1775,7 @@ rb_informix_connect(int argc, VALUE *argv, VALUE self)
  */
 static VALUE rb_informix_version(void)
 {
-	static const char * const ver = "0.6.0";
+	static const char * const ver = "0.6.1";
 	static VALUE driver_version;
 
 	if (driver_version == 0)
@@ -2144,22 +2144,30 @@ rb_database_columns(VALUE self, VALUE tablename)
 	result = rb_ary_new();
 
 	cid = did + IDSIZE;
+
 	if (!*cid) {
-		snprintf(cid, IDSIZE, "COLS%lX", self);
-		EXEC SQL declare :cid cursor for
-			select colname, coltype, collength, extended_id,
+		EXEC SQL begin declare section;
+			char sid[IDSIZE];
+		EXEC SQL end   declare section;
+
+		snprintf(sid, IDSIZE, "COLS%lX", self);
+		snprintf(cid, IDSIZE, "COLC%lX", self);
+
+		EXEC SQL prepare :sid from
+			'select colname, coltype, collength, extended_id,
 				type, default, c.colno
 			from syscolumns c, outer sysdefaults d
-			where c.tabid = :tabid and c.tabid = d.tabid
+			where c.tabid = ? and c.tabid = d.tabid
 				and c.colno = d.colno
-			order by c.colno;
+			order by c.colno';
+		EXEC SQL declare :cid cursor for :sid;
 		if (SQLCODE < 0) {
 			cid[0] = 0;
 			raise_ifx_extended();
 		}
 	}
 
-	EXEC SQL open :cid;
+	EXEC SQL open :cid using :tabid;
 	if (SQLCODE < 0)
 		raise_ifx_extended();
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: ruby-informix
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
-date: 2007-08-28 00:00:00 -05:00
+  version: 0.6.1
+date: 2007-10-13 00:00:00 -05:00
 summary: Informix driver for Ruby
 require_paths: 
 - lib