ruby-informix 0.5.1 → 0.6.0

data/informix.ec

@@ -1,4 +1,4 @@
-/* $Id: informix.ec,v 1.81.2.2 2007/08/10 17:48:47 santana Exp $ */
+/* $Id: informix.ec,v 1.10 2007/08/23 02:32:56 santana Exp $ */
 /*
 * Copyright (c) 2006-2007, Gerardo Santana Gomez Garrido <gerardo.santana@gmail.com>
 * All rights reserved.
@@ -28,7 +28,10 @@
 * POSSIBILITY OF SUCH DAMAGE.
 */
 
+static const char rcsid[] = "$Id: informix.ec,v 1.10 2007/08/23 02:32:56 santana Exp $";
+
 #include "ruby.h"
+#include "ifx_except.h"
 
 #include <sqlstype.h>
 #include <sqltypes.h>
@@ -55,6 +58,9 @@ static VALUE sym_col_info, sym_sbspace, sym_estbytes, sym_extsz;
 static VALUE sym_createflags, sym_openflags, sym_maxbytes;
 static VALUE sym_params;
 
+/* Symbols from ifx_except module */
+static ifx_except_symbols_t esyms;
+
 #define IDSIZE 30
 
 typedef struct {
@@ -82,20 +88,22 @@ typedef struct {
 	ifx_int8_t size;
 } slobstat_t;
 
-#define NUM2INT8(num, int8addr) do { \
+#define NUM2INT8(num, int8addr) \
+do { \
 	VALUE str = rb_funcall(num, s_to_s, 0); \
 	char *c_str = StringValueCStr(str); \
 	mint ret = ifx_int8cvasc(c_str, strlen(c_str), (int8addr)); \
 	if (ret < 0) \
-		rb_raise(rb_eRuntimeError, "Could not convert %s to int8", c_str); \
-}while(0)
+		rb_raise(esyms.eOperationalError, "Could not convert %s to int8", c_str); \
+} while(0)
 
-#define INT82NUM(int8addr, num) do { \
+#define INT82NUM(int8addr, num) \
+do { \
 	char str[21]; \
 	ifx_int8toasc((int8addr), str, sizeof(str) - 1); \
 	str[sizeof(str) - 1] = 0; \
 	num = rb_cstr2inum(str, 10); \
-}while(0)
+} while(0)
 
 /* class Slob::Stat ------------------------------------------------------ */
 
@@ -136,18 +144,18 @@ rb_slobstat_initialize(VALUE self, VALUE slob)
 	Data_Get_Struct(self, slobstat_t, stat);
 
 	if (sb->fd == -1)
-		rb_raise(rb_eRuntimeError,
+		rb_raise(esyms.eProgrammingError,
 			"Open the Slob object before getting its status");
 
 	did = sb->database_id;
 	EXEC SQL set connection :did;
 	if (SQLCODE < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+		raise_ifx_extended();
 
 	ret = ifx_lo_stat(sb->fd, &st);
 
 	if (ret < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", ret);
+		raise_ifx_extended();
 
 	stat->atime = ifx_lo_stat_atime(st);
 	stat->ctime = ifx_lo_stat_ctime(st);
@@ -159,7 +167,7 @@ rb_slobstat_initialize(VALUE self, VALUE slob)
 
 	if (stat->atime == -1 || stat->ctime == -1 || stat->mtime == -1 ||
 	    stat->refcnt == -1 || ret == -1) {
-		rb_raise(rb_eRuntimeError, "Unable to get status");
+		rb_raise(esyms.eOperationalError, "Unable to get status");
 	}
 
 	return self;
@@ -314,27 +322,6 @@ slob_alloc(VALUE klass)
 	return Data_Wrap_Struct(klass, slob_mark, slob_free, slob);
 }
 
-/*
- * call-seq:
- * Slob.new(database, type = Slob::CLOB, options = nil)                  => slob
- * Slob.new(database, type = Slob::CLOB, options = nil) {|slob| block }  => obj
- *
- * Creates a Smart Large Object of type <i>type</i> in <i>database</i>.
- * Returns a <code>Slob</code> object pointing to it.
- *
- * <i>type</i> can be Slob::BLOB or Slob::CLOB
- *
- * <i>options</i> must be a hash with the following possible keys:
- *
- *   :sbspace     => Sbspace name
- *   :estbytes    => Estimated size, in bytes
- *   :extsz       => Allocation extent size
- *   :createflags => Create-time flags
- *   :openflags   => Access mode
- *   :maxbytes    => Maximum size
- *   :col_info    => Get the previous values from the column-level storage
- *                   characteristics for the specified database column
- */
 static VALUE
 rb_slob_initialize(int argc, VALUE *argv, VALUE self)
 {
@@ -351,7 +338,7 @@ rb_slob_initialize(int argc, VALUE *argv, VALUE self)
 
 	EXEC SQL set connection :did;
 	if (SQLCODE < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+		raise_ifx_extended();
 
 	Data_Get_Struct(self, slob_t, slob);
 	slob->db = db;
@@ -360,7 +347,7 @@ rb_slob_initialize(int argc, VALUE *argv, VALUE self)
 	if (!NIL_P(type)) {
 		int t = FIX2INT(type);
 		if (t != XID_CLOB && t != XID_BLOB)
-			rb_raise(rb_eRuntimeError, "Invalid type %d for an SLOB", t);
+			rb_raise(esyms.eInternalError, "Invalid type %d for an SLOB", t);
 		slob->type = t;
 	}
 
@@ -379,19 +366,19 @@ rb_slob_initialize(int argc, VALUE *argv, VALUE self)
 
 	ret = ifx_lo_def_create_spec(&slob->spec);
 	if (ret < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", ret);
+		raise_ifx_extended();
 
 	if (!NIL_P(col_info)) {
 		ret = ifx_lo_col_info(StringValueCStr(col_info), slob->spec);
 
 		if (ret < 0)
-			rb_raise(rb_eRuntimeError, "Informix Error: %d", ret);
+			raise_ifx_extended();
 	}
 	if (!NIL_P(sbspace)) {
 		char *c_sbspace = StringValueCStr(sbspace);
 		ret = ifx_lo_specset_sbspace(slob->spec, c_sbspace);
 		if (ret == -1)
-			rb_raise(rb_eRuntimeError, "Could not set sbspace name to %s", c_sbspace);
+			rb_raise(esyms.eOperationalError, "Could not set sbspace name to %s", c_sbspace);
 	}
 	if (!NIL_P(estbytes)) {
 		ifx_int8_t estbytes8;
@@ -399,17 +386,17 @@ rb_slob_initialize(int argc, VALUE *argv, VALUE self)
 		NUM2INT8(estbytes, &estbytes8);
 		ret = ifx_lo_specset_estbytes(slob->spec, &estbytes8);
 		if (ret == -1)
-			rb_raise(rb_eRuntimeError, "Could not set estbytes");
+			rb_raise(esyms.eOperationalError, "Could not set estbytes");
 	}
 	if (!NIL_P(extsz)) {
 		ret = ifx_lo_specset_extsz(slob->spec, FIX2LONG(extsz));
 		if (ret == -1)
-			rb_raise(rb_eRuntimeError, "Could not set extsz to %d", FIX2LONG(extsz));
+			rb_raise(esyms.eOperationalError, "Could not set extsz to %d", FIX2LONG(extsz));
 	}
 	if (!NIL_P(createflags)) {
 		ret = ifx_lo_specset_flags(slob->spec, FIX2LONG(createflags));
 		if (ret == -1)
-			rb_raise(rb_eRuntimeError, "Could not set crate-time flags to 0x%X", FIX2LONG(createflags));
+			rb_raise(esyms.eOperationalError, "Could not set crate-time flags to 0x%X", FIX2LONG(createflags));
 	}
 	if (!NIL_P(maxbytes)) {
 		ifx_int8_t maxbytes8;
@@ -417,16 +404,17 @@ rb_slob_initialize(int argc, VALUE *argv, VALUE self)
 		NUM2INT8(maxbytes, (&maxbytes8));
 		ret = ifx_lo_specset_maxbytes(slob->spec, &maxbytes8);
 		if (ret == -1)
-			rb_raise(rb_eRuntimeError, "Could not set maxbytes");
+			rb_raise(esyms.eOperationalError, "Could not set maxbytes");
 	}
 
 	slob->fd = ifx_lo_create(slob->spec, RTEST(openflags)? FIX2LONG(openflags): LO_RDWR, &slob->lo, &error);
 	if (slob->fd == -1)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d\n", error);
+		raise_ifx_extended();
 
 	return self;
 }
 
+static VALUE rb_slob_close(VALUE self);
 /*
  * call-seq:
  * Slob.new(database, type = Slob::CLOB, options = nil)                  => slob
@@ -448,7 +436,6 @@ rb_slob_initialize(int argc, VALUE *argv, VALUE self)
  *   :col_info    => Get the previous values from the column-level storage
  *                   characteristics for the specified database column
  */
-static VALUE rb_slob_close(VALUE self);
 static VALUE
 rb_slob_s_new(int argc, VALUE *argv, VALUE klass)
 {
@@ -500,14 +487,14 @@ rb_slob_open(int argc, VALUE *argv, VALUE self)
 	did = slob->database_id;
 	EXEC SQL set connection :did;
 	if (SQLCODE < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+		raise_ifx_extended();
 
 	rb_scan_args(argc, argv, "01", &access);
 
 	slob->fd = ifx_lo_open(&slob->lo, NIL_P(access)? LO_RDONLY: FIX2INT(access), &error);
 
 	if (slob->fd == -1)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", error);
+		raise_ifx_extended();
 
 	return self;
 }
@@ -565,12 +552,12 @@ rb_slob_read(VALUE self, VALUE nbytes)
 	Data_Get_Struct(self, slob_t, slob);
 
 	if (slob->fd == -1)
-		rb_raise(rb_eRuntimeError, "Open the Slob object before reading");
+		rb_raise(esyms.eProgrammingError, "Open the Slob object before reading");
 
 	did = slob->database_id;
 	EXEC SQL set connection :did;
 	if (SQLCODE < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+		raise_ifx_extended();
 
 	c_nbytes = FIX2LONG(nbytes);
 	buffer = ALLOC_N(char, c_nbytes);
@@ -578,7 +565,7 @@ rb_slob_read(VALUE self, VALUE nbytes)
 
 	if (ret == -1) {
 		xfree(buffer);
-		rb_raise(rb_eRuntimeError, "Informix Error: %d\n", error);
+		raise_ifx_extended();
 	}
 
 	str = rb_str_new(buffer, ret);
@@ -611,12 +598,12 @@ rb_slob_write(VALUE self, VALUE data)
 	Data_Get_Struct(self, slob_t, slob);
 
 	if (slob->fd == -1)
-		rb_raise(rb_eRuntimeError, "Open the Slob object before writing");
+		rb_raise(esyms.eProgrammingError, "Open the Slob object before writing");
 
 	did = slob->database_id;
 	EXEC SQL set connection :did;
 	if (SQLCODE < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+		raise_ifx_extended();
 
 	str = rb_obj_as_string(data);
 	buffer = RSTRING(str)->ptr;
@@ -625,7 +612,7 @@ rb_slob_write(VALUE self, VALUE data)
 	ret = ifx_lo_write(slob->fd, buffer, nbytes, &error);
 
 	if (ret == -1)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", error);
+		raise_ifx_extended();
 
 	return LONG2NUM(ret);
 }
@@ -679,17 +666,17 @@ rb_slob_seek(VALUE self, VALUE offset, VALUE whence)
 	Data_Get_Struct(self, slob_t, slob);
 
 	if (slob->fd == -1)
-		rb_raise(rb_eRuntimeError, "Open the Slob object first");
+		rb_raise(esyms.eProgrammingError, "Open the Slob object first");
 
 	did = slob->database_id;
 	EXEC SQL set connection :did;
 	if (SQLCODE < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+		raise_ifx_extended();
 
 	NUM2INT8(offset, &offset8);
 	ret = ifx_lo_seek(slob->fd, &offset8, FIX2INT(whence), &seek_pos8);
 	if (ret < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", ret);
+		raise_ifx_extended();
 
 	INT82NUM(&seek_pos8, seek_pos);
 
@@ -741,16 +728,16 @@ rb_slob_tell(VALUE self)
 	Data_Get_Struct(self, slob_t, slob);
 
 	if (slob->fd == -1)
-		rb_raise(rb_eRuntimeError, "Open the Slob object first");
+		rb_raise(esyms.eProgrammingError, "Open the Slob object first");
 
 	did = slob->database_id;
 	EXEC SQL set connection :did;
 	if (SQLCODE < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+		raise_ifx_extended();
 
 	ret = ifx_lo_tell(slob->fd, &seek_pos8);
 	if (ret < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", ret);
+		raise_ifx_extended();
 
 	INT82NUM(&seek_pos8, seek_pos);
 
@@ -778,17 +765,17 @@ rb_slob_truncate(VALUE self, VALUE offset)
 	Data_Get_Struct(self, slob_t, slob);
 
 	if (slob->fd == -1)
-		rb_raise(rb_eRuntimeError, "Open the Slob object first");
+		rb_raise(esyms.eProgrammingError, "Open the Slob object first");
 
 	did = slob->database_id;
 	EXEC SQL set connection :did;
 	if (SQLCODE < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+		raise_ifx_extended();
 
 	NUM2INT8(offset, &offset8);
 	ret = ifx_lo_truncate(slob->fd, &offset8);
 	if (ret < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", ret);
+		raise_ifx_extended();
 
 	return self;
 }
@@ -834,18 +821,18 @@ rb_slob_lock(VALUE self, VALUE offset, VALUE whence, VALUE range, VALUE mode)
 	Data_Get_Struct(self, slob_t, slob);
 
 	if (slob->fd == -1)
-		rb_raise(rb_eRuntimeError, "Open the Slob object first");
+		rb_raise(esyms.eProgrammingError, "Open the Slob object first");
 
 	did = slob->database_id;
 	EXEC SQL set connection :did;
 	if (SQLCODE < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+		raise_ifx_extended();
 
 	NUM2INT8(offset, &offset8);
 	NUM2INT8(range, &range8);
 	ret = ifx_lo_lock(slob->fd, &offset8, FIX2INT(whence), &range8, FIX2INT(mode));
 	if (ret < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", ret);
+		raise_ifx_extended();
 
 	return self;
 }
@@ -878,18 +865,18 @@ rb_slob_unlock(VALUE self, VALUE offset, VALUE whence, VALUE range)
 	Data_Get_Struct(self, slob_t, slob);
 
 	if (slob->fd == -1)
-		rb_raise(rb_eRuntimeError, "Open the Slob object first");
+		rb_raise(esyms.eProgrammingError, "Open the Slob object first");
 
 	did = slob->database_id;
 	EXEC SQL set connection :did;
 	if (SQLCODE < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+		raise_ifx_extended();
 
 	NUM2INT8(offset, &offset8);
 	NUM2INT8(range, &range8);
 	ret = ifx_lo_unlock(slob->fd, &offset8, FIX2INT(whence), &range8);
 	if (ret < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", ret);
+		raise_ifx_extended();
 
 	return self;
 }
@@ -919,21 +906,21 @@ slob_specget(VALUE self, slob_option_t option)
 	Data_Get_Struct(self, slob_t, slob);
 
 	if (slob->fd == -1)
-		rb_raise(rb_eRuntimeError, "Open the Slob object first");
+		rb_raise(esyms.eProgrammingError, "Open the Slob object first");
 
 	did = slob->database_id;
 	EXEC SQL set connection :did;
 	if (SQLCODE < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+		raise_ifx_extended();
 
 	ret = ifx_lo_stat(slob->fd, &stat);
 	if (ret < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", ret);
+		raise_ifx_extended();
 
 	spec = ifx_lo_stat_cspec(stat);
 	if (spec == NULL) {
 		ifx_lo_stat_free(stat);
-		rb_raise(rb_eRuntimeError, "Unable to get storage characteristics");
+		rb_raise(esyms.eOperationalError, "Unable to get storage characteristics");
 	}
 
 	switch(option) {
@@ -955,7 +942,7 @@ slob_specget(VALUE self, slob_option_t option)
 
 	ifx_lo_stat_free(stat);
 	if (ret == -1)
-		rb_raise(rb_eRuntimeError, "Unable to get information for %s", str_slob_options[option]);
+		rb_raise(esyms.eOperationalError, "Unable to get information for %s", str_slob_options[option]);
 
 	switch(option) {
 	case slob_estbytes:
@@ -989,21 +976,21 @@ slob_specset(VALUE self, slob_option_t option, VALUE value)
 	Data_Get_Struct(self, slob_t, slob);
 
 	if (slob->fd == -1)
-		rb_raise(rb_eRuntimeError, "Open the Slob object first");
+		rb_raise(esyms.eProgrammingError, "Open the Slob object first");
 
 	did = slob->database_id;
 	EXEC SQL set connection :did;
 	if (SQLCODE < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+		raise_ifx_extended();
 
 	ret = ifx_lo_stat(slob->fd, &stat);
 	if (ret < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", ret);
+		raise_ifx_extended();
 
 	spec = ifx_lo_stat_cspec(stat);
 	if (spec == NULL) {
 		ifx_lo_stat_free(stat);
-		rb_raise(rb_eRuntimeError, "Unable to get storage characteristics");
+		rb_raise(esyms.eOperationalError, "Unable to get storage characteristics");
 	}
 
 	switch(option) {
@@ -1019,7 +1006,7 @@ slob_specset(VALUE self, slob_option_t option, VALUE value)
 
 	ifx_lo_stat_free(stat);
 	if (ret == -1)
-		rb_raise(rb_eRuntimeError, "Unable to set information for %s", str_slob_options[option]);
+		rb_raise(esyms.eOperationalError, "Unable to set information for %s", str_slob_options[option]);
 
 	return value;
 }
@@ -1131,18 +1118,18 @@ slob_stat(VALUE self, slob_stat_t stat)
 	Data_Get_Struct(self, slob_t, slob);
 
 	if (slob->fd == -1)
-		rb_raise(rb_eRuntimeError,
+		rb_raise(esyms.eProgrammingError,
 			"Open the Slob object before getting its status");
 
 	did = slob->database_id;
 	EXEC SQL set connection :did;
 	if (SQLCODE < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+		raise_ifx_extended();
 
 	ret = ifx_lo_stat(slob->fd, &st);
 
 	if (ret < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", ret);
+		raise_ifx_extended();
 
 	switch(stat) {
 	case slob_atime:
@@ -1164,7 +1151,7 @@ slob_stat(VALUE self, slob_stat_t stat)
 	ifx_lo_stat_free(st);
 
 	if (ret == -1)
-		rb_raise(rb_eRuntimeError, "Unable to get value of %s", str_slob_stats[stat]);
+		rb_raise(esyms.eOperationalError, "Unable to get value of %s", str_slob_stats[stat]);
 
 	switch(stat) {
 		case slob_atime:
@@ -1700,7 +1687,7 @@ make_result(cursor_t *c, VALUE record)
 			ret = dectoasc((dec_t *)var->sqldata, buffer,
 					sizeof(buffer) - 1, -1);
 			if (ret)
-				rb_raise(rb_eRuntimeError,
+				rb_raise(esyms.eOperationalError,
 					"Unable to convert DECIMAL to BigDecimal");
 
 			buffer[sizeof(buffer) - 1] = 0;
@@ -1759,6 +1746,7 @@ make_result(cursor_t *c, VALUE record)
 
 /* module Informix -------------------------------------------------------- */
 
+static VALUE rb_database_s_open(int argc, VALUE *argv, VALUE klass);
 /*
  * call-seq:
  * Informix.connect(dbname, user=nil, password=nil)                      => database
@@ -1772,13 +1760,29 @@ make_result(cursor_t *c, VALUE record)
  * closes the connection when the block terminates, returning the value of
  * the block.
  */
-static VALUE rb_database_s_open(int argc, VALUE *argv, VALUE klass);
 static VALUE
-informix_connect(int argc, VALUE *argv, VALUE self)
+rb_informix_connect(int argc, VALUE *argv, VALUE self)
 {
 	return rb_database_s_open(argc, argv, rb_cDatabase);
 }
 
+/*
+ * call-seq:
+ * Informix.version => string
+ *
+ * Returns the version of this Ruby/Informix driver.
+ * Note that this is NOT the Informix database version.
+ */
+static VALUE rb_informix_version(void)
+{
+	static const char * const ver = "0.6.0";
+	static VALUE driver_version;
+
+	if (driver_version == 0)
+		driver_version = rb_str_freeze(rb_str_new2(ver));
+
+	return driver_version;
+}
 
 /* class Database --------------------------------------------------------- */
 
@@ -1816,7 +1820,7 @@ rb_database_initialize(int argc, VALUE *argv, VALUE self)
 	rb_scan_args(argc, argv, "12", &arg[0], &arg[1], &arg[2]);
 
 	if (NIL_P(arg[0]))
-		rb_raise(rb_eRuntimeError, "A database name must be specified");
+		rb_raise(esyms.eProgrammingError, "A database name must be specified");
 
 	Data_Get_Struct(self, char, did);
 
@@ -1836,7 +1840,7 @@ rb_database_initialize(int argc, VALUE *argv, VALUE self)
 		EXEC SQL connect to :dbname as :did with concurrent transaction;
 
 	if (SQLCODE < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+		raise_ifx_extended();
 
 	return self;
 }
@@ -1896,6 +1900,7 @@ rb_database_close(VALUE self)
 /*
  * call-seq:
  * db.immediate(query)  => fixnum
+ * db.execute(query)    => fixnum
  *
  * Executes <i>query</i> and returns the number of rows affected.
  * <i>query</i> must not return rows. Executes efficiently any
@@ -1913,12 +1918,12 @@ rb_database_immediate(VALUE self, VALUE arg)
 
 	EXEC SQL set connection :did;
 	if (SQLCODE < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+		raise_ifx_extended();
 
 	query = StringValueCStr(arg);
 	EXEC SQL execute immediate :query;
 	if (SQLCODE < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+		raise_ifx_extended();
 
 	return INT2FIX(sqlca.sqlerrd[2]);
 }
@@ -1940,7 +1945,7 @@ rb_database_rollback(VALUE self)
 
 	EXEC SQL set connection :did;
 	if (SQLCODE < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+		raise_ifx_extended();
 
 	EXEC SQL rollback;
 	return self;
@@ -1963,7 +1968,7 @@ rb_database_commit(VALUE self)
 
 	EXEC SQL set connection :did;
 	if (SQLCODE < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+		raise_ifx_extended();
 
 	EXEC SQL commit;
 	return self;
@@ -1998,18 +2003,19 @@ rb_database_transaction(VALUE self)
 
 	EXEC SQL set connection :did;
 	if (SQLCODE < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+		raise_ifx_extended();
 
 	EXEC SQL commit;
 
 	EXEC SQL begin work;
 	ret = rb_rescue(rb_yield, self, database_transfail, self);
 	if (ret == Qundef)
-		rb_raise(rb_eRuntimeError, "Transaction rolled back");
+		rb_raise(esyms.eOperationalError, "Transaction rolled back");
 	EXEC SQL commit;
 	return self;
 }
 
+static VALUE statement_s_new(int, VALUE *, VALUE);
 /*
  * call-seq:
  * db.prepare(query)                  => statement
@@ -2025,7 +2031,6 @@ rb_database_transaction(VALUE self)
  * it must not be a query returning more than one row
  * (use <code>Database#cursor</code> instead.)
  */
-static VALUE statement_s_new(int, VALUE *, VALUE);
 static VALUE
 rb_database_prepare(VALUE self, VALUE query)
 {
@@ -2035,6 +2040,7 @@ rb_database_prepare(VALUE self, VALUE query)
 	return statement_s_new(2, argv, rb_cStatement);
 }
 
+static VALUE rb_cursor_s_new(int argc, VALUE *argv, VALUE klass);
 /*
  * call-seq:
  * db.cursor(query, options = nil) => cursor
@@ -2055,7 +2061,7 @@ rb_database_cursor(int argc, VALUE *argv, VALUE self)
 
 	arg[0] = self;
 	rb_scan_args(argc, argv, "11", &arg[1], &arg[2]);
-	return rb_class_new_instance(3, arg, rb_cCursor);
+	return rb_cursor_s_new(3, arg, rb_cCursor);
 }
 
 /*
@@ -2126,14 +2132,14 @@ rb_database_columns(VALUE self, VALUE tablename)
 
 	EXEC SQL set connection :did;
 	if (SQLCODE < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+		raise_ifx_extended();
 
 	tabname = StringValueCStr(tablename);
 
 	EXEC SQL select tabid into :tabid from systables where tabname = :tabname;
 
 	if (SQLCODE == SQLNOTFOUND)
-		rb_raise(rb_eRuntimeError, "Table '%s' doesn't exist", tabname);
+		rb_raise(esyms.eProgrammingError, "Table '%s' doesn't exist", tabname);
 
 	result = rb_ary_new();
 
@@ -2149,19 +2155,19 @@ rb_database_columns(VALUE self, VALUE tablename)
 			order by c.colno;
 		if (SQLCODE < 0) {
 			cid[0] = 0;
-			rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+			raise_ifx_extended();
 		}
 	}
 
 	EXEC SQL open :cid;
 	if (SQLCODE < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+		raise_ifx_extended();
 
 	for(;;) {
 		EXEC SQL fetch :cid into :colname, :coltype, :collength, :xid,
 			:deftype, :defvalue;
 		if (SQLCODE < 0)
-			rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+			raise_ifx_extended();
 
 		if (SQLCODE == SQLNOTFOUND)
 			break;
@@ -2302,22 +2308,6 @@ statement_alloc(VALUE klass)
 	return Data_Wrap_Struct(klass, statement_mark, statement_free, c);
 }
 
-/*
- * call-seq:
- * Statement.new(database, query)                 => statement
- * Statement.new(database, query) {|stmt| block } => obj
- *
- * Creates a <code>Statement</code> object based on <i>query</i> in the
- * context of <i>database</i>.
- * In the first form the <code>Statement</code> object is returned.
- * In the second form the Statement object is passed to the block and when it
- * terminates, the Statement object is dropped, returning the value of the
- * block.
- *
- * <i>query</i> may contain '?' placeholders for input parameters;
- * it must not be a query returning more than one row
- * (use <code>Cursor</code> instead.)
- */
 static VALUE
 statement_initialize(VALUE self, VALUE db, VALUE query)
 {
@@ -2330,7 +2320,7 @@ statement_initialize(VALUE self, VALUE db, VALUE query)
 	Data_Get_Struct(db, char, did);
 	EXEC SQL set connection :did;
 	if (SQLCODE < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+		raise_ifx_extended();
 
 	Data_Get_Struct(self, cursor_t, c);
 	c->db = db;
@@ -2342,7 +2332,7 @@ statement_initialize(VALUE self, VALUE db, VALUE query)
 
 	EXEC SQL prepare :sid from :c_query;
 	if (SQLCODE < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+		raise_ifx_extended();
 
 	alloc_input_slots(c, c_query);
 	EXEC SQL describe :sid into output;
@@ -2360,6 +2350,7 @@ statement_initialize(VALUE self, VALUE db, VALUE query)
 	return self;
 }
 
+static VALUE statement_drop(VALUE);
 /*
  * call-seq:
  * Statement.new(database, query)                 => statement
@@ -2376,7 +2367,6 @@ statement_initialize(VALUE self, VALUE db, VALUE query)
  * it must not be a query returning more than one row
  * (use <code>Cursor</code> instead.)
  */
-static VALUE statement_drop(VALUE);
 static VALUE
 statement_s_new(int argc, VALUE *argv, VALUE klass)
 {
@@ -2414,7 +2404,7 @@ statement_call(int argc, VALUE *argv, VALUE self)
 	did = c->database_id;
 	EXEC SQL set connection :did;
 	if (SQLCODE < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+		raise_ifx_extended();
 
 	output = c->daOutput;
 	input = &c->daInput;
@@ -2435,7 +2425,7 @@ statement_call(int argc, VALUE *argv, VALUE self)
 			EXEC SQL execute :sid into descriptor output;
 
 		if (SQLCODE < 0)
-			rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+			raise_ifx_extended();
 
 		if (SQLCODE == SQLNOTFOUND)
 			return Qnil;
@@ -2451,7 +2441,7 @@ statement_call(int argc, VALUE *argv, VALUE self)
 			EXEC SQL execute :sid;
 	}
 	if (SQLCODE < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+		raise_ifx_extended();
 
 	return INT2FIX(sqlca.sqlerrd[2]);
 }
@@ -2489,7 +2479,8 @@ statement_drop(VALUE self)
 /* Decides whether to use an Array or a Hash, and instantiate a new
  * object or reuse an existing one.
  */
-#define RECORD(c, type, bang, record) do {\
+#define RECORD(c, type, bang, record) \
+do {\
 	if (type == T_ARRAY) {\
 		if (bang) {\
 			if (!c->array)\
@@ -2525,19 +2516,19 @@ fetch(VALUE self, VALUE type, int bang)
 
 	Data_Get_Struct(self, cursor_t, c);
 	if (!c->is_open)
-		rb_raise(rb_eRuntimeError, "Open the cursor object first");
+		rb_raise(esyms.eProgrammingError, "Open the cursor object first");
 
 	did = c->database_id;
 	EXEC SQL set connection :did;
 	if (SQLCODE < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+		raise_ifx_extended();
 
 	output = c->daOutput;
 	cid = c->cursor_id;
 
 	EXEC SQL fetch :cid using descriptor output;
 	if (SQLCODE < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+		raise_ifx_extended();
 
 	if (SQLCODE == SQLNOTFOUND)
 		return Qnil;
@@ -2625,12 +2616,12 @@ fetch_many(VALUE self, VALUE n, VALUE type)
 
 	Data_Get_Struct(self, cursor_t, c);
 	if (!c->is_open)
-		rb_raise(rb_eRuntimeError, "Open the cursor object first");
+		rb_raise(esyms.eProgrammingError, "Open the cursor object first");
 
 	did = c->database_id;
 	EXEC SQL set connection :did;
 	if (SQLCODE < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+		raise_ifx_extended();
 
 	output = c->daOutput;
 	cid = c->cursor_id;
@@ -2646,7 +2637,7 @@ fetch_many(VALUE self, VALUE n, VALUE type)
 	for(i = 0; all || i < max; i++) {
 		EXEC SQL fetch :cid using descriptor output;
 		if (SQLCODE < 0)
-			rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+			raise_ifx_extended();
 
 		if (SQLCODE == SQLNOTFOUND)
 			break;
@@ -2727,12 +2718,12 @@ each(VALUE self, VALUE type, int bang)
 
 	Data_Get_Struct(self, cursor_t, c);
 	if (!c->is_open)
-		rb_raise(rb_eRuntimeError, "Open the cursor object first");
+		rb_raise(esyms.eProgrammingError, "Open the cursor object first");
 
 	did = c->database_id;
 	EXEC SQL set connection :did;
 	if (SQLCODE < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+		raise_ifx_extended();
 
 	output = c->daOutput;
 	cid = c->cursor_id;
@@ -2740,7 +2731,7 @@ each(VALUE self, VALUE type, int bang)
 	for(;;) {
 		EXEC SQL fetch :cid using descriptor output;
 		if (SQLCODE < 0)
-			rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+			raise_ifx_extended();
 
 		if (SQLCODE == SQLNOTFOUND)
 			return self;
@@ -2879,12 +2870,12 @@ inscur_put(int argc, VALUE *argv, VALUE self)
 
 	Data_Get_Struct(self, cursor_t, c);
 	if (!c->is_open)
-		rb_raise(rb_eRuntimeError, "Open the cursor object first");
+		rb_raise(esyms.eProgrammingError, "Open the cursor object first");
 
 	did = c->database_id;
 	EXEC SQL set connection :did;
 	if (SQLCODE < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+		raise_ifx_extended();
 
 	input = &c->daInput;
 	cid = c->cursor_id;
@@ -2897,7 +2888,7 @@ inscur_put(int argc, VALUE *argv, VALUE self)
 	EXEC SQL put :cid using descriptor input;
 	clean_input_slots(c);
 	if (SQLCODE < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+		raise_ifx_extended();
 
 	/* XXX 2-448, Guide to SQL: Sytax*/
 	return INT2FIX(sqlca.sqlerrd[2]);
@@ -2921,12 +2912,12 @@ inscur_flush(VALUE self)
 
 	Data_Get_Struct(self, cursor_t, c);
 	if (!c->is_open)
-		rb_raise(rb_eRuntimeError, "Open the cursor object first");
+		rb_raise(esyms.eProgrammingError, "Open the cursor object first");
 
 	did = c->database_id;
 	EXEC SQL set connection :did;
 	if (SQLCODE < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+		raise_ifx_extended();
 
 	cid = c->cursor_id;
 	EXEC SQL flush :cid;
@@ -2952,7 +2943,7 @@ scrollcur_entry(VALUE self, VALUE index, VALUE type, int bang)
 
 	Data_Get_Struct(self, cursor_t, c);
 	if (!c->is_open)
-		rb_raise(rb_eRuntimeError, "Open the cursor object first");
+		rb_raise(esyms.eProgrammingError, "Open the cursor object first");
 
 	did = c->database_id;
 	EXEC SQL set connection :did;
@@ -2975,7 +2966,7 @@ scrollcur_entry(VALUE self, VALUE index, VALUE type, int bang)
 		return Qnil;
 
 	if (SQLCODE < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+		raise_ifx_extended();
 
 	RECORD(c, type, bang, record);
 	return make_result(c, record);
@@ -3126,7 +3117,7 @@ scrollcur_rel(int argc, VALUE *argv, VALUE self, int dir, VALUE type, int bang)
 
 	Data_Get_Struct(self, cursor_t, c);
 	if (!c->is_open)
-		rb_raise(rb_eRuntimeError, "Open the cursor object first");
+		rb_raise(esyms.eProgrammingError, "Open the cursor object first");
 
 	did = c->database_id;
 	EXEC SQL set connection :did;
@@ -3144,7 +3135,7 @@ scrollcur_rel(int argc, VALUE *argv, VALUE self, int dir, VALUE type, int bang)
 		return Qnil;
 
 	if (SQLCODE < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+		raise_ifx_extended();
 
 	RECORD(c, type, bang, record);
 	return make_result(c, record);
@@ -3492,18 +3483,6 @@ cursor_alloc(VALUE klass)
 	return Data_Wrap_Struct(klass, cursor_mark, cursor_free, c);
 }
 
-/*
- * call-seq:
- * Cursor.new(database, query, options = nil) => cursor
- *
- * Prepares <i>query</i> in the context of <i>database</i> with <i>options</i>
- * and returns a <code>Cursor</code> object.
- *
- * <i>options</i> can be nil or a Hash object with the following possible keys:
- *
- *   :scroll => true or false
- *   :hold   => true or false
- */
 static VALUE
 cursor_initialize(int argc, VALUE *argv, VALUE self)
 {
@@ -3521,7 +3500,7 @@ cursor_initialize(int argc, VALUE *argv, VALUE self)
 
 	EXEC SQL set connection :did;
 	if (SQLCODE < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+		raise_ifx_extended();
 
 	Data_Get_Struct(self, cursor_t, c);
 	c->db = db;
@@ -3540,7 +3519,7 @@ cursor_initialize(int argc, VALUE *argv, VALUE self)
 
 	EXEC SQL prepare :sid from :c_query;
 	if (SQLCODE < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+		raise_ifx_extended();
 
 	if (RTEST(scroll) && RTEST(hold))
 		EXEC SQL declare :cid scroll cursor with hold for :sid;
@@ -3552,7 +3531,7 @@ cursor_initialize(int argc, VALUE *argv, VALUE self)
 		EXEC SQL declare :cid cursor for :sid;
 
 	if (SQLCODE < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+		raise_ifx_extended();
 
 	alloc_input_slots(c, c_query);
 	EXEC SQL describe :sid into output;
@@ -3574,6 +3553,37 @@ cursor_initialize(int argc, VALUE *argv, VALUE self)
 	return self;
 }
 
+static VALUE cursor_drop(VALUE self);
+/*
+ * call-seq:
+ * Cursor.new(database, query, options)                    => cursor
+ * Cursor.new(database, query, options) {|cursor| block }  => obj
+ *
+ * Creates a Cursor object based on <i>query</i> using <i>options</i>
+ * in the context of <i>database</i> but does not open it.
+ * In the first form the Cursor object is returned.
+ * In the second form the Cursor object is passed to the block and when it
+ * terminates, the Cursor object is dropped, returning the value of the block.
+ * 
+ * <i>options</i> can be nil or a Hash object with the following possible keys:
+ * 
+ *   :scroll => true or false
+ *   :hold   => true or false
+ */
+static VALUE
+rb_cursor_s_new(int argc, VALUE *argv, VALUE klass)
+{
+	VALUE cursor;
+
+	cursor = rb_class_new_instance(argc, argv, klass);
+
+	if (rb_block_given_p())
+		return rb_ensure(rb_yield, cursor, cursor_drop, cursor);
+
+	return cursor;
+}
+
+static VALUE cursor_open(int argc, VALUE *argv, VALUE self);
 /*
  * call-seq:
  * Cursor.open(database, query, options)                    => cursor
@@ -3591,8 +3601,6 @@ cursor_initialize(int argc, VALUE *argv, VALUE self)
  *   :hold   => true or false
  *   :params => input parameters as an Array or nil
  */
-static VALUE cursor_open(int argc, VALUE *argv, VALUE self);
-static VALUE cursor_drop(VALUE self);
 static VALUE
 cursor_s_open(int argc, VALUE *argv, VALUE klass)
 {
@@ -3609,7 +3617,7 @@ cursor_s_open(int argc, VALUE *argv, VALUE klass)
 		if (TYPE(params) == T_ARRAY)
 			open_argc = RARRAY(params)->len;
 		else if (params != Qnil)
-			rb_raise(rb_eRuntimeError, "Parameters must be supplied as an Array");
+			rb_raise(rb_eArgError, "Parameters must be supplied as an Array");
 	}
 
 	cursor = rb_class_new_instance(argc, argv, klass);
@@ -3662,7 +3670,7 @@ cursor_open(int argc, VALUE *argv, VALUE self)
 	did = c->database_id;
 	EXEC SQL set connection :did;
 	if (SQLCODE < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+		raise_ifx_extended();
 
 	input = &c->daInput;
 	cid = c->cursor_id;
@@ -3685,7 +3693,7 @@ cursor_open(int argc, VALUE *argv, VALUE self)
 		EXEC SQL open :cid;
 
 	if (SQLCODE < 0)
-		rb_raise(rb_eRuntimeError, "Informix Error: %d", SQLCODE);
+		raise_ifx_extended();
 
 	c->is_open = 1;
 	return self;
@@ -3733,7 +3741,8 @@ void Init_informix(void)
 	rb_mInformix = rb_define_module("Informix");
 	rb_mScrollCursor = rb_define_module_under(rb_mInformix, "ScrollCursor");
 	rb_mInsertCursor = rb_define_module_under(rb_mInformix, "InsertCursor");
-	rb_define_module_function(rb_mInformix, "connect", informix_connect, -1);
+	rb_define_module_function(rb_mInformix, "connect", rb_informix_connect, -1);
+	rb_define_module_function(rb_mInformix, "version", rb_informix_version, 0);
 
 	/* class Slob --------------------------------------------------------- */
 	rb_cSlob = rb_define_class_under(rb_mInformix, "Slob", rb_cObject);
@@ -3828,6 +3837,7 @@ void Init_informix(void)
 	rb_define_alias(rb_cDatabase, "disconnect", "close");
 	rb_define_method(rb_cDatabase, "immediate", rb_database_immediate, 1);
 	rb_define_alias(rb_cDatabase, "do", "immediate");
+	rb_define_alias(rb_cDatabase, "execute", "immediate");
 	rb_define_method(rb_cDatabase, "rollback", rb_database_rollback, 0);
 	rb_define_method(rb_cDatabase, "commit", rb_database_commit, 0);
 	rb_define_method(rb_cDatabase, "transaction", rb_database_transaction, 0);
@@ -3898,6 +3908,7 @@ void Init_informix(void)
 	rb_cCursor = rb_define_class_under(rb_mInformix, "Cursor", rb_cObject);
 	rb_define_alloc_func(rb_cCursor, cursor_alloc);
 	rb_define_method(rb_cCursor, "initialize", cursor_initialize, -1);
+	rb_define_singleton_method(rb_cCursor, "new", rb_cursor_s_new, -1);
 	rb_define_singleton_method(rb_cCursor, "open", cursor_s_open, -1);
 	rb_define_method(rb_cCursor, "id", cursor_id, 0);
 	rb_define_method(rb_cCursor, "open", cursor_open, -1);
@@ -3939,4 +3950,7 @@ void Init_informix(void)
 	sym_maxbytes = ID2SYM(rb_intern("maxbytes"));
 
 	sym_params = ID2SYM(rb_intern("params"));
+
+	/* Initialize ifx_except module */
+	rbifx_except_init(rb_mInformix, &esyms);
 }