ruby-informix 0.6.2 → 0.7.0

data/{informix.ec → ext/informixc.ec}

@@ -1,55 +1,64 @@
-/* $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.
-* 
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions
-* are met:
-* 
-* 1. Redistributions of source code must retain the above copyright
-*    notice, this list of conditions and the following disclaimer.
-* 2. Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in the
-*    documentation and/or other materials provided with the distribution.
-* 3. The name of the author may not be used to endorse or promote products
-*    derived from this software without specific prior written permission.
-* 
-* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-* POSSIBILITY OF SUCH DAMAGE.
-*/
-
-static const char rcsid[] = "$Id: informix.ec,v 1.12 2007/10/14 00:18:50 santana Exp $";
+/* $Id: informixc.ec,v 1.26 2008/04/01 05:30:21 santana Exp $ */
+/*
+* Copyright (c) 2006-2008, Gerardo Santana Gomez Garrido <gerardo.santana@gmail.com>
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+static const char rcsid[] = "$Id: informixc.ec,v 1.26 2008/04/01 05:30:21 santana Exp $";
 
 #include "ruby.h"
-#include "ifx_except.h"
 
 #include <sqlstype.h>
 #include <sqltypes.h>
 
-static VALUE rb_cDate, rb_cBigDecimal;
+static VALUE rb_cDate, rb_cBigDecimal, rb_cRational;
 
+/* Modules */
 static VALUE rb_mInformix;
-static VALUE rb_mSequentialCursor;
-static VALUE rb_mScrollCursor;
-static VALUE rb_mInsertCursor;
+static VALUE rb_mInterval;
+static VALUE rb_mCursor;
 
+/* Classes */
 static VALUE rb_cSlob, rb_cSlobStat;
 static VALUE rb_cDatabase;
-static VALUE rb_cStatement;
-static VALUE rb_cCursor;
+static VALUE rb_cStatement, rb_cCursorBase;
+static VALUE rb_cSequentialCursor, rb_cScrollCursor, rb_cInsertCursor;
+static VALUE rb_cIfxVersion;
+
+static VALUE rb_cArray;
+
+/* Exceptions */
+static VALUE rb_eError, rb_eWarning, rb_eInternalError;
+static VALUE rb_eProgrammingError, rb_eOperationalError, rb_eDatabaseError;
 
 static ID s_read, s_new, s_utc, s_day, s_month, s_year;
 static ID s_hour, s_min, s_sec, s_usec, s_to_s, s_to_i;
+static ID s_add_info, s_from_months, s_from_seconds;
+static ID s_add, s_mul;
 
 static VALUE sym_name, sym_type, sym_nullable, sym_stype, sym_length;
 static VALUE sym_precision, sym_scale, sym_default, sym_xid;
@@ -58,9 +67,6 @@ 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 {
@@ -94,17 +100,162 @@ do { \
 	char *c_str = StringValueCStr(str); \
 	mint ret = ifx_int8cvasc(c_str, strlen(c_str), (int8addr)); \
 	if (ret < 0) \
-		rb_raise(esyms.eOperationalError, "Could not convert %s to int8", c_str); \
+		rb_raise(rb_eOperationalError, "Could not convert %s to INT8 [Error %d]", c_str, ret); \
 } while(0)
 
 #define INT82NUM(int8addr, num) \
 do { \
 	char str[21]; \
-	ifx_int8toasc((int8addr), str, sizeof(str) - 1); \
+	mint ret; \
+	ret = ifx_int8toasc((int8addr), str, sizeof(str) - 1); \
+	if (ret < 0) \
+		rb_raise(rb_eOperationalError, \
+			"Unable to convert INT8 to Bignum [Error %d]", ret); \
 	str[sizeof(str) - 1] = 0; \
 	num = rb_cstr2inum(str, 10); \
 } while(0)
 
+/*
+ *****************************************************************************
+ * Begins code copyrighted by Edwin M. Fine
+ *****************************************************************************
+ *
+ * Copyright (c) 2006, 2007 Edwin M. Fine <efine@finecomputerconsultants.com>
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *****************************************************************************
+ */
+#define TRIM_BLANKS(s) ((s)[byleng(s, stleng(s))] = '\0')
+#define NUM_ELEMS(arr) (sizeof(arr) / sizeof(*arr))
+
+static VALUE
+rbifx_ext_exception(VALUE exception_class)
+{
+	VALUE new_instance;
+
+	EXEC SQL BEGIN DECLARE SECTION;
+	/* All field sizes defined in IBM Informix ESQL/C Programmer's Manual */
+	int4 sql_code;
+
+	char sql_state[5 + 1];
+	char class_origin_val[255 + 1];
+	char subclass_origin_val[255 + 1];
+	char message[8191 + 1];
+	char server_name[255 + 1];
+	char connection_name[255 + 1];
+
+	mint sql_exception_number;
+	mint exc_count = 0;
+	mint message_len;
+	mint i;
+	EXEC SQL END DECLARE SECTION;
+
+    new_instance = rb_class_new_instance(0, 0, exception_class);
+
+    /* Check that instance of exception_class is derived from
+     * Informix::Error
+     */
+    if (!rb_obj_is_kind_of(new_instance, rb_eError) &&
+        !rb_obj_is_kind_of(new_instance, rb_eWarning)) {
+        rb_raise(rb_eRuntimeError,
+                "Can't instantiate exception from %s, only from %s or %s or their children",
+                rb_class2name(exception_class),
+                rb_class2name(rb_eWarning),
+                rb_class2name(rb_eError));
+    }
+    
+    EXEC SQL GET DIAGNOSTICS :exc_count = NUMBER;
+
+    if (exc_count == 0) { /* Something went wrong */
+        char message[128];
+        snprintf(message,
+                 sizeof(message),
+                 "SQL ERROR: SQLCODE %d (sorry, no GET DIAGNOSTICS information available)",
+                 SQLCODE);
+
+        {
+            VALUE argv[] = { rb_str_new2(message) };
+            return rb_class_new_instance(NUM_ELEMS(argv), argv, rb_eOperationalError);
+        }
+    }
+
+    for (i = 0; i < exc_count; ++i) {
+        sql_exception_number = i + 1;
+
+        EXEC SQL GET DIAGNOSTICS EXCEPTION :sql_exception_number
+            :sql_code            = INFORMIX_SQLCODE,
+            :sql_state           = RETURNED_SQLSTATE,
+            :class_origin_val    = CLASS_ORIGIN,
+            :subclass_origin_val = SUBCLASS_ORIGIN,
+            :message             = MESSAGE_TEXT,
+            :message_len         = MESSAGE_LENGTH,
+            :server_name         = SERVER_NAME,
+            :connection_name     = CONNECTION_NAME
+            ;
+        
+        TRIM_BLANKS(class_origin_val);
+        TRIM_BLANKS(subclass_origin_val);
+        TRIM_BLANKS(server_name);
+        TRIM_BLANKS(connection_name);
+        message[message_len - 1] = '\0';
+        TRIM_BLANKS(message);
+
+        {
+            VALUE sprintf_args[] = { rb_str_new2(message), rb_str_new2(sqlca.sqlerrm) };
+            VALUE argv[] = {
+                INT2FIX(sql_code),
+                rb_str_new2(sql_state),
+                rb_str_new2(class_origin_val),
+                rb_str_new2(subclass_origin_val),
+                rb_f_sprintf(NUM_ELEMS(sprintf_args), sprintf_args),
+                rb_str_new2(server_name),
+                rb_str_new2(connection_name)
+            };
+
+			rb_funcall(new_instance, s_add_info, 1, rb_ary_new4(7, argv));
+        }
+    }
+    
+    return new_instance;
+}
+
+/*
+ * C helper functions (see ifx_except.h for documentation)
+ */
+static void
+raise_ifx_extended(void)
+{
+    rb_exc_raise(rbifx_ext_exception(rb_eDatabaseError));
+}
+/*
+ *****************************************************************************
+ * Ends code copyrighted by Edwin M. Fine
+ *****************************************************************************
+ */
+
 /* class Slob::Stat ------------------------------------------------------ */
 
 static void
@@ -144,7 +295,7 @@ rb_slobstat_initialize(VALUE self, VALUE slob)
 	Data_Get_Struct(self, slobstat_t, stat);
 
 	if (sb->fd == -1)
-		rb_raise(esyms.eProgrammingError,
+		rb_raise(rb_eProgrammingError,
 			"Open the Slob object before getting its status");
 
 	did = sb->database_id;
@@ -167,7 +318,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(esyms.eOperationalError, "Unable to get status");
+		rb_raise(rb_eOperationalError, "Unable to get status");
 	}
 
 	return self;
@@ -322,6 +473,7 @@ slob_alloc(VALUE klass)
 	return Data_Wrap_Struct(klass, slob_mark, slob_free, slob);
 }
 
+/* :nodoc: */
 static VALUE
 rb_slob_initialize(int argc, VALUE *argv, VALUE self)
 {
@@ -347,7 +499,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(esyms.eInternalError, "Invalid type %d for an SLOB", t);
+			rb_raise(rb_eInternalError, "Invalid type %d for an SLOB", t);
 		slob->type = t;
 	}
 
@@ -378,7 +530,7 @@ rb_slob_initialize(int argc, VALUE *argv, VALUE self)
 		char *c_sbspace = StringValueCStr(sbspace);
 		ret = ifx_lo_specset_sbspace(slob->spec, c_sbspace);
 		if (ret == -1)
-			rb_raise(esyms.eOperationalError, "Could not set sbspace name to %s", c_sbspace);
+			rb_raise(rb_eOperationalError, "Could not set sbspace name to %s", c_sbspace);
 	}
 	if (!NIL_P(estbytes)) {
 		ifx_int8_t estbytes8;
@@ -386,17 +538,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(esyms.eOperationalError, "Could not set estbytes");
+			rb_raise(rb_eOperationalError, "Could not set estbytes");
 	}
 	if (!NIL_P(extsz)) {
 		ret = ifx_lo_specset_extsz(slob->spec, FIX2LONG(extsz));
 		if (ret == -1)
-			rb_raise(esyms.eOperationalError, "Could not set extsz to %d", FIX2LONG(extsz));
+			rb_raise(rb_eOperationalError, "Could not set extsz to %ld", FIX2LONG(extsz));
 	}
 	if (!NIL_P(createflags)) {
 		ret = ifx_lo_specset_flags(slob->spec, FIX2LONG(createflags));
 		if (ret == -1)
-			rb_raise(esyms.eOperationalError, "Could not set crate-time flags to 0x%X", FIX2LONG(createflags));
+			rb_raise(rb_eOperationalError, "Could not set crate-time flags to 0x%X", FIX2LONG(createflags));
 	}
 	if (!NIL_P(maxbytes)) {
 		ifx_int8_t maxbytes8;
@@ -404,7 +556,7 @@ 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(esyms.eOperationalError, "Could not set maxbytes");
+			rb_raise(rb_eOperationalError, "Could not set maxbytes");
 	}
 
 	slob->fd = ifx_lo_create(slob->spec, RTEST(openflags)? FIX2LONG(openflags): LO_RDWR, &slob->lo, &error);
@@ -414,41 +566,6 @@ rb_slob_initialize(int argc, VALUE *argv, VALUE self)
 	return self;
 }
 
-static VALUE rb_slob_close(VALUE self);
-/*
- * 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> can be nil or a Hash object 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_s_new(int argc, VALUE *argv, VALUE klass)
-{
-	VALUE slob;
-
-	slob = rb_class_new_instance(argc, argv, klass);
-
-	if (rb_block_given_p())
-		return rb_ensure(rb_yield, slob, rb_slob_close, slob);
-
-	return slob;
-}
-
 /*
  * call-seq:
  * slob.open(access = Slob::RDONLY)  => slob
@@ -552,7 +669,7 @@ rb_slob_read(VALUE self, VALUE nbytes)
 	Data_Get_Struct(self, slob_t, slob);
 
 	if (slob->fd == -1)
-		rb_raise(esyms.eProgrammingError, "Open the Slob object before reading");
+		rb_raise(rb_eProgrammingError, "Open the Slob object before reading");
 
 	did = slob->database_id;
 	EXEC SQL set connection :did;
@@ -598,7 +715,7 @@ rb_slob_write(VALUE self, VALUE data)
 	Data_Get_Struct(self, slob_t, slob);
 
 	if (slob->fd == -1)
-		rb_raise(esyms.eProgrammingError, "Open the Slob object before writing");
+		rb_raise(rb_eProgrammingError, "Open the Slob object before writing");
 
 	did = slob->database_id;
 	EXEC SQL set connection :did;
@@ -606,8 +723,8 @@ rb_slob_write(VALUE self, VALUE data)
 		raise_ifx_extended();
 
 	str = rb_obj_as_string(data);
-	buffer = RSTRING(str)->ptr;
-	nbytes = RSTRING(str)->len;
+	buffer = RSTRING_PTR(str);
+	nbytes = RSTRING_LEN(str);
 
 	ret = ifx_lo_write(slob->fd, buffer, nbytes, &error);
 
@@ -666,7 +783,7 @@ rb_slob_seek(VALUE self, VALUE offset, VALUE whence)
 	Data_Get_Struct(self, slob_t, slob);
 
 	if (slob->fd == -1)
-		rb_raise(esyms.eProgrammingError, "Open the Slob object first");
+		rb_raise(rb_eProgrammingError, "Open the Slob object first");
 
 	did = slob->database_id;
 	EXEC SQL set connection :did;
@@ -728,7 +845,7 @@ rb_slob_tell(VALUE self)
 	Data_Get_Struct(self, slob_t, slob);
 
 	if (slob->fd == -1)
-		rb_raise(esyms.eProgrammingError, "Open the Slob object first");
+		rb_raise(rb_eProgrammingError, "Open the Slob object first");
 
 	did = slob->database_id;
 	EXEC SQL set connection :did;
@@ -765,7 +882,7 @@ rb_slob_truncate(VALUE self, VALUE offset)
 	Data_Get_Struct(self, slob_t, slob);
 
 	if (slob->fd == -1)
-		rb_raise(esyms.eProgrammingError, "Open the Slob object first");
+		rb_raise(rb_eProgrammingError, "Open the Slob object first");
 
 	did = slob->database_id;
 	EXEC SQL set connection :did;
@@ -821,7 +938,7 @@ 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(esyms.eProgrammingError, "Open the Slob object first");
+		rb_raise(rb_eProgrammingError, "Open the Slob object first");
 
 	did = slob->database_id;
 	EXEC SQL set connection :did;
@@ -865,7 +982,7 @@ rb_slob_unlock(VALUE self, VALUE offset, VALUE whence, VALUE range)
 	Data_Get_Struct(self, slob_t, slob);
 
 	if (slob->fd == -1)
-		rb_raise(esyms.eProgrammingError, "Open the Slob object first");
+		rb_raise(rb_eProgrammingError, "Open the Slob object first");
 
 	did = slob->database_id;
 	EXEC SQL set connection :did;
@@ -906,7 +1023,7 @@ slob_specget(VALUE self, slob_option_t option)
 	Data_Get_Struct(self, slob_t, slob);
 
 	if (slob->fd == -1)
-		rb_raise(esyms.eProgrammingError, "Open the Slob object first");
+		rb_raise(rb_eProgrammingError, "Open the Slob object first");
 
 	did = slob->database_id;
 	EXEC SQL set connection :did;
@@ -920,7 +1037,7 @@ slob_specget(VALUE self, slob_option_t option)
 	spec = ifx_lo_stat_cspec(stat);
 	if (spec == NULL) {
 		ifx_lo_stat_free(stat);
-		rb_raise(esyms.eOperationalError, "Unable to get storage characteristics");
+		rb_raise(rb_eOperationalError, "Unable to get storage characteristics");
 	}
 
 	switch(option) {
@@ -942,7 +1059,7 @@ slob_specget(VALUE self, slob_option_t option)
 
 	ifx_lo_stat_free(stat);
 	if (ret == -1)
-		rb_raise(esyms.eOperationalError, "Unable to get information for %s", str_slob_options[option]);
+		rb_raise(rb_eOperationalError, "Unable to get information for %s", str_slob_options[option]);
 
 	switch(option) {
 	case slob_estbytes:
@@ -976,7 +1093,7 @@ slob_specset(VALUE self, slob_option_t option, VALUE value)
 	Data_Get_Struct(self, slob_t, slob);
 
 	if (slob->fd == -1)
-		rb_raise(esyms.eProgrammingError, "Open the Slob object first");
+		rb_raise(rb_eProgrammingError, "Open the Slob object first");
 
 	did = slob->database_id;
 	EXEC SQL set connection :did;
@@ -990,7 +1107,7 @@ slob_specset(VALUE self, slob_option_t option, VALUE value)
 	spec = ifx_lo_stat_cspec(stat);
 	if (spec == NULL) {
 		ifx_lo_stat_free(stat);
-		rb_raise(esyms.eOperationalError, "Unable to get storage characteristics");
+		rb_raise(rb_eOperationalError, "Unable to get storage characteristics");
 	}
 
 	switch(option) {
@@ -1006,7 +1123,7 @@ slob_specset(VALUE self, slob_option_t option, VALUE value)
 
 	ifx_lo_stat_free(stat);
 	if (ret == -1)
-		rb_raise(esyms.eOperationalError, "Unable to set information for %s", str_slob_options[option]);
+		rb_raise(rb_eOperationalError, "Unable to set information for %s", str_slob_options[option]);
 
 	return value;
 }
@@ -1118,7 +1235,7 @@ slob_stat(VALUE self, slob_stat_t stat)
 	Data_Get_Struct(self, slob_t, slob);
 
 	if (slob->fd == -1)
-		rb_raise(esyms.eProgrammingError,
+		rb_raise(rb_eProgrammingError,
 			"Open the Slob object before getting its status");
 
 	did = slob->database_id;
@@ -1151,7 +1268,7 @@ slob_stat(VALUE self, slob_stat_t stat)
 	ifx_lo_stat_free(st);
 
 	if (ret == -1)
-		rb_raise(esyms.eOperationalError, "Unable to get value of %s", str_slob_stats[stat]);
+		rb_raise(rb_eOperationalError, "Unable to get value of %s", str_slob_stats[stat]);
 
 	switch(stat) {
 		case slob_atime:
@@ -1324,7 +1441,7 @@ alloc_output_slots(cursor_t *c)
 			p->loc_loctype = LOCMEMORY;
 			p->loc_bufsize = -1;
 		}
-		if (var->sqltype == SQLDTIME) {
+		if (var->sqltype == SQLDTIME || var->sqltype == SQLINTERVAL) {
 			var->sqllen = 0;
 		}
 	}
@@ -1458,26 +1575,11 @@ bind_input_params(cursor_t *c, VALUE *argv)
 			break;
 		default:
 			klass = rb_obj_class(data);
-			if (klass == rb_cDate) {
-				int2 mdy[3];
-				int4 date;
-
-				mdy[0] = FIX2INT(rb_funcall(data, s_month, 0));
-				mdy[1] = FIX2INT(rb_funcall(data, s_day, 0));
-				mdy[2] = FIX2INT(rb_funcall(data, s_year, 0));
-				rmdyjul(mdy, &date);
-
-				var->sqldata = (char *)ALLOC(int4);
-				*((int4 *)var->sqldata) = date;
-				var->sqltype = CDATETYPE;
-				var->sqllen = sizeof(int4);
-				*var->sqlind = 0;
-				break;
-			}
 			if (klass == rb_cTime) {
 				char buffer[30];
 				short year, month, day, hour, minute, second;
 				int usec;
+				mint ret;
 				dtime_t *dt;
 
 				year = FIX2INT(rb_funcall(data, s_year, 0));
@@ -1493,7 +1595,11 @@ bind_input_params(cursor_t *c, VALUE *argv)
 				dt->dt_qual = TU_DTENCODE(TU_YEAR, TU_F5);
 				snprintf(buffer, sizeof(buffer), "%d-%d-%d %d:%d:%d.%d",
 					year, month, day, hour, minute, second, usec/10);
-				dtcvasc(buffer, dt);
+				ret = dtcvasc(buffer, dt);
+				if (ret < 0)
+					rb_raise(rb_eOperationalError,
+						"Unable to convert '%s' to DATETIME [Error %d]",
+						RSTRING_PTR(data), ret);
 
 				var->sqldata = (char *)dt;
 				var->sqltype = CDTIMETYPE;
@@ -1514,25 +1620,14 @@ bind_input_params(cursor_t *c, VALUE *argv)
 				*var->sqlind = 0;
 				break;
 			}
-			if (klass == rb_cBigDecimal) {
-				data = rb_funcall(data, s_to_s, 0);
-				var->sqldata = (char *)ALLOC(dec_t);
-				deccvasc(RSTRING(data)->ptr, RSTRING(data)->len,
-					(dec_t *)var->sqldata);
-				var->sqltype = CDECIMALTYPE;
-				var->sqllen = sizeof(dec_t);
-				*var->sqlind = 0;
-				break;
-			}
 			if (rb_respond_to(data, s_read)) {
 				char *str;
 				loc_t *loc;
 				long len;
 
 				data = rb_funcall(data, s_read, 0);
-				data = StringValue(data);
-				str = RSTRING(data)->ptr;
-				len = RSTRING(data)->len;
+				str = RSTRING_PTR(data);
+				len = RSTRING_LEN(data);
 
 				loc = (loc_t *)ALLOC(loc_t);
 				byfill((char *)loc, sizeof(loc_t), 0);
@@ -1561,8 +1656,8 @@ bind_input_params(cursor_t *c, VALUE *argv)
 			char *str;
 			long len;
 
-			str = RSTRING(data)->ptr;
-			len = RSTRING(data)->len;
+			str = RSTRING_PTR(data);
+			len = RSTRING_LEN(data);
 			var->sqldata = ALLOC_N(char, len + 1);
 			memcpy(var->sqldata, str, len);
 			var->sqldata[len] = 0;
@@ -1679,6 +1774,88 @@ make_result(cursor_t *c, VALUE record)
 
 			break;
 		}
+		case SQLINTERVAL: {
+			VALUE constructor, value;
+			intrvl_t *data, invl;
+			short sign;
+
+			data = (intrvl_t *)var->sqldata;
+			if (TU_START(data->in_qual) <= TU_MONTH) {
+				invl.in_qual = TU_IENCODE(9, TU_YEAR, TU_MONTH);
+				constructor = s_from_months;
+			}
+			else {
+				invl.in_qual = TU_IENCODE(9, TU_DAY, TU_F5);
+				constructor = s_from_seconds;
+			}
+
+			invextend(data, &invl);
+			sign = invl.in_dec.dec_pos == 0? -1 : 1;
+
+			if (TU_START(data->in_qual) <= TU_MONTH) {
+				int i, exp, months;
+				long years;
+				char *dgts;
+
+				exp = invl.in_dec.dec_exp;
+				dgts = invl.in_dec.dec_dgts;
+				months = years = 0;
+
+				for(i = 0; i < invl.in_dec.dec_ndgts; i++, exp--) {
+					if (exp > 5)
+						years = years*100 + dgts[i];
+					else
+						months += dgts[i];
+				}
+				for(i = exp - 5; i > 0; i--)
+					years *= 100;
+				value = LONG2NUM(sign*years);
+				value = rb_funcall(value, s_mul, 1, INT2FIX(12));
+				value = rb_funcall(value, s_add, 1, INT2FIX(sign*months));
+			}
+			else {
+				int i, exp, usec;
+				long days, seconds;
+				char *dgts;
+
+				exp = invl.in_dec.dec_exp;
+				dgts = invl.in_dec.dec_dgts;
+				days = seconds = usec = 0;
+
+				for(i = 0; i < invl.in_dec.dec_ndgts; i++, exp--) {
+					if(exp > 3)
+						days = days*100 + dgts[i];
+					else if (exp == 3)
+						seconds += dgts[i]*60*60;
+					else if (exp == 2)
+						seconds += dgts[i]*60;
+					else if (exp == 1)
+						seconds += dgts[i];
+					else if (exp == 0)
+						usec += dgts[i]*10000;
+					else if (exp == -1)
+						usec += dgts[i]*100;
+					else if (exp == -2)
+						usec += dgts[i];
+				}
+
+				for(i = exp - 3; i > 0; i--)
+					days *= 100;
+
+				value = LONG2FIX(days);
+				value = rb_funcall(value, s_mul, 1, LONG2FIX(sign*24*60*60));
+				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 = rb_funcall(frac, s_add, 1, value);
+				}
+			}
+
+			item = rb_funcall(rb_mInterval, constructor, 1, value);
+			break;
+		}
 		case SQLDECIMAL:
 		case SQLMONEY: {
 			char buffer[40];
@@ -1686,9 +1863,9 @@ make_result(cursor_t *c, VALUE record)
 
 			ret = dectoasc((dec_t *)var->sqldata, buffer,
 					sizeof(buffer) - 1, -1);
-			if (ret)
-				rb_raise(esyms.eOperationalError,
-					"Unable to convert DECIMAL to BigDecimal");
+			if (ret < 0)
+				rb_raise(rb_eOperationalError,
+					"Unable to convert DECIMAL to BigDecimal [Error %d]", ret);
 
 			buffer[sizeof(buffer) - 1] = 0;
 			item = rb_funcall(rb_cBigDecimal, s_new, 1, rb_str_new2(buffer));
@@ -1744,46 +1921,6 @@ make_result(cursor_t *c, VALUE record)
 	return 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
- * Informix.connect(dbname, user=nil, password=nil) {|database| block }  => obj
- *
- * Creates a <code>Database</code> object connected to <i>dbname</i> as
- * <i>user</i> with <i>password</i>. If these are not given, connects to
- * <i>dbname</i> as the current user.
- *
- * The Database object is passed to the block if it's given, and automatically
- * closes the connection when the block terminates, returning the value of
- * the block.
- */
-static VALUE
-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.1";
-	static VALUE driver_version;
-
-	if (driver_version == 0)
-		driver_version = rb_str_freeze(rb_str_new2(ver));
-
-	return driver_version;
-}
-
 /* class Database --------------------------------------------------------- */
 
 static void
@@ -1808,19 +1945,25 @@ database_alloc(VALUE klass)
 	return Data_Wrap_Struct(klass, 0, database_free, did);
 }
 
+/* :nodoc: */
 static VALUE
 rb_database_initialize(int argc, VALUE *argv, VALUE self)
 {
-	VALUE arg[3];
+	VALUE arg[3], version;
+	VALUE server_type, major, minor, os, level, full;
 
 	EXEC SQL begin declare section;
 		char *dbname, *user = NULL, *pass = NULL, *did;
+		struct version_t {
+			varchar server_type[41], major[3], minor[3], os[3], level[3];
+			varchar full[61];
+		} c_version;
 	EXEC SQL end   declare section;
 
 	rb_scan_args(argc, argv, "12", &arg[0], &arg[1], &arg[2]);
 
 	if (NIL_P(arg[0]))
-		rb_raise(esyms.eProgrammingError, "A database name must be specified");
+		rb_raise(rb_eProgrammingError, "A database name must be specified");
 
 	Data_Get_Struct(self, char, did);
 
@@ -1842,36 +1985,28 @@ rb_database_initialize(int argc, VALUE *argv, VALUE self)
 	if (SQLCODE < 0)
 		raise_ifx_extended();
 
-	return self;
-}
+	EXEC SQL select dbinfo('version', 'server-type'),
+					dbinfo('version', 'major'),
+					dbinfo('version', 'minor'),
+					dbinfo('version', 'os'),
+					dbinfo('version', 'level'),
+					dbinfo('version', 'full')
+			  into :c_version from systables where tabid = 1;
 
-/*
- * call-seq:
- * Database.new(dbname, user = nil, password = nil)                      => database
- * Database.open(dbname, user = nil, password = nil)                      => database
- * Database.new(dbname, user = nil, password = nil) {|database| block }  => obj
- * Database.open(dbname, user = nil, password = nil) {|database| block }  => obj
- *
- * Creates a <code>Database</code> object connected to <i>dbname</i> as
- * <i>user</i> with <i>password</i>. If these are not given, connects to
- * <i>dbname</i> as the current user.
- *
- * The Database object is passed to the block if it's given, and automatically
- * closes the connection when the block terminates, returning the value of
- * the block.
- */
-static VALUE rb_database_close(VALUE self);
-static VALUE
-rb_database_s_open(int argc, VALUE *argv, VALUE klass)
-{
-	VALUE database;
 
-	database = rb_class_new_instance(argc, argv, klass);
+	OBJ_FREEZE(server_type = rb_str_new2(c_version.server_type));
+	OBJ_FREEZE(major = rb_str_new2(c_version.major));
+	OBJ_FREEZE(minor = rb_str_new2(c_version.minor));
+	OBJ_FREEZE(os = rb_str_new2(c_version.os));
+	OBJ_FREEZE(level = rb_str_new2(c_version.level));
+	OBJ_FREEZE(full = rb_str_new2(c_version.full));
 
-	if (rb_block_given_p())
-		return rb_ensure(rb_yield, database, rb_database_close, database);
+	version = rb_struct_new(rb_cIfxVersion, server_type, major, minor, os,
+							level, full, NULL);
+	OBJ_FREEZE(version);
+	rb_iv_set(self, "@version", version);
 
-	return database;
+	return self;
 }
 
 /*
@@ -1904,7 +2039,17 @@ rb_database_close(VALUE self)
  *
  * Executes <i>query</i> and returns the number of rows affected.
  * <i>query</i> must not return rows. Executes efficiently any
- * non-parameterized or DQL statement.
+ * DDL (CREATE, DROP, ALTER), DCL (GRANT, REVOKE) and non-parameterized
+ * DML (INSERT, UPDATE, DELETE) statements, except SELECT.
+ *
+ * Examples:
+ *
+ * Granting CONNECT to user:
+ *   db.immediate "grant connect to #{user}"
+ * Creating a table:
+ *   db.immediate 'create table test(id serial, code char(2), desc varchar(30))'
+ * Deleting records:
+ *   db.immediate 'delete from test where id = 7'
  */
 
 static VALUE
@@ -1990,6 +2135,20 @@ database_transfail(VALUE self)
  * otherwise.
  *
  * Returns __self__.
+ *
+ * Examples:
+ *
+ * A bulk insert using an insert cursor. Requires a transaction:
+ *   db.transaction do |db|
+ *     db.cursor('insert into stock values(?, ?, ?, ?, ?, ?)') |cur|
+ *       cur.open
+ *       # Loading a file separated by '|'
+ *       File.open(filename).each do |line|
+ *         fields = line.split('|')
+ *         cur.put(*fields)
+ *       end
+ *     end
+ *   end
  */
 static VALUE
 rb_database_transaction(VALUE self)
@@ -2010,91 +2169,11 @@ rb_database_transaction(VALUE self)
 	EXEC SQL begin work;
 	ret = rb_rescue(rb_yield, self, database_transfail, self);
 	if (ret == Qundef)
-		rb_raise(esyms.eOperationalError, "Transaction rolled back");
+		rb_raise(rb_eOperationalError, "Transaction rolled back");
 	EXEC SQL commit;
 	return self;
 }
 
-static VALUE statement_s_new(int, VALUE *, VALUE);
-/*
- * call-seq:
- * db.prepare(query)                  => statement
- * db.prepare(query) {|stmt| block }  => obj
- *
- * Creates a <code>Statement</code> object based on <i>query</i>.
- * In the first form the Statement 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>Database#cursor</code> instead.)
- */
-static VALUE
-rb_database_prepare(VALUE self, VALUE query)
-{
-	VALUE argv[2];
-
-	argv[0] = self; argv[1] = 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
- *
- * Returns a <code>Cursor</code> object based on <i>query</i>.
- * <i>query</i> may contain '?' placeholders for input parameters.
- *
- * <i>options</i> must be a hash with the following possible keys:
- *
- *   :scroll => true or false
- *   :hold   => true or false
- *
- */
-static VALUE
-rb_database_cursor(int argc, VALUE *argv, VALUE self)
-{
-	VALUE arg[3];
-
-	arg[0] = self;
-	rb_scan_args(argc, argv, "11", &arg[1], &arg[2]);
-	return rb_cursor_s_new(3, arg, rb_cCursor);
-}
-
-/*
- * call-seq:
- * db.slob(type = Slob::CLOB, options = nil)                  => slob
- * db.slob(type = Slob::CLOB, options = nil) {|slob| block }  => obj
- *
- * Creates a Smart Large Object of type <i>type</i>.
- * Returns a <code>Slob</code> object pointing to it.
- *
- * <i>type</i> can be Slob::BLOB or Slob::CLOB
- *
- * <i>options</i> can be nil or a Hash object 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_database_slob(int argc, VALUE *argv, VALUE self)
-{
-	VALUE arg[3];
-
-	arg[0] = self;
-	rb_scan_args(argc, argv, "02", &arg[1], &arg[2]);
-	return rb_slob_s_new(3, arg, rb_cSlob);
-}
-
 /*
  * call-seq:
  * db.columns(tablename)  => array
@@ -2139,7 +2218,7 @@ rb_database_columns(VALUE self, VALUE tablename)
 	EXEC SQL select tabid into :tabid from systables where tabname = :tabname;
 
 	if (SQLCODE == SQLNOTFOUND)
-		rb_raise(esyms.eProgrammingError, "Table '%s' doesn't exist", tabname);
+		rb_raise(rb_eProgrammingError, "Table '%s' doesn't exist", tabname);
 
 	result = rb_ary_new();
 
@@ -2287,22 +2366,28 @@ statement_mark(cursor_t *c)
 }
 
 static void
-statement_free(void *p)
+st_free(cursor_t *c)
 {
 	EXEC SQL begin declare section;
 		char *sid, *did;
 	EXEC SQL end   declare section;
 
-	free_input_slots(p);
-	free_output_slots(p);
+	free_input_slots(c);
+	free_output_slots(c);
 
-	did = ((cursor_t *)p)->database_id;
+	did = c->database_id;
 	EXEC SQL set connection :did;
-	if (SQLCODE >= 0) {
-		sid = ((cursor_t *)p)->stmt_id;
-		EXEC SQL free :sid;
-	}
+	if (SQLCODE < 0)
+		return;
 
+	sid = c->stmt_id;
+	EXEC SQL free :sid;
+}
+
+static void
+statement_free(void *p)
+{
+	st_free(p);
 	xfree(p);
 }
 
@@ -2316,8 +2401,9 @@ statement_alloc(VALUE klass)
 	return Data_Wrap_Struct(klass, statement_mark, statement_free, c);
 }
 
+/* :nodoc: */
 static VALUE
-statement_initialize(VALUE self, VALUE db, VALUE query)
+rb_statement_initialize(VALUE self, VALUE db, VALUE query)
 {
 	struct sqlda *output;
 	cursor_t *c;
@@ -2358,48 +2444,31 @@ statement_initialize(VALUE self, VALUE db, VALUE query)
 	return self;
 }
 
-static VALUE statement_drop(VALUE);
-/*
- * 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_s_new(int argc, VALUE *argv, VALUE klass)
-{
-	VALUE stmt;
-
-	stmt = rb_class_new_instance(argc, argv, klass);
-
-	if (rb_block_given_p())
-		return rb_ensure(rb_yield, stmt, statement_drop, stmt);
-
-	return stmt;
-}
-
 /*
  * call-seq:
- * stmt[*params]  => fixnum or hash
+ * st[*params]  => fixnum or hash
  *
  * Executes the previously prepared statement, binding <i>params</i> as
  * input parameters.
  *
  * Returns the record retrieved, in the case of a singleton select, or the
  * number of rows affected, in the case of any other statement.
+ *
+ * Examples:
+ *
+ * Inserting records:
+ *   db.prepare('insert into state values(?, ?)') do |st|
+ *     st.execute('CA', 'California')
+ *     st.call('AZ', 'Arizona')
+ *     st['TX', 'Texas')
+ *   end
+ * Selecting one record (returns a hash):
+ *   cust = db.prepare('select * from customer where num = 101') do |st|
+ *            st.execute
+ *          end
  */
 static VALUE
-statement_call(int argc, VALUE *argv, VALUE self)
+rb_statement_call(int argc, VALUE *argv, VALUE self)
 {
 	struct sqlda *input, *output;
 	cursor_t *c;
@@ -2456,40 +2525,29 @@ statement_call(int argc, VALUE *argv, VALUE self)
 
 /*
  * call-seq:
- * stmt.drop
+ * st.drop
  *
  * Frees the statement and the memory associated with it.
  */
 static VALUE
-statement_drop(VALUE self)
+rb_statement_drop(VALUE self)
 {
 	cursor_t *c;
-	EXEC SQL begin declare section;
-		char *sid, *did;
-	EXEC SQL end   declare section;
 
 	Data_Get_Struct(self, cursor_t, c);
-	free_input_slots(c);
-	free_output_slots(c);
-
-	did = c->database_id;
-	EXEC SQL set connection :did;
-	if (SQLCODE < 0)
-		return Qnil;
-	sid = c->stmt_id;
-	EXEC SQL free :sid;
+	st_free(c);
 
 	return Qnil;
 }
 
-/* module SequentialCursor ----------------------------------------------- */
+/* class SequentialCursor ------------------------------------------------ */
 
 /* 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 {\
-	if (type == T_ARRAY) {\
+	if (type == rb_cArray) {\
 		if (bang) {\
 			if (!c->array)\
 				c->array = rb_ary_new2(c->daOutput->sqld);\
@@ -2513,18 +2571,19 @@ do {\
  * Base function for fetch* methods, except *_many
  */
 static VALUE
-fetch(VALUE self, VALUE type, int bang)
+fetch(VALUE self, VALUE type, VALUE bang)
 {
 	EXEC SQL begin declare section;
 		char *cid, *did;
 	EXEC SQL end   declare section;
+	short c_bang;
 	cursor_t *c;
 	struct sqlda *output;
 	VALUE record;
 
 	Data_Get_Struct(self, cursor_t, c);
 	if (!c->is_open)
-		rb_raise(esyms.eProgrammingError, "Open the cursor object first");
+		rb_raise(rb_eProgrammingError, "Open the cursor object first");
 
 	did = c->database_id;
 	EXEC SQL set connection :did;
@@ -2541,72 +2600,11 @@ fetch(VALUE self, VALUE type, int bang)
 	if (SQLCODE == SQLNOTFOUND)
 		return Qnil;
 
-	RECORD(c, type, bang, record);
+	c_bang = RTEST(bang);
+	RECORD(c, type, c_bang, record);
 	return make_result(c, record);
 }
 
-/*
- * call-seq:
- * cursor.fetch  => array or nil
- *
- * Fetches the next record.
- *
- * Returns the record fetched as an array, or nil if there are no
- * records left.
- */
-static VALUE
-seqcur_fetch(VALUE self)
-{
-	return fetch(self, T_ARRAY, 0);
-}
-
-/*
- * call-seq:
- * cursor.fetch!  => array or nil
- *
- * Fetches the next record, storing it in the same Array object every time
- * it is called.
- * 
- * Returns the record fetched as an array, or nil if there are no
- * records left.
- */
-static VALUE
-seqcur_fetch_bang(VALUE self)
-{
-	return fetch(self, T_ARRAY, 1);
-}
-
-/*
- * call-seq:
- * cursor.fetch_hash  => hash or nil
- *
- * Fetches the next record.
- *
- * Returns the record fetched as a hash, or nil if there are no
- * records left.
- */
-static VALUE
-seqcur_fetch_hash(VALUE self)
-{
-	return fetch(self, T_HASH, 0);
-}
-
-/*
- * call-seq:
- * cursor.fetch_hash!  => hash or nil
- *
- * Fetches the next record, storing it in the same Hash object every time
- * it is called.
- * 
- * Returns the record fetched as a hash, or nil if there are no
- * records left.
- */
-static VALUE
-seqcur_fetch_hash_bang(VALUE self)
-{
-	return fetch(self, T_HASH, 1);
-}
-
 /*
  * Base function for fetch*_many, fetch*_all and each_by methods
  */
@@ -2624,7 +2622,7 @@ fetch_many(VALUE self, VALUE n, VALUE type)
 
 	Data_Get_Struct(self, cursor_t, c);
 	if (!c->is_open)
-		rb_raise(esyms.eProgrammingError, "Open the cursor object first");
+		rb_raise(rb_eProgrammingError, "Open the cursor object first");
 
 	did = c->database_id;
 	EXEC SQL set connection :did;
@@ -2650,7 +2648,7 @@ fetch_many(VALUE self, VALUE n, VALUE type)
 		if (SQLCODE == SQLNOTFOUND)
 			break;
 
-		if (type == T_ARRAY)
+		if (type == rb_cArray)
 			record = rb_ary_new2(c->daOutput->sqld);
 		else
 			record = rb_hash_new();
@@ -2660,73 +2658,24 @@ fetch_many(VALUE self, VALUE n, VALUE type)
 	return records;
 }
 
-/*
- * call-seq:
- * cursor.fetch_many(n)  => array
- *
- * Reads at most <i>n</i> records.
- *
- * Returns the records read as an array of arrays
- */
-static VALUE
-seqcur_fetch_many(VALUE self, VALUE n)
-{
-	return fetch_many(self, n, T_ARRAY);
-}
-
-/*
- * call-seq:
- * cursor.fetch_hash_many(n)  => array
- *
- * Reads at most <i>n</i> records.
- * Returns the records read as an array of hashes.
- */
-static VALUE
-seqcur_fetch_hash_many(VALUE self, VALUE n)
-{
-	return fetch_many(self, n, T_HASH);
-}
-
-/*
- * call-seq:
- * cursor.fetch_all  => array
- *
- * Returns all the records left as an array of arrays
- */
-static VALUE
-seqcur_fetch_all(VALUE self)
-{
-	return fetch_many(self, Qnil, T_ARRAY);
-}
-
-/*
- * call-seq:
- * cursor.fetch_hash_all  => array
- *
- * Returns all the records left as an array of hashes
- */
-static VALUE
-seqcur_fetch_hash_all(VALUE self)
-{
-	return fetch_many(self, Qnil, T_HASH);
-}
 
 /*
  * Base function for each* methods, except each*_by
  */
 static VALUE
-each(VALUE self, VALUE type, int bang)
+each(VALUE self, VALUE type, VALUE bang)
 {
 	cursor_t *c;
 	EXEC SQL begin declare section;
 		char *cid, *did;
 	EXEC SQL end   declare section;
+	short c_bang;
 	struct sqlda *output;
 	VALUE record;
 
 	Data_Get_Struct(self, cursor_t, c);
 	if (!c->is_open)
-		rb_raise(esyms.eProgrammingError, "Open the cursor object first");
+		rb_raise(rb_eProgrammingError, "Open the cursor object first");
 
 	did = c->database_id;
 	EXEC SQL set connection :did;
@@ -2743,7 +2692,8 @@ each(VALUE self, VALUE type, int bang)
 
 		if (SQLCODE == SQLNOTFOUND)
 			return self;
-		RECORD(c, type, bang, record);
+		c_bang = RTEST(bang);
+		RECORD(c, type, c_bang, record);
 		rb_yield(make_result(c, record));
 	}
 }
@@ -2764,111 +2714,33 @@ each_by(VALUE self, VALUE n, VALUE type)
 	}
 }
 
-/*
- * call-seq:
- * cursor.each {|record| block } => cursor
- *
- * Iterates over the remaining records, passing each <i>record</i> to the
- * <i>block</i> as an array.
- *
- * Returns __self__.
- */
-static VALUE
-seqcur_each(VALUE self)
-{
-	return each(self, T_ARRAY, 0);
-}
+/* class InsertCursor ---------------------------------------------------- */
 
 /*
  * call-seq:
- * cursor.each! {|record| block } => cursor
+ * cursor.put(*params)
+ *
+ * Binds +params+ as input parameters and executes the insert statement.
+ * The records are not written immediatly to disk, unless the insert buffer
+ * is full, the +flush+ method is called, the cursor is closed or
+ * the transaction is commited.
  *
- * Iterates over the remaining records, passing each <i>record</i> to the
- * <i>block</i> as an array. No new Array objects are created for each record.
- * The same Array object is reused in each call.
+ * Examples:
  *
- * Returns __self__.
+ * A bulk insert using an insert cursor. Requires a transaction:
+ *   db.transaction do |db|
+ *     db.cursor('insert into stock values(?, ?, ?, ?, ?, ?)') |cur|
+ *       cur.open
+ *       # Loading a file separated by '|'
+ *       File.open(filename).each do |line|
+ *         fields = line.split('|')
+ *         cur.put(*fields)
+ *       end
+ *     end
+ *   end
  */
 static VALUE
-seqcur_each_bang(VALUE self)
-{
-	return each(self, T_ARRAY, 1);
-}
-
-/*
- * call-seq:
- * cursor.each_hash {|record| block } => cursor
- *
- * Iterates over the remaining records, passing each <i>record</i> to the
- * <i>block</i> as a hash.
- *
- * Returns __self__.
- */
-static VALUE
-seqcur_each_hash(VALUE self)
-{
-	return each(self, T_HASH, 0);
-}
-
-/*
- * call-seq:
- * cursor.each_hash! {|record| block } => cursor
- *
- * Iterates over the remaining records, passing each <i>record</i> to the
- * <i>block</i> as a hash. No new Hash objects are created for each record.
- * The same Hash object is reused in each call.
- *
- * Returns __self__.
- */
-static VALUE
-seqcur_each_hash_bang(VALUE self)
-{
-	return each(self, T_HASH, 1);
-}
-
-/*
- * call-seq:
- * cursor.each_by(n) {|records| block } => cursor
- *
- * Iterates over the remaining records, passing at most <i>n</i> <i>records</i>
- * to the <i>block</i> as arrays.
- *
- * Returns __self__.
- */
-static VALUE
-seqcur_each_by(VALUE self, VALUE n)
-{
-	return each_by(self, n, T_ARRAY);
-}
-
-/*
- * call-seq:
- * cursor.each_hash_by(n) {|records| block } => cursor
- *
- * Iterates over the remaining records, passing at most <i>n</i> <i>records</i>
- * to the <i>block</i> as hashes.
- *
- * Returns __self__.
- */
-static VALUE
-seqcur_each_hash_by(VALUE self, VALUE n)
-{
-	return each_by(self, n, T_HASH);
-}
-
-/* module InsertCursor --------------------------------------------------- */
-
-/*
- * call-seq:
- * cursor.put(*params)
- *
- * Binds <i>params</i> as input parameters and executes the insert statement.
- * The records are not written immediatly to disk, unless the insert buffer
- * is full, the <code>flush</code> method is called, the cursor is closed or
- * the transaction is commited.
- */
-static VALUE
-inscur_put(int argc, VALUE *argv, VALUE self)
+rb_inscur_put(int argc, VALUE *argv, VALUE self)
 {
 	struct sqlda *input;
 	cursor_t *c;
@@ -2878,7 +2750,7 @@ inscur_put(int argc, VALUE *argv, VALUE self)
 
 	Data_Get_Struct(self, cursor_t, c);
 	if (!c->is_open)
-		rb_raise(esyms.eProgrammingError, "Open the cursor object first");
+		rb_raise(rb_eProgrammingError, "Open the cursor object first");
 
 	did = c->database_id;
 	EXEC SQL set connection :did;
@@ -2911,7 +2783,7 @@ inscur_put(int argc, VALUE *argv, VALUE self)
  * Returns __self__.
  */
 static VALUE
-inscur_flush(VALUE self)
+rb_inscur_flush(VALUE self)
 {
 	cursor_t *c;
 	EXEC SQL begin declare section;
@@ -2920,7 +2792,7 @@ inscur_flush(VALUE self)
 
 	Data_Get_Struct(self, cursor_t, c);
 	if (!c->is_open)
-		rb_raise(esyms.eProgrammingError, "Open the cursor object first");
+		rb_raise(rb_eProgrammingError, "Open the cursor object first");
 
 	did = c->database_id;
 	EXEC SQL set connection :did;
@@ -2932,18 +2804,19 @@ inscur_flush(VALUE self)
 	return self;
 }
 
-/* module ScrollCursor --------------------------------------------------- */
+/* class ScrollCursor --------------------------------------------------- */
 
 /*
  * Provides the Array-like functionality for scroll cursors when using the
  * cursor[index] syntax
  */
 static VALUE
-scrollcur_entry(VALUE self, VALUE index, VALUE type, int bang)
+rb_scrollcur_entry(VALUE self, VALUE index, VALUE type, VALUE bang)
 {
 	cursor_t *c;
 	struct sqlda *output;
 	VALUE record;
+	short c_bang;
 	EXEC SQL begin declare section;
 		char *cid, *did;
 		long pos;
@@ -2951,7 +2824,7 @@ scrollcur_entry(VALUE self, VALUE index, VALUE type, int bang)
 
 	Data_Get_Struct(self, cursor_t, c);
 	if (!c->is_open)
-		rb_raise(esyms.eProgrammingError, "Open the cursor object first");
+		rb_raise(rb_eProgrammingError, "Open the cursor object first");
 
 	did = c->database_id;
 	EXEC SQL set connection :did;
@@ -2976,148 +2849,21 @@ scrollcur_entry(VALUE self, VALUE index, VALUE type, int bang)
 	if (SQLCODE < 0)
 		raise_ifx_extended();
 
-	RECORD(c, type, bang, record);
+	c_bang = RTEST(bang);
+	RECORD(c, type, c_bang, record);
 	return make_result(c, record);
 }
 
-/*
- * Provides the Array-like functionality for scroll cursors when using the
- * cursor[start, length] syntax
- */
-static VALUE
-scrollcur_subseq(VALUE self, VALUE start, VALUE length, VALUE type)
-{
-	VALUE first, records;
-	EXEC SQL begin declare section;
-		long pos;
-	EXEC SQL end   declare section;
-
-	first = scrollcur_entry(self, start, type, 0);
-	if (NIL_P(first))
-		return Qnil;
-
-	pos = NUM2LONG(length) - 1;
-
-	if (pos > 0) {
-		length = LONG2NUM(pos);
-		records = fetch_many(self, length, type);
-	}
-	else
-		records = rb_ary_new();
-
-	rb_ary_unshift(records, first);
-
-	return records;
-}
-
-/*
- * Base function for slice and slice_hash methods
- */
-static VALUE
-slice(int argc, VALUE *argv, VALUE self, VALUE type)
-{
-	if (argc == 2) {
-		if (NUM2LONG(argv[1]) <= 0)
-			rb_raise(rb_eArgError, "length must be positive");
-		return scrollcur_subseq(self, argv[0], argv[1], type);
-	}
-	if (argc != 1)
-		rb_scan_args(argc, argv, "11", 0, 0);
-
-	return scrollcur_entry(self, argv[0], type, 0);
-}
-
-/*
- * call-seq:
- *    cursor[index]  => array or nil
- *    cursor[start, length]  => array or nil
- *    cursor.slice(index)  => array or nil
- *    cursor.slice(start, length)  => array or nil
- *
- * Returns the record at _index_, or returns a subarray starting at _start_
- * and continuing for _length_ records. Negative indices count backward from
- * the end of the cursor (-1 is the last element). Returns nil if the
- * (starting) index is out of range.
- *
- * <b>Warning</b>: if the (starting) index is negative and out of range, the
- * position in the cursor is set to the last record. Otherwise the current
- * position in the cursor is preserved.
- */
-static VALUE
-scrollcur_slice(int argc, VALUE *argv, VALUE self)
-{
-	return slice(argc, argv, self, T_ARRAY);
-}
-
-/*
- * call-seq:
- * cursor.slice!(index)  => array or nil
- *
- * Returns the record at _index_. Negative indices count backward from
- * the end of the cursor (-1 is the last element). Returns nil if the index
- * is out of range.
- *
- * Stores the record fetched always in the same Array object.
- *
- * <b>Warning</b>: if the index is negative and out of range, the
- * position in the cursor is set to the last record. Otherwise the current
- * position in the cursor is preserved.
- */
-static VALUE
-scrollcur_slice_bang(VALUE self, VALUE index)
-{
-	return scrollcur_entry(self, index, T_ARRAY, 1);
-}
-
-/*
- * call-seq:
- *    cursor.slice_hash(index)  => hash or nil
- *    cursor.slice_hash(start, length)  => array or nil
- *
- * Returns the record at _index_, or returns a subarray starting at _start_
- * and continuing for _length_ records. Negative indices count backward from
- * the end of the cursor (-1 is the last element). Returns nil if the
- * (starting) index is out of range.
- *
- * <b>Warning</b>: if the (starting) index is negative and out of range, the
- * position in the cursor is set to the last record. Otherwise the current
- * position in the cursor is preserved.
- */
-static VALUE
-scrollcur_slice_hash(int argc, VALUE *argv, VALUE self)
-{
-	return slice(argc, argv, self, T_HASH);
-}
-
-/*
- * call-seq:
- * cursor.slice_hash!(index)  => hash or nil
- *
- * Returns the record at _index_. Negative indices count backward from
- * the end of the cursor (-1 is the last element). Returns nil if the index
- * is out of range.
- *
- * Stores the record fetched always in the same Hash object.
- *
- * <b>Warning</b>: if the index is negative and out of range, the
- * position in the cursor is set to the last record. Otherwise the current
- * position in the cursor is preserved.
- */
-static VALUE
-scrollcur_slice_hash_bang(VALUE self, VALUE index)
-{
-	return scrollcur_entry(self, index, T_HASH, 1);
-}
-
 /*
  * Base function for prev* and next* methods
  */
 static VALUE
-scrollcur_rel(int argc, VALUE *argv, VALUE self, int dir, VALUE type, int bang)
+rb_scrollcur_rel(VALUE self, VALUE offset, VALUE type, VALUE bang)
 {
+	short c_bang;
 	cursor_t *c;
 	struct sqlda *output;
-	VALUE offset, record;
+	VALUE record;
 	EXEC SQL begin declare section;
 		char *cid, *did;
 		long pos;
@@ -3125,15 +2871,14 @@ 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(esyms.eProgrammingError, "Open the cursor object first");
+		rb_raise(rb_eProgrammingError, "Open the cursor object first");
 
 	did = c->database_id;
 	EXEC SQL set connection :did;
 	if (SQLCODE < 0)
 		return Qnil;
 
-	rb_scan_args(argc, argv, "01", &offset);
-	pos = dir*(NIL_P(offset)? 1: NUM2LONG(offset));
+	pos = NUM2LONG(offset);
 
 	output = c->daOutput;
 	cid = c->cursor_id;
@@ -3145,293 +2890,15 @@ scrollcur_rel(int argc, VALUE *argv, VALUE self, int dir, VALUE type, int bang)
 	if (SQLCODE < 0)
 		raise_ifx_extended();
 
-	RECORD(c, type, bang, record);
+	c_bang = RTEST(bang);
+	RECORD(c, type, c_bang, record);
 	return make_result(c, record);
 }
 
-/* call-seq:
- * cursor.prev(offset = 1)  => array or nil
- *
- * Returns the previous _offset_ th record. Negative indices count
- * forward from the current position. Returns nil if the _offset_ is out of
- * range.
- */
-static VALUE
-scrollcur_prev(int argc, VALUE *argv, VALUE self)
-{
-	return scrollcur_rel(argc, argv, self, -1, T_ARRAY, 0);
-}
-
-/* call-seq:
- * cursor.prev!(offset = 1)  => array or nil
- *
- * Returns the previous _offset_ th record. Negative indices count
- * forward from the current position. Returns nil if the _offset_ is out of
- * range.
- *
- * Stores the record fetched always in the same Array object.
- */
-static VALUE
-scrollcur_prev_bang(int argc, VALUE *argv, VALUE self)
-{
-	return scrollcur_rel(argc, argv, self, -1, T_ARRAY, 1);
-}
-
-/* call-seq:
- * cursor.prev_hash(offset = 1)  => hash or nil
- *
- * Returns the previous _offset_ th record. Negative indices count
- * forward from the current position. Returns nil if the _offset_ is out of
- * range.
- */
-static VALUE
-scrollcur_prev_hash(int argc, VALUE *argv, VALUE self)
-{
-	return scrollcur_rel(argc, argv, self, -1, T_HASH, 0);
-}
-
-/* call-seq:
- * cursor.prev_hash!(offset = 1)  => hash or nil
- *
- * Returns the previous _offset_ th record. Negative indices count
- * forward from the current position. Returns nil if the _offset_ is out of
- * range.
- *
- * Stores the record fetched always in the same Hash object.
- */
-static VALUE
-scrollcur_prev_hash_bang(int argc, VALUE *argv, VALUE self)
-{
-	return scrollcur_rel(argc, argv, self, -1, T_HASH, 1);
-}
-
-/* call-seq:
- * cursor.next(offset = 1)  => array or nil
- *
- * Returns the next _offset_ th record. Negative indices count
- * backward from the current position. Returns nil if the _offset_ is out of
- * range.
- */
-static VALUE
-scrollcur_next(int argc, VALUE *argv, VALUE self)
-{
-	return scrollcur_rel(argc, argv, self, 1, T_ARRAY, 0);
-}
-
-/* call-seq:
- * cursor.next!(offset = 1)  => array or nil
- *
- * Returns the next _offset_ th record. Negative indices count
- * backward from the current position. Returns nil if the _offset_ is out of
- * range.
- *
- * Stores the record fetched always in the same Array object.
- */
-static VALUE
-scrollcur_next_bang(int argc, VALUE *argv, VALUE self)
-{
-	return scrollcur_rel(argc, argv, self, 1, T_ARRAY, 1);
-}
-
-/* call-seq:
- * cursor.next_hash(offset = 1)  => hash or nil
- *
- * Returns the next _offset_ th record. Negative indices count
- * backward from the current position. Returns nil if the _offset_ is out of
- * range.
- */
-static VALUE
-scrollcur_next_hash(int argc, VALUE *argv, VALUE self)
-{
-	return scrollcur_rel(argc, argv, self, 1, T_HASH, 0);
-}
-
-/* call-seq:
- * cursor.next_hash!(offset = 1)  => hash or nil
- *
- * Returns the next _offset_ th record. Negative indices count
- * backward from the current position. Returns nil if the _offset_ is out of
- * range.
- *
- * Stores the record fetched always in the same Hash object.
- */
-static VALUE
-scrollcur_next_hash_bang(int argc, VALUE *argv, VALUE self)
-{
-	return scrollcur_rel(argc, argv, self, 1, T_HASH, 1);
-}
-
-/*
- * call-seq:
- * cursor.first  => array or nil
- *
- * Returns the first record of the cursor. If the cursor is empty,
- * returns nil.
- */
-static VALUE
-scrollcur_first(VALUE self)
-{
-	return scrollcur_entry(self, INT2FIX(0), T_ARRAY, 0);
-}
-
-/*
- * call-seq:
- * cursor.first!  => array or nil
- *
- * Returns the first record of the cursor. If the cursor is empty,
- * returns nil.
- *
- * Stores the record fetched always in the same Array object.
- */
-static VALUE
-scrollcur_first_bang(VALUE self)
-{
-	return scrollcur_entry(self, INT2FIX(0), T_ARRAY, 1);
-}
-
-/*
- * call-seq:
- * cursor.first_hash  => hash or nil
- *
- * Returns the first record of the cursor. If the cursor is empty,
- * returns nil.
- */
-static VALUE
-scrollcur_first_hash(VALUE self)
-{
-	return scrollcur_entry(self, INT2FIX(0), T_HASH, 0);
-}
-
-/*
- * call-seq:
- * cursor.first_hash!  => hash or nil
- *
- * Returns the first record of the cursor. If the cursor is empty,
- * returns nil.
- *
- * Stores the record fetched always in the same Hash object.
- */
-static VALUE
-scrollcur_first_hash_bang(VALUE self)
-{
-	return scrollcur_entry(self, INT2FIX(0), T_HASH, 1);
-}
+/* class CursorBase ------------------------------------------------------ */
 
-/*
- * call-seq:
- * cursor.last  => array or nil
- *
- * Returns the last record of the cursor. If the cursor is empty,
- * returns nil.
- */
-static VALUE
-scrollcur_last(VALUE self)
-{
-	return scrollcur_entry(self, INT2FIX(-1), T_ARRAY, 0);
-}
-
-/*
- * call-seq:
- * cursor.last!  => array or nil
- *
- * Returns the last record of the cursor. If the cursor is empty,
- * returns nil.
- *
- * Stores the record fetched always in the same Array object.
- */
-static VALUE
-scrollcur_last_bang(VALUE self)
-{
-	return scrollcur_entry(self, INT2FIX(-1), T_ARRAY, 1);
-}
-
-/*
- * call-seq:
- * cursor.last_hash  => hash or nil
- *
- * Returns the last record of the cursor. If the cursor is empty,
- * returns nil.
- */
-static VALUE
-scrollcur_last_hash(VALUE self)
-{
-	return scrollcur_entry(self, INT2FIX(-1), T_HASH, 0);
-}
-
-/*
- * call-seq:
- * cursor.last_hash!  => hash or nil
- *
- * Returns the last record of the cursor. If the cursor is empty,
- * returns nil.
- *
- * Stores the record fetched always in the same Hash object.
- */
-static VALUE
-scrollcur_last_hash_bang(VALUE self)
-{
-	return scrollcur_entry(self, INT2FIX(-1), T_HASH, 1);
-}
-
-/*
- * call-seq:
- * cursor.current  => array or nil
- *
- * Returns the current record of the cursor. If the cursor is empty,
- * returns nil.
- */
-static VALUE
-scrollcur_current(VALUE self)
-{
-	return scrollcur_entry(self, Qnil, T_ARRAY, 0);
-}
-
-/*
- * call-seq:
- * cursor.current!  => array or nil
- *
- * Returns the current record of the cursor. If the cursor is empty,
- * returns nil.
- *
- * Stores the record fetched always in the same Array object.
- */
-static VALUE
-scrollcur_current_bang(VALUE self)
-{
-	return scrollcur_entry(self, Qnil, T_ARRAY, 1);
-}
-
-/*
- * call-seq:
- * cursor.current_hash  => hash or nil
- *
- * Returns the current record of the cursor. If the cursor is empty,
- * returns nil.
- */
-static VALUE
-scrollcur_current_hash(VALUE self)
-{
-	return scrollcur_entry(self, Qnil, T_HASH, 0);
-}
-
-/*
- * call-seq:
- * cursor.current_hash!  => hash or nil
- *
- * Returns the current record of the cursor. If the cursor is empty,
- * returns nil.
- *
- * Stores the record fetched always in the same Hash object.
- */
-static VALUE
-scrollcur_current_hash_bang(VALUE self)
-{
-	return scrollcur_entry(self, Qnil, T_HASH, 1);
-}
-
-/* class Cursor ---------------------------------------------------------- */
 static void
-cursor_close_or_free(cursor_t *c, short op)
+cursorbase_close_or_free(cursor_t *c, short op)
 {
 	EXEC SQL begin declare section;
 		char *cid, *sid, *did;
@@ -3441,29 +2908,27 @@ cursor_close_or_free(cursor_t *c, short op)
 		return;
 
 	c->is_open = 0;
-	if (op == 1)
-		clean_input_slots(c);
-	else {
-		free_input_slots(c);
-		free_output_slots(c);
-	}
-
-	did = c->database_id;
-	EXEC SQL set connection :did;
-	if (SQLCODE < 0)
-		return;
-
-	cid = c->cursor_id;
-	EXEC SQL close :cid;
 
-	if (op == 2) {
-		sid = c->stmt_id;
-		EXEC SQL free :cid; EXEC SQL free :sid;
+	switch(op) {
+	case 1:
+		clean_input_slots(c);
+	case 2:
+		did = c->database_id;
+		EXEC SQL set connection :did;
+		if (SQLCODE < 0)
+			return;
+		cid = c->cursor_id;
+		EXEC SQL close :cid;
+		if (op == 1)
+			break;
+		EXEC SQL free :cid;
+		st_free(c);
+		break;
 	}
 }
 
 static void
-cursor_mark(cursor_t *c)
+cursorbase_mark(cursor_t *c)
 {
 	rb_gc_mark(c->db);
 	if (c->array)
@@ -3475,166 +2940,20 @@ cursor_mark(cursor_t *c)
 }
 
 static void
-cursor_free(void *p)
+cursorbase_free(void *p)
 {
-	cursor_close_or_free(p, 2);
+	cursorbase_close_or_free(p, 2);
 	xfree(p);
 }
 
 static VALUE
-cursor_alloc(VALUE klass)
+cursorbase_alloc(VALUE klass)
 {
 	cursor_t *c;
 
 	c = ALLOC(cursor_t);
 	memset(c, 0, sizeof(cursor_t));
-	return Data_Wrap_Struct(klass, cursor_mark, cursor_free, c);
-}
-
-static VALUE
-cursor_initialize(int argc, VALUE *argv, VALUE self)
-{
-	VALUE db, query, options;
-	VALUE scroll, hold;
-	struct sqlda *output;
-	cursor_t *c;
-	EXEC SQL begin declare section;
-		char *c_query;
-		char *cid, *sid, *did;
-	EXEC SQL end   declare section;
-
-	rb_scan_args(argc, argv, "21", &db, &query, &options);
-	Data_Get_Struct(db, char, did);
-
-	EXEC SQL set connection :did;
-	if (SQLCODE < 0)
-		raise_ifx_extended();
-
-	Data_Get_Struct(self, cursor_t, c);
-	c->db = db;
-	c->database_id = did;
-	scroll = hold = Qfalse;
-	snprintf(c->cursor_id, sizeof(c->cursor_id), "CUR%lX", self);
-	snprintf(c->stmt_id, sizeof(c->stmt_id), "STMT%lX", self);
-	cid = c->cursor_id; sid = c->stmt_id;
-	c_query = StringValueCStr(query);
-
-	if (!NIL_P(options)) {
-		Check_Type(options, T_HASH);
-		scroll = rb_hash_aref(options, sym_scroll);
-		hold = rb_hash_aref(options, sym_hold);
-	}
-
-	EXEC SQL prepare :sid from :c_query;
-	if (SQLCODE < 0)
-		raise_ifx_extended();
-
-	if (RTEST(scroll) && RTEST(hold))
-		EXEC SQL declare :cid scroll cursor with hold for :sid;
-	else if (RTEST(hold))
-		EXEC SQL declare :cid cursor with hold for :sid;
-	else if (RTEST(scroll))
-		EXEC SQL declare :cid scroll cursor for :sid;
-	else
-		EXEC SQL declare :cid cursor for :sid;
-
-	if (SQLCODE < 0)
-		raise_ifx_extended();
-
-	alloc_input_slots(c, c_query);
-	EXEC SQL describe :sid into output;
-	c->daOutput = output;
-
-	c->is_select = (SQLCODE == 0 || SQLCODE == SQ_EXECPROC);
-
-	if (c->is_select) {
-		alloc_output_slots(c);
-		rb_extend_object(self, rb_mSequentialCursor);
-		if (scroll)
-			rb_extend_object(self, rb_mScrollCursor);
-	}
-	else {
-		xfree(c->daOutput);
-		c->daOutput = NULL;
-		rb_extend_object(self, rb_mInsertCursor);
-	}
-	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
- * Cursor.open(database, query, options) {|cursor| block }  => obj
- *
- * Creates and opens a Cursor object based on <i>query</i> using <i>options</i>
- * in the context of <i>database</i>.
- * 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
- *   :params => input parameters as an Array or nil
- */
-static VALUE
-cursor_s_open(int argc, VALUE *argv, VALUE klass)
-{
-	VALUE cursor, options, params;
-	int open_argc;
-
-	rb_scan_args(argc, argv, "21", 0, 0, &options);
-	open_argc = 0; params = Qnil;
-
-	if (!NIL_P(options)) {
-		Check_Type(options, T_HASH);
-		params = rb_hash_aref(options, sym_params);
-
-		if (TYPE(params) == T_ARRAY)
-			open_argc = RARRAY(params)->len;
-		else if (params != Qnil)
-			rb_raise(rb_eArgError, "Parameters must be supplied as an Array");
-	}
-
-	cursor = rb_class_new_instance(argc, argv, klass);
-	cursor_open(open_argc, &params, cursor);
-
-	if (rb_block_given_p())
-		return rb_ensure(rb_yield, cursor, cursor_drop, cursor);
-
-	return cursor;
+	return Data_Wrap_Struct(klass, cursorbase_mark, cursorbase_free, c);
 }
 
 /*
@@ -3644,7 +2963,7 @@ cursor_s_open(int argc, VALUE *argv, VALUE klass)
  * Returns the cursor ID
  */
 static VALUE
-cursor_id(VALUE self)
+rb_cursorbase_id(VALUE self)
 {
 	cursor_t *c;
 
@@ -3662,7 +2981,7 @@ cursor_id(VALUE self)
  * Returns __self__.
  */
 static VALUE
-cursor_open(int argc, VALUE *argv, VALUE self)
+rb_cursorbase_open(int argc, VALUE *argv, VALUE self)
 {
 	struct sqlda *input;
 	cursor_t *c;
@@ -3714,12 +3033,12 @@ cursor_open(int argc, VALUE *argv, VALUE self)
  * Closes the cursor and returns __self__.
  */
 static VALUE
-cursor_close(VALUE self)
+rb_cursorbase_close(VALUE self)
 {
 	cursor_t *c;
 
 	Data_Get_Struct(self, cursor_t, c);
-	cursor_close_or_free(c, 1);
+	cursorbase_close_or_free(c, 1);
 	return self;
 }
 
@@ -3731,39 +3050,153 @@ cursor_close(VALUE self)
  * cannot be opened again.
  */
 static VALUE
-cursor_drop(VALUE self)
+rb_cursorbase_drop(VALUE self)
 {
 	cursor_t *c;
 
 	Data_Get_Struct(self, cursor_t, c);
-	cursor_close_or_free(c, 2);
+	cursorbase_close_or_free(c, 2);
 
 	return Qnil;
 }
 
-/* Entry point ------------------------------------------------------------ */
+/* module Cursor --------------------------------------------------------- */
 
-void Init_informix(void)
+/*
+ * The underlying class method that prepares a cursor and creates
+ * the respective cursor object.
+ */
+static VALUE
+rb_cursor_s_new0(int argc, VALUE *argv, VALUE self)
 {
-	/* module Informix ---------------------------------------------------- */
+	VALUE db, query, options, ret;
+	VALUE scroll, hold;
+	struct sqlda *output;
+	cursor_t c, *cur;
+	EXEC SQL begin declare section;
+		char *c_query;
+		char *cid, *sid, *did;
+	EXEC SQL end   declare section;
+
+	memset(&c, 0, sizeof(c));
+	rb_scan_args(argc, argv, "21", &db, &query, &options);
+	Data_Get_Struct(db, char, did);
+
+	EXEC SQL set connection :did;
+	if (SQLCODE < 0)
+		raise_ifx_extended();
+
+	c.db = db;
+	c.database_id = did;
+	scroll = hold = Qfalse;
+	snprintf(c.cursor_id, sizeof(c.cursor_id), "CUR%lX", self);
+	snprintf(c.stmt_id, sizeof(c.stmt_id), "STMT%lX", self);
+	cid = c.cursor_id; sid = c.stmt_id;
+	c_query = StringValueCStr(query);
+
+	if (!NIL_P(options)) {
+		Check_Type(options, T_HASH);
+		scroll = rb_hash_aref(options, sym_scroll);
+		hold = rb_hash_aref(options, sym_hold);
+	}
+
+	EXEC SQL prepare :sid from :c_query;
+	if (SQLCODE < 0)
+		raise_ifx_extended();
+
+	if (RTEST(scroll) && RTEST(hold))
+		EXEC SQL declare :cid scroll cursor with hold for :sid;
+	else if (RTEST(hold))
+		EXEC SQL declare :cid cursor with hold for :sid;
+	else if (RTEST(scroll))
+		EXEC SQL declare :cid scroll cursor for :sid;
+	else
+		EXEC SQL declare :cid cursor for :sid;
+
+	if (SQLCODE < 0)
+		raise_ifx_extended();
+
+	alloc_input_slots(&c, c_query);
+	EXEC SQL describe :sid into output;
+	c.daOutput = output;
+
+	c.is_select = (SQLCODE == 0 || SQLCODE == SQ_EXECPROC);
+
+	if (c.is_select) {
+		alloc_output_slots(&c);
+		if (scroll)
+			ret = cursorbase_alloc(rb_cScrollCursor);
+		else
+			ret = cursorbase_alloc(rb_cSequentialCursor);
+	}
+	else {
+		xfree(c.daOutput);
+		c.daOutput = NULL;
+		ret = cursorbase_alloc(rb_cInsertCursor);
+	}
+	Data_Get_Struct(ret, cursor_t, cur);
+	memcpy(cur, &c, sizeof(cursor_t));
+
+	return ret;
+}
+
+void Init_informixc(void)
+{
+	/*
+	 * The +Informix+ module contains the mechanisms for connecting to and
+	 * taking advantage of an existing Informix database by means of a
+	 * simple model, similar to the one used in ESQL/C.
+	 *
+	 * The interaction with an Informix database is made basically through three
+	 * classes: +Database+, +Statement+ and +Cursor+.
+	 *
+	 * +Cursor+ is actually a module that works as a shortcut for creating three
+	 * kinds of cursors: +SequentialCursor+, +ScrollCursor+ and +InsertCursor+.
+	 *
+	 * There are other classes for supporting some data types not available in
+	 * Ruby: +Slob+, +SlobStat+ and +Interval+.
+	 *
+	 * Again, +Interval+ is actually a module that works as a shortcut for
+	 * creating two kinds of intervals: +IntervalYTM+ and +IntervalDTS+.
+	 */
 	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", rb_informix_connect, -1);
-	rb_define_module_function(rb_mInformix, "version", rb_informix_version, 0);
 
-	/* class Slob --------------------------------------------------------- */
+	/*
+	 * The +Slob+ class is the Ruby interface for handling Smart Large Objects.
+	 * It provides methods for every action applicable to an SLOB.
+	 *
+	 * Examples:
+	 *
+	 *   # Storing BLOBs read from files
+	 *   Slob = Informix::Slob
+	 *   db.execute("create table album (filename varchar(30), picture blob)")
+	 *   st = db.prepare("insert into album values(?, ?)")
+	 *   Dir.glob("*jpg") do |filename|
+	 *      slob = db.slob(Slob::BLOB)
+	 *      slob.write(File.read(filename)) # same as slob <<File.read(filename)
+	 *      slob.close
+	 *      st.execute(filename, slob)
+	 *    end
+	 *
+	 *
+	 *   # Retrieving BLOBs and writing them to files
+	 *   db.each_hash("select filename, picture from album") do |r|
+	 *     slob = r['picture'].open
+	 *     File.open(r['filename'], "w") do |f|
+	 *       f.write r['picture'].read(r['picture'].size)
+	 *     end
+	 *     slob.close
+	 *   end
+	 */
 	rb_cSlob = rb_define_class_under(rb_mInformix, "Slob", rb_cObject);
 	rb_define_alloc_func(rb_cSlob, slob_alloc);
 	rb_define_method(rb_cSlob, "initialize", rb_slob_initialize, -1);
-	rb_define_singleton_method(rb_cSlob, "new", rb_slob_s_new, -1);
 	rb_define_method(rb_cSlob, "open", rb_slob_open, -1);
 	rb_define_method(rb_cSlob, "close", rb_slob_close, 0);
 	rb_define_method(rb_cSlob, "read", rb_slob_read, 1);
 	rb_define_method(rb_cSlob, "write", rb_slob_write, 1);
 	rb_define_method(rb_cSlob, "seek", rb_slob_seek, 2);
 	rb_define_method(rb_cSlob, "tell", rb_slob_tell, 0);
-	rb_define_alias(rb_cSlob, "pos", "tell");
 	rb_define_method(rb_cSlob, "pos=", rb_slob_set_pos, 1);
 	rb_define_method(rb_cSlob, "truncate", rb_slob_truncate, 1);
 	rb_define_method(rb_cSlob, "stat", rb_slob_stat, 0);
@@ -3790,38 +3223,38 @@ void Init_informix(void)
 	rb_define_const(rb_cSlob, "CLOB", INT2FIX(XID_CLOB));
 	rb_define_const(rb_cSlob, "BLOB", INT2FIX(XID_BLOB));
 
-	#define DEF_SLOB_CONST(k) rb_define_const(rb_cSlob, #k, INT2FIX(LO_##k))
-
-	/* Access modes */
-	DEF_SLOB_CONST(RDONLY);
-	DEF_SLOB_CONST(DIRTY_READ);
-	DEF_SLOB_CONST(WRONLY);
-	DEF_SLOB_CONST(APPEND);
-	DEF_SLOB_CONST(RDWR);
-	DEF_SLOB_CONST(BUFFER);
-	DEF_SLOB_CONST(NOBUFFER);
-	DEF_SLOB_CONST(LOCKALL);
-	DEF_SLOB_CONST(LOCKRANGE);
-	DEF_SLOB_CONST(SEEK_SET);
-	DEF_SLOB_CONST(SEEK_CUR);
-	DEF_SLOB_CONST(SEEK_END);
+    /* Access modes */
+	rb_define_const(rb_cSlob, "RDONLY", INT2FIX(LO_RDONLY));
+	rb_define_const(rb_cSlob, "DIRTY_READ", INT2FIX(LO_DIRTY_READ));
+	rb_define_const(rb_cSlob, "WRONLY", INT2FIX(LO_WRONLY));
+	rb_define_const(rb_cSlob, "APPEND", INT2FIX(LO_APPEND));
+	rb_define_const(rb_cSlob, "RDWR", INT2FIX(LO_RDWR));
+	rb_define_const(rb_cSlob, "BUFFER", INT2FIX(LO_BUFFER));
+	rb_define_const(rb_cSlob, "NOBUFFER", INT2FIX(LO_NOBUFFER));
+	rb_define_const(rb_cSlob, "LOCKALL", INT2FIX(LO_LOCKALL));
+	rb_define_const(rb_cSlob, "LOCKRANGE", INT2FIX(LO_LOCKRANGE));
+	rb_define_const(rb_cSlob, "SEEK_SET", INT2FIX(LO_SEEK_SET));
+	rb_define_const(rb_cSlob, "SEEK_CUR", INT2FIX(LO_SEEK_CUR));
+	rb_define_const(rb_cSlob, "SEEK_END", INT2FIX(LO_SEEK_END));
 
 	/* Creation-time flags */
-	DEF_SLOB_CONST(LOG);
-	DEF_SLOB_CONST(NOLOG);
-	DEF_SLOB_CONST(KEEP_LASTACCESS_TIME);
-	DEF_SLOB_CONST(NOKEEP_LASTACCESS_TIME);
+	rb_define_const(rb_cSlob, "LOG", INT2FIX(LO_LOG));
+	rb_define_const(rb_cSlob, "NOLOG", INT2FIX(LO_NOLOG));
+	rb_define_const(rb_cSlob, "KEEP_LASTACCESS_TIME", INT2FIX(LO_KEEP_LASTACCESS_TIME));
+	rb_define_const(rb_cSlob, "NOKEEP_LASTACCESS_TIME", INT2FIX(LO_NOKEEP_LASTACCESS_TIME));
 
 	/* Ranges */
-	DEF_SLOB_CONST(CURRENT_END);
-	DEF_SLOB_CONST(MAX_END);
+	rb_define_const(rb_cSlob, "CURRENT_END", INT2FIX(LO_CURRENT_END));
+	rb_define_const(rb_cSlob, "MAX_END", INT2FIX(LO_MAX_END));
 
 	/* Lock modes */
-	DEF_SLOB_CONST(SHARED_MODE);
-	DEF_SLOB_CONST(EXCLUSIVE_MODE);
-
-	/* class Slob::Stat --------------------------------------------------- */
+	rb_define_const(rb_cSlob, "SHARED_MODE", INT2FIX(LO_SHARED_MODE));
+	rb_define_const(rb_cSlob, "EXCLUSIVE_MODE", INT2FIX(LO_EXCLUSIVE_MODE));
 
+	/*
+	 * An instance of the <tt>Slob::Stat</tt> class is returned when an Slob
+	 * is queried about its status information (<tt>Slob#stat</tt>).
+	 */
 	rb_cSlobStat = rb_define_class_under(rb_cSlob, "Stat", rb_cObject);
 	rb_define_alloc_func(rb_cSlobStat, slobstat_alloc);
 	rb_define_method(rb_cSlobStat, "initialize", rb_slobstat_initialize, 1);
@@ -3835,106 +3268,122 @@ void Init_informix(void)
 	rb_define_method(rb_cSlobStat, "refcnt", rb_slobstat_refcnt, 0);
 	rb_define_method(rb_cSlobStat, "size", rb_slobstat_size, 0);
 
-	/* class Database ----------------------------------------------------- */
+	/*
+	 * The +Database+ class lets you open a connection to an existing database
+	 * (usually done with <tt>Informix.connect</tt>) and provides shortcuts for
+	 * creating +Cursor+, +Statement+ and +Slob+ objects, among other database
+	 * actions.
+	 */
 	rb_cDatabase = rb_define_class_under(rb_mInformix, "Database", rb_cObject);
 	rb_define_alloc_func(rb_cDatabase, database_alloc);
 	rb_define_method(rb_cDatabase, "initialize", rb_database_initialize, -1);
-	rb_define_singleton_method(rb_cDatabase, "open", rb_database_s_open, -1);
-	rb_define_alias(rb_cDatabase, "new", "open");
 	rb_define_method(rb_cDatabase, "close", rb_database_close, 0);
-	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);
-	rb_define_method(rb_cDatabase, "prepare", rb_database_prepare, 1);
 	rb_define_method(rb_cDatabase, "columns", rb_database_columns, 1);
-	rb_define_method(rb_cDatabase, "cursor", rb_database_cursor, -1);
-	rb_define_method(rb_cDatabase, "slob", rb_database_slob, -1);
 
-	/* class Statement ---------------------------------------------------- */
-	rb_cStatement = rb_define_class_under(rb_mInformix, "Statement", rb_cObject);
+	rb_define_const(rb_cDatabase, "IfxVersion",
+					rb_struct_define("IfxVersion", "server_type", "major",
+									"minor", "level", "os", "full", NULL));
+	rb_cIfxVersion = rb_const_get(rb_cDatabase, rb_intern("IfxVersion"));
+
+	/*
+	 * The +Statement+ class lets you prepare and execute any SQL statement,
+	 * (usually done with <tt>Database#prepare</tt>)
+	 * paremeterized or not, that does not return records. This includes
+	 * DDL (CREATE, DROP, ALTER), DCL (GRANT, REVOKE) and DML (INSERT, UPDATE,
+	 * DELETE) statements, and SELECTs that return <b>only one</b> record at
+	 * most.
+	 *
+	 * To retrieve more than one record, use a +Cursor+ instead.
+	 */
+	rb_cStatement = rb_define_class_under(rb_mInformix, "Statement",rb_cObject);
 	rb_define_alloc_func(rb_cStatement, statement_alloc);
-	rb_define_method(rb_cStatement, "initialize", statement_initialize, 2);
-	rb_define_singleton_method(rb_cStatement, "new", statement_s_new, -1);
-	rb_define_method(rb_cStatement, "[]", statement_call, -1);
-	rb_define_alias(rb_cStatement, "call", "[]");
-	rb_define_alias(rb_cStatement, "execute", "[]");
-	rb_define_method(rb_cStatement, "drop", statement_drop, 0);
-
-	/* module SequentialCursor -------------------------------------------- */
-	rb_mSequentialCursor = rb_define_module_under(rb_mInformix, "SequentialCursor");
-	rb_define_method(rb_mSequentialCursor, "fetch", seqcur_fetch, 0);
-	rb_define_method(rb_mSequentialCursor, "fetch!", seqcur_fetch_bang, 0);
-	rb_define_method(rb_mSequentialCursor, "fetch_hash", seqcur_fetch_hash, 0);
-	rb_define_method(rb_mSequentialCursor, "fetch_hash!", seqcur_fetch_hash_bang, 0);
-	rb_define_method(rb_mSequentialCursor, "fetch_many", seqcur_fetch_many, 1);
-	rb_define_method(rb_mSequentialCursor, "fetch_hash_many", seqcur_fetch_hash_many, 1);
-	rb_define_method(rb_mSequentialCursor, "fetch_all", seqcur_fetch_all, 0);
-	rb_define_method(rb_mSequentialCursor, "fetch_hash_all", seqcur_fetch_hash_all, 0);
-	rb_define_method(rb_mSequentialCursor, "each", seqcur_each, 0);
-	rb_define_method(rb_mSequentialCursor, "each!", seqcur_each_bang, 0);
-	rb_define_method(rb_mSequentialCursor, "each_hash", seqcur_each_hash, 0);
-	rb_define_method(rb_mSequentialCursor, "each_hash!", seqcur_each_hash_bang, 0);
-	rb_define_method(rb_mSequentialCursor, "each_by", seqcur_each_by, 1);
-	rb_define_method(rb_mSequentialCursor, "each_hash_by", seqcur_each_hash_by, 1);
-
-	/* InsertCursor ------------------------------------------------------- */
-	rb_define_method(rb_mInsertCursor, "put", inscur_put, -1);
-	rb_define_method(rb_mInsertCursor, "flush", inscur_flush, 0);
-
-	/* ScrollCursor ------------------------------------------------------- */
-	rb_define_method(rb_mScrollCursor, "[]", scrollcur_slice, -1);
-	rb_define_alias(rb_mScrollCursor, "slice", "[]");
-	rb_define_method(rb_mScrollCursor, "slice!", scrollcur_slice_bang, 1);
-	rb_define_method(rb_mScrollCursor, "slice_hash", scrollcur_slice_hash, -1);
-	rb_define_method(rb_mScrollCursor, "slice_hash!", scrollcur_slice_hash_bang, 1);
-	rb_define_method(rb_mScrollCursor, "prev", scrollcur_prev, -1);
-	rb_define_method(rb_mScrollCursor, "prev!", scrollcur_prev_bang, -1);
-	rb_define_method(rb_mScrollCursor, "prev_hash", scrollcur_prev_hash, -1);
-	rb_define_method(rb_mScrollCursor, "prev_hash!", scrollcur_prev_hash_bang, -1);
-	rb_define_method(rb_mScrollCursor, "next", scrollcur_next, -1);
-	rb_define_method(rb_mScrollCursor, "next!", scrollcur_next_bang, -1);
-	rb_define_method(rb_mScrollCursor, "next_hash", scrollcur_next_hash, -1);
-	rb_define_method(rb_mScrollCursor, "next_hash!", scrollcur_next_hash_bang, -1);
-	rb_define_method(rb_mScrollCursor, "first", scrollcur_first, 0);
-	rb_define_method(rb_mScrollCursor, "first!", scrollcur_first_bang, 0);
-	rb_define_method(rb_mScrollCursor, "first_hash", scrollcur_first_hash, 0);
-	rb_define_method(rb_mScrollCursor, "first_hash!", scrollcur_first_hash_bang, 0);
-	rb_define_method(rb_mScrollCursor, "last", scrollcur_last, 0);
-	rb_define_method(rb_mScrollCursor, "last!", scrollcur_last_bang, 0);
-	rb_define_method(rb_mScrollCursor, "last_hash", scrollcur_last_hash, 0);
-	rb_define_method(rb_mScrollCursor, "last_hash!", scrollcur_last_hash_bang, 0);
-	rb_define_method(rb_mScrollCursor, "current", scrollcur_current, 0);
-	rb_define_method(rb_mScrollCursor, "current!", scrollcur_current_bang, 0);
-	rb_define_method(rb_mScrollCursor, "current_hash", scrollcur_current_hash, 0);
-	rb_define_method(rb_mScrollCursor, "current_hash!", scrollcur_current_hash_bang, 0);
-
-	/* class Cursor ------------------------------------------------------- */
-	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);
-	rb_define_method(rb_cCursor, "close", cursor_close, 0);
-	rb_define_method(rb_cCursor, "drop", cursor_drop, 0);
+	rb_define_method(rb_cStatement, "initialize", rb_statement_initialize, 2);
+	rb_define_method(rb_cStatement, "[]", rb_statement_call, -1);
+	rb_define_method(rb_cStatement, "drop", rb_statement_drop, 0);
+
+	/*
+	 * The +CursorBase+ class provides the basic functionality for any cursor.
+	 */
+	rb_cCursorBase=rb_define_class_under(rb_mInformix,"CursorBase",rb_cObject);
+	rb_define_alloc_func(rb_cCursorBase, cursorbase_alloc);
+	rb_define_method(rb_cCursorBase, "id", rb_cursorbase_id, 0);
+	rb_define_method(rb_cCursorBase, "open", rb_cursorbase_open, -1);
+	rb_define_method(rb_cCursorBase, "close", rb_cursorbase_close, 0);
+	rb_define_method(rb_cCursorBase, "drop", rb_cursorbase_drop, 0);
+
+	/*
+	 * The +SequentialCursor+ class adds fetching capabilities and iterators
+	 * to the +CursorBase+ class.
+	 */
+	rb_cSequentialCursor = rb_define_class_under(rb_mInformix, "SequentialCursor", rb_cCursorBase);
+	rb_define_private_method(rb_cSequentialCursor, "fetch0", fetch, 2);
+	rb_define_private_method(rb_cSequentialCursor, "fetch_many0", fetch_many,2);
+	rb_define_private_method(rb_cSequentialCursor, "each0", each, 2);
+	rb_define_private_method(rb_cSequentialCursor, "each_by0", each_by, 2);
+
+	/*
+	 * The +InsertCursor+ class adds insertion capabilities to the +CursorBase+
+	 * class.
+	 */
+	rb_cInsertCursor = rb_define_class_under(rb_mInformix, "InsertCursor", rb_cCursorBase);
+	rb_define_method(rb_cInsertCursor, "put", rb_inscur_put, -1);
+	rb_define_method(rb_cInsertCursor, "flush", rb_inscur_flush, 0);
+
+	/*
+	 * The +ScrollCursor+ class adds +Array+-like capabilities to the
+	 * +SequentialCursor+ class
+	 */
+	rb_cScrollCursor = rb_define_class_under(rb_mInformix, "ScrollCursor", rb_cSequentialCursor);
+	rb_define_private_method(rb_cScrollCursor, "entry", rb_scrollcur_entry, 3);
+	rb_define_private_method(rb_cScrollCursor, "rel", rb_scrollcur_rel, 3);
+
+	/*
+	 * The +Cursor+ module provides shortcuts for creating cursor objects that
+	 * lets you retrieve, update and insert records.
+	 * 
+	 * Depending on the query and options given, one of three classes of
+	 * cursors is returned: +SequentialCursor+, +ScrollCursor+ or
+	 * +InsertCursor+.
+	 */
+	rb_mCursor = rb_define_module_under(rb_mInformix, "Cursor");
+	rb_define_singleton_method(rb_mCursor, "new0", rb_cursor_s_new0, -1);
 
 	/* Global constants --------------------------------------------------- */
+	rb_cArray = rb_const_get(rb_cObject, rb_intern("Array"));
+
 	rb_require("date");
 	rb_cDate = rb_const_get(rb_cObject, rb_intern("Date"));
+
 	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"));
+	rb_eInternalError = rb_const_get(rb_mInformix, rb_intern("InternalError"));
+	rb_eProgrammingError = rb_const_get(rb_mInformix, rb_intern("ProgrammingError"));
+	rb_eOperationalError = rb_const_get(rb_mInformix, rb_intern("OperationalError"));
+	rb_eDatabaseError = rb_const_get(rb_mInformix, rb_intern("DatabaseError"));
+
+	rb_require("informix/interval");
+	rb_mInterval = rb_const_get(rb_mInformix, rb_intern("Interval"));
+
 	/* Global symbols ----------------------------------------------------- */
 	#define INTERN(sym) s_##sym = rb_intern(#sym)
 	INTERN(read); INTERN(new);
 	INTERN(utc);  INTERN(day); INTERN(month); INTERN(year);
 	INTERN(hour); INTERN(min); INTERN(sec); INTERN(usec);
 	INTERN(to_s); INTERN(to_i);
+	INTERN(add_info);
+	INTERN(from_months); INTERN(from_seconds);
+	s_add = rb_intern("+");
+	s_mul = rb_intern("*");
 
 	sym_name = ID2SYM(rb_intern("name"));
 	sym_type = ID2SYM(rb_intern("type"));
@@ -3958,7 +3407,4 @@ 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);
 }