ibm_db 0.4.6 → 0.6.0

data/CHANGES

@@ -1,5 +1,11 @@
 CHANGE LOG
 ==============
+2007/04/30 (0.6.0):
+  - Support for remote connections to DB2 Universal Database on z/OS version 9
+  - Support for result set pagination via ActiveRecord add_limit_offset! method for DB2 Universal Database on z/OS and i5/OS
+  - Defect fixes
+  - Improved documentation 
+
 2007/04/20 (0.4.6):
   - Fixed XML columns creation default value (NOT NULL)
   - Fixed border case for IS NULL in where clauses
@@ -30,4 +36,4 @@ CHANGE LOG
   - Fixed compatibility issue with other adapters
   - If a schema is omitted in database.yml, the username is now used as default schema
   - Introduced descriptive CLI error messages when a connection or an execute statement fails
-  - Introduced check against schema in method 'indexes'
+  - Introduced check against schema in method 'indexes'

data/README

@@ -1,10 +1,17 @@
 =====================================================================
-README for the IBM_DB Adapter and Driver Release 0.4.6 (2007/04/20)
+README for the IBM_DB Adapter and Driver Release 0.6.0 (2007/04/30)
 For ActiveRecord Version 1.15.3 (and Rails 1.2.3)
 =====================================================================
 
 Change Log
 ==============
+
+2007/04/30 (0.6.0):
+  - Support for remote connections to DB2 Universal Database on z/OS version 9
+  - Support for result set pagination via ActiveRecord add_limit_offset! method for DB2 Universal Database on z/OS and i5/OS
+  - Defect fixes
+  - Improved documentation 
+
 2007/04/20 (0.4.6):
   - Fixed XML columns creation default value (NOT NULL)
   - Fixed border case for IS NULL in where clauses
@@ -49,39 +56,17 @@ Supported Operating Systems
 Supported Databases
 ====================
   - IBM DB2 Universal Database on Linux/Unix/Windows versions 8 and 9
-  - Remote connections to IBM DB2 Universal Database on i5/OS versions V5R3 and V5R4
+  - Remote connections to IBM DB2 Universal Database on i5/OS versions V5R3 and V5R4. Please ensure that PTFs SI27250 and SI27256 are installed for i5/OS version V5R4 and PTF SI27358 is installed for /OS version V5R3
   - Remote connections to IBM DB2 Universal Database on z/OS version 8
+  - Remote connections to IBM DB2 Universal Database on z/OS version 9
 
 
-Installing the IBM_DB adapter and driver as a Rails plugin
-==========================================================
-1. Linux and Unix platforms:
-  Register Repository and Query
-  $ ./script/plugin  source  svn://rubyforge.org/var/svn/rubyibm/trunk/IBM_DB_Adapter/ibm_db/
-  $ ./script/plugin list
+There are two alternatives for installing the IBM_DB adapter and driver:
+  A. Installing as a Ruby gem in the Ruby runtime
+  B. Installing as a Rails plugin in a specific Rails application runtime
+Note: The IBM_DB driver can also be built separately (from source)
 
-  INSTALL
-  $ ./script/plugin install ibm_db
-
-  TEST
-  Note: Make sure there's no ibm_db in /gems/activerecord-1.15.3/lib/active_record.rb (Line 77)
-  $ ./script/console
-
-2. Windows platforms:
-  REGISTER REPOSITORY and QUERY  (not enabled yet @rubyibm.rubyforge.org)
-  D:\NewApp>ruby script\plugin source http://rubyibm.rubyforge.org/IBM_DB_Adapter/ibm_db/
-  D:\NewApp>ruby script\plugin list
-
-  INSTALL
-  D:\NewApp>ruby script\plugin install ibm_db
-
-  TEST
-  Note: Make sure there's no ibm_db in gems\1.8\gems\activerecord-1.15.3\lib\active_record.rb (Line 77)
-  D:\NewApp>ruby script\console
-
-
-
-Installing the IBM_DB adapter and driver as a Ruby Gem
+A. Installing the IBM_DB adapter and driver as a Ruby Gem
 =======================================================
 
 1. Windows platforms:
@@ -124,6 +109,33 @@ Installing the IBM_DB adapter and driver as a Ruby Gem
    $ ./script/console
 
 
+B. Installing the IBM_DB adapter and driver as a Rails plugin
+==========================================================
+1. Linux and Unix platforms:
+  Register Repository and Query
+  $ ./script/plugin  source  svn://rubyforge.org/var/svn/rubyibm/trunk/IBM_DB_Adapter/ibm_db/
+  $ ./script/plugin list
+
+  INSTALL
+  $ ./script/plugin install ibm_db
+
+  TEST
+  Note: Make sure there's no ibm_db in /gems/activerecord-1.15.3/lib/active_record.rb (Line 77)
+  $ ./script/console
+
+2. Windows platforms:
+  REGISTER REPOSITORY and QUERY  (not enabled yet @rubyibm.rubyforge.org)
+  D:\NewApp>ruby script\plugin source http://rubyibm.rubyforge.org/IBM_DB_Adapter/ibm_db/
+  D:\NewApp>ruby script\plugin list
+
+  INSTALL
+  D:\NewApp>ruby script\plugin install ibm_db
+
+  TEST
+  Note: Make sure there's no ibm_db in gems\1.8\gems\activerecord-1.15.3\lib\active_record.rb (Line 77)
+  D:\NewApp>ruby script\console
+
+
 Instructions for building and installing the IBM_DB driver from source
 =======================================================================
 
@@ -176,17 +188,6 @@ Instructions for building and installing the IBM_DB driver from source
   rake 
 
 
-Instructions to manually install IBM_DB Adapter in the ActiveRecord gem
-=======================================================================
-
- Installation
-  - copy ibm_db_adapter.rb into \activerecord-1.15.3\lib\active_record\connection_adapters
-  - copy db2-i5-zOS.yaml into \activerecord-1.15.3\lib\active_record\vendor
-  - add the element ibm_db to RAILS_CONNECTION_ADAPTERS in \activerecord-1.15.3\lib\active_record.rb. 
-    The array declaration becomes: 
-    RAILS_CONNECTION_ADAPTERS = %w( mysql postgresql sqlite firebird sqlserver db2 oracle sybase openbase ibm_db )
-
-
 Limitations and known problems
 ==============================
 - ActiveRecord add_limit_offset! method is not supported for DB2 zOS and i5. 
@@ -210,12 +211,14 @@ Limitations and known problems
   in the COMMON section of your DB2 CLI initialization file (db2cli.ini). Please refer to 
   http://publib.boulder.ibm.com/infocenter/db2luw/v9/topic/com.ibm.db2.udb.apdv.cli.doc/doc/c0007882.htm
   for more information.
+- The behavior of ActiveRecord::Base.find(:first), without an :order attribute, may be unpredictable.
+  The first record, ie. the record with the minimum id may be not be retrieved. In a relational model,
+  the order of the rows returned is unpredictable and independent of the order of insertion.
+  This issue may be addressed in a future release. 
 
 To Do
 ====
-- Support DB2 zOS version 9
 - Support Informix Dynamic Server 11.10
-- Support ActiveRecord add_limit_offset! method for DB2 zOS and i5
 - Support ActiveRecord rename_column method for DB2 zOS version 9
 
 

data/ext/ibm_db.c

@@ -10,7 +10,7 @@
   +----------------------------------------------------------------------+
 */
 
-#define MODULE_RELEASE "0.4.6"
+#define MODULE_RELEASE "0.6.0"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -507,42 +507,63 @@ void ruby_init_ibm_db()
   memset(ibm_db_globals, 0, sizeof(struct _ibm_db_globals));
   ruby_ibm_db_init_globals(ibm_db_globals);
 
-  /* Specifies that binary data shall be converted to a hexadecimal encoding and returned as an ASCII string. */
+  /* Specifies that binary data shall be converted to a hexadecimal encoding and returned as an ASCII string */
   rb_define_const(mDB, "BINARY", INT2NUM(1));
-  /* Specifies that binary data shall be converted to a hexadecimal encoding and returned as an ASCII string. */
+  /* Specifies that binary data shall be converted to a hexadecimal encoding and returned as an ASCII string */
   rb_define_const(mDB, "CONVERT", INT2NUM(2));
-  /* Specifies that binary data shall be converted to a NULL value. */
+  /* Specifies that binary data shall be converted to a NULL value */
   rb_define_const(mDB, "PASSTHRU", INT2NUM(3));
-  /* Specifies that the column should be bound directly to a file for input. */
+  /* Specifies that the column should be bound directly to a file for input */
   rb_define_const(mDB, "PARAM_FILE", INT2NUM(11));
-  /* Specifies that column names attribut :ATTENTION: this number is not currently in CLI check wiht later versions. */
+  /* Specifies the column names case attribute <b>ATTENTION</b> this number is not currently in CLI but used for ibm_db purpose only */
   rb_define_const(mDB, "ATTR_CASE", INT2NUM(ATTR_CASE));
-  /* Specifies that column names will be returned in their natural case. */
+  /* Specifies that column names will be returned in their natural case */
   rb_define_const(mDB, "CASE_NATURAL", INT2NUM(0));
-  /* Specifies that column names will be returned in lower case. */
+  /* Specifies that column names will be returned in lower case */
   rb_define_const(mDB, "CASE_LOWER", INT2NUM(1));
-  /* Specifies that column names will be returned in upper case. */
+  /* Specifies that column names will be returned in upper case */
   rb_define_const(mDB, "CASE_UPPER", INT2NUM(2));
-
+  /* Specifies the cursor type */
   rb_define_const(mDB, "SQL_ATTR_CURSOR_TYPE", INT2NUM(SQL_ATTR_CURSOR_TYPE));
+  /* Cursor type that detects all changes to the result set <b>ATTENTION</b> Only supported when using DB2 for z/OS Version 8.1 and later. */
   rb_define_const(mDB, "SQL_CURSOR_DYNAMIC", INT2NUM(SQL_CURSOR_DYNAMIC));
+  /* Cursor type that only scrolls forward. This is the default */
   rb_define_const(mDB, "SQL_CURSOR_FORWARD_ONLY", INT2NUM(SQL_CURSOR_FORWARD_ONLY));
+  /* Cursor type is a pure keyset cursor */
   rb_define_const(mDB, "SQL_CURSOR_KEYSET_DRIVEN", INT2NUM(SQL_CURSOR_KEYSET_DRIVEN));
+  /* Cursor type that only scrolls forward */
   rb_define_const(mDB, "SQL_SCROLL_FORWARD_ONLY", INT2NUM(SQL_SCROLL_FORWARD_ONLY));
+  /* Cursor type in which the data in the result set is static */
+  rb_define_const(mDB, "SQL_CURSOR_STATIC", INT2NUM(SQL_CURSOR_STATIC));
+  /* Parmater binding type of input  */
   rb_define_const(mDB, "SQL_PARAM_INPUT", INT2NUM(SQL_PARAM_INPUT));
+  /* Parmater binding type of output  */
   rb_define_const(mDB, "SQL_PARAM_OUTPUT", INT2NUM(SQL_PARAM_OUTPUT));
+  /* Parmater binding type of input/output  */
   rb_define_const(mDB, "SQL_PARAM_INPUT_OUTPUT", INT2NUM(SQL_PARAM_INPUT_OUTPUT));
+  /* Data type used to specify binary data  */
   rb_define_const(mDB, "SQL_BINARY", INT2NUM(SQL_BINARY));
+  /* Data type used to specify bigint data */
   rb_define_const(mDB, "SQL_BIGINT", INT2NUM(SQL_BIGINT));
+  /* Data type used to specify long data */
   rb_define_const(mDB, "SQL_LONG", INT2NUM(SQL_INTEGER));
+  /* Data type used to specify double data */
   rb_define_const(mDB, "SQL_DOUBLE", INT2NUM(SQL_DOUBLE));
+  /* Data type used to specify char data */
   rb_define_const(mDB, "SQL_CHAR", INT2NUM(SQL_CHAR));
+  /* Operates in auto-commit mode off. The application must manually commit or rollback transactions */
   rb_define_const(mDB, "SQL_AUTOCOMMIT_OFF", INT2NUM(SQL_AUTOCOMMIT_OFF));
+  /* Operates in auto-commit mode on. This is the default */
   rb_define_const(mDB, "SQL_AUTOCOMMIT_ON", INT2NUM(SQL_AUTOCOMMIT_ON));
+  /* Specifies whether to use auto-commit or manual commit mode */
   rb_define_const(mDB, "SQL_ATTR_AUTOCOMMIT", INT2NUM(SQL_ATTR_AUTOCOMMIT));
+  /* String used to identify the client user ID sent to the host database */
   rb_define_const(mDB, "SQL_ATTR_INFO_USERID", INT2NUM(SQL_ATTR_INFO_USERID));
+  /* String used to identify the client workstation name sent to the host database */
   rb_define_const(mDB, "SQL_ATTR_INFO_WRKSTNNAME", INT2NUM(SQL_ATTR_INFO_WRKSTNNAME));
+  /* String used to identify the client application name sent to the host database */
   rb_define_const(mDB, "SQL_ATTR_INFO_APPLNAME", INT2NUM(SQL_ATTR_INFO_APPLNAME));
+  /* String used to identify the client accounting string sent to the host database */
   rb_define_const(mDB, "SQL_ATTR_INFO_ACCTSTR", INT2NUM(SQL_ATTR_INFO_ACCTSTR));
   rb_global_variable(&persistent_list);
 
@@ -736,11 +757,7 @@ static void _ruby_ibm_db_assign_options( void *handle, int type, long opt_key, V
 #ifdef PASE
       rc = SQLSetStmtAttr((SQLHSTMT)((stmt_handle *)handle)->hstmt, opt_key, (SQLPOINTER)&option_str, SQL_IS_INTEGER );
 #else
-      if (is_systemi != 1) {    /* Not i5 */
-        rc = SQLSetStmtAttr((SQLHSTMT)((stmt_handle *)handle)->hstmt, opt_key, (SQLPOINTER)option_str, SQL_IS_INTEGER );
-      } else {                  /* Is i5 */
-        rc = SQLSetStmtAttr((SQLHSTMT)((stmt_handle *)handle)->hstmt, opt_key, (SQLPOINTER)&option_str, SQL_IS_INTEGER );
-      }
+      rc = SQLSetStmtAttr((SQLHSTMT)((stmt_handle *)handle)->hstmt, opt_key, (SQLPOINTER)option_str, SQL_IS_INTEGER );
 #endif
       if ( rc == SQL_ERROR ) {
         _ruby_ibm_db_check_sql_errors((SQLHSTMT)((stmt_handle *)handle)->hstmt, SQL_HANDLE_STMT, rc, 1, NULL, -1, 1);
@@ -752,11 +769,7 @@ static void _ruby_ibm_db_assign_options( void *handle, int type, long opt_key, V
 #ifdef PASE
       rc = SQLSetStmtAttr((SQLHSTMT)((stmt_handle *)handle)->hstmt, opt_key, (SQLPOINTER)&option_num, SQL_IS_INTEGER );
 #else
-      if (is_systemi != 1) {    /* Not i5 */
-        rc = SQLSetStmtAttr((SQLHSTMT)((stmt_handle *)handle)->hstmt, opt_key, (SQLPOINTER)option_num, SQL_IS_INTEGER );
-      } else {                  /* Is i5 */
-        rc = SQLSetStmtAttr((SQLHSTMT)((stmt_handle *)handle)->hstmt, opt_key, (SQLPOINTER)&option_num, SQL_IS_INTEGER );
-      }
+      rc = SQLSetStmtAttr((SQLHSTMT)((stmt_handle *)handle)->hstmt, opt_key, (SQLPOINTER)option_num, SQL_IS_INTEGER );
 #endif
       if ( rc == SQL_ERROR ) {
         _ruby_ibm_db_check_sql_errors((SQLHSTMT)((stmt_handle *)handle)->hstmt, SQL_HANDLE_STMT, rc, 1, NULL, -1, 1);
@@ -768,11 +781,7 @@ static void _ruby_ibm_db_assign_options( void *handle, int type, long opt_key, V
 #ifdef PASE
       rc = SQLSetConnectAttr((SQLHSTMT)((conn_handle*)handle)->hdbc, opt_key, (SQLPOINTER)&option_str, SQL_NTS);
 #else
-      if (is_systemi != 1) {    /* Not i5 */
-        rc = SQLSetConnectAttr((SQLHSTMT)((conn_handle*)handle)->hdbc, opt_key, (SQLPOINTER)option_str, SQL_NTS);
-      } else {                  /* Is i5 */
-        rc = SQLSetConnectAttr((SQLHSTMT)((conn_handle*)handle)->hdbc, opt_key, (SQLPOINTER)&option_str, SQL_NTS);
-      }
+      rc = SQLSetConnectAttr((SQLHSTMT)((conn_handle*)handle)->hdbc, opt_key, (SQLPOINTER)option_str, SQL_NTS);
 #endif
       if ( rc == SQL_ERROR ) {
         _ruby_ibm_db_check_sql_errors((SQLHSTMT)((stmt_handle *)handle)->hstmt, SQL_HANDLE_STMT, rc, 1, NULL, -1, 1);
@@ -784,11 +793,7 @@ static void _ruby_ibm_db_assign_options( void *handle, int type, long opt_key, V
 #ifdef PASE
       rc = SQLSetConnectAttr((SQLHSTMT)((conn_handle*)handle)->hdbc, opt_key, (SQLPOINTER)&option_num, SQL_IS_INTEGER);
 #else
-      if (is_systemi != 1) {    /* Not i5 */
-        rc = SQLSetConnectAttr((SQLHSTMT)((conn_handle*)handle)->hdbc, opt_key, (SQLPOINTER)option_num, SQL_IS_INTEGER);
-      } else {                  /* Is i5 */
-        rc = SQLSetConnectAttr((SQLHSTMT)((conn_handle*)handle)->hdbc, opt_key, (SQLPOINTER)&option_num, SQL_IS_INTEGER);
-      }
+      rc = SQLSetConnectAttr((SQLHSTMT)((conn_handle*)handle)->hdbc, opt_key, (SQLPOINTER)option_num, SQL_IS_INTEGER);
 #endif
       if ( rc == SQL_ERROR ) {
         _ruby_ibm_db_check_sql_errors((SQLHSTMT)((stmt_handle *)handle)->hstmt, SQL_HANDLE_STMT, rc, 1, NULL, -1, 1);
@@ -1258,6 +1263,7 @@ static void _ruby_ibm_db_clear_conn_err_cache()
  * ===Description
  *
  * resource IBM_DB::connect ( string database, string username, string password [, array options] )
+ *
  * Creates a new connection to an IBM DB2 Universal Database, IBM Cloudscape, or Apache Derby database.
  * ==Parameters
  *
@@ -1318,7 +1324,7 @@ VALUE ibm_db_connect(int argc, VALUE *argv, VALUE self)
  * resource IBM_DB::pconnect ( string database, string username, string password [, array options] )
  * 
  * Returns a persistent connection to an IBM DB2 Universal Database, IBM Cloudscape,
- * or Apache Derby database. For more information on persistent connections, refer to Chapter 41.
+ * or Apache Derby database.
  * 
  * Calling IBM_DB::close() on a persistent connection always returns TRUE, but the underlying DB2 client
  * connection remains open and waiting to serve the next matching IBM_DB::pconnect() request.
@@ -1374,7 +1380,7 @@ VALUE ibm_db_pconnect(int argc, VALUE *argv, VALUE self)
  * ===Description
  * mixed IBM_DB::autocommit ( resource connection [, bool value] )
  *
- * Sets or gets the AUTOCOMMIT behavior of the specified connection resource.
+ * Returns or sets the AUTOCOMMIT behavior of the specified connection resource.
  *
  * ===Parameters
  *
@@ -1546,13 +1552,13 @@ static void _ruby_ibm_db_add_param_cache( stmt_handle *stmt_res, int param_no, c
  *   DB2_CHAR, DB2_DOUBLE, or DB2_LONG . 
  *
  * precision
- *   Specifies the precision with which the variable should be bound to the database. 
+ *   Specifies the precision that the variable should be bound to the database. 
  *
  * scale
- *    Specifies the scale with which the variable should be bound to the database. 
+ *    Specifies the scale that the variable should be bound to the database. 
  *
  * size
- *    Specifies the size with which should be retreived from an INOUT/OUT parameter.
+ *    Specifies the size that should be retreived from an INOUT/OUT parameter.
  *
  * ===Return Values
  *
@@ -1689,7 +1695,7 @@ VALUE ibm_db_bind_param(int argc, VALUE *argv, VALUE self)
  * the corresponding resources to the database server.
  * 
  * If you attempt to close a persistent DB2 client connection created with IBM_DB::pconnect(), the close request
- * is ignored and the persistent DB2 client connection remains available for the next caller.
+ * returns TRUE and the persistent DB2 client connection remains available for the next caller.
  * 
  * ===Parameters
  *
@@ -1782,15 +1788,15 @@ VALUE ibm_db_close(int argc, VALUE *argv, VALUE self)
  * Returns a statement resource with a result set containing rows describing the column privileges
  * for columns matching the specified parameters. The rows are composed of the following columns:
  * 
- * Column name  Description
- * TABLE_CAT  Name of the catalog. The value is NULL if this table does not have catalogs.
- * TABLE_SCHEM  Name of the schema.
- * TABLE_NAME Name of the table or view.
- * COLUMN_NAME  Name of the column.
- * GRANTOR  Authorization ID of the user who granted the privilege.
- * GRANTEE  Authorization ID of the user to whom the privilege was granted.
- * PRIVILEGE  The privilege for the column.
- * IS_GRANTABLE Whether the GRANTEE is permitted to grant this privilege to other users.
+ * <b>Column name</b>:: <b>Description</b>
+ * TABLE_CAT:: Name of the catalog. The value is NULL if this table does not have catalogs.
+ * TABLE_SCHEM:: Name of the schema.
+ * TABLE_NAME:: Name of the table or view.
+ * COLUMN_NAME:: Name of the column.
+ * GRANTOR:: Authorization ID of the user who granted the privilege.
+ * GRANTEE:: Authorization ID of the user to whom the privilege was granted.
+ * PRIVILEGE:: The privilege for the column.
+ * IS_GRANTABLE:: Whether the GRANTEE is permitted to grant this privilege to other users.
  */
 VALUE ibm_db_column_privileges(int argc, VALUE *argv, VALUE self)
 {
@@ -1876,25 +1882,25 @@ VALUE ibm_db_column_privileges(int argc, VALUE *argv, VALUE self)
  * Returns a statement resource with a result set containing rows describing the columns matching the specified parameters.
  * The rows are composed of the following columns:
  * 
- * Column name  Description
- * TABLE_CAT  Name of the catalog. The value is NULL if this table does not have catalogs.
- * TABLE_SCHEM  Name of the schema.
- * TABLE_NAME Name of the table or view.
- * COLUMN_NAME  Name of the column.
- * DATA_TYPE  The SQL data type for the column represented as an integer value.
- * TYPE_NAME  A string representing the data type for the column.
- * COLUMN_SIZE  An integer value representing the size of the column.
- * BUFFER_LENGTH  Maximum number of bytes necessary to store data from this column.
- * DECIMAL_DIGITS The scale of the column, or NULL where scale is not applicable.
- * NUM_PREC_RADIX An integer value of either 10 (representing an exact numeric data type), 2 (representing an approximate numeric data type), or NULL (representing a data type for which radix is not applicable).
- * NULLABLE An integer value representing whether the column is nullable or not.
- * REMARKS  Description of the column.
- * COLUMN_DEF Default value for the column.
- * SQL_DATA_TYPE  An integer value representing the size of the column.
- * SQL_DATETIME_SUB Returns an integer value representing a datetime subtype code, or NULL for SQL data types to which this does not apply.
- * CHAR_OCTET_LENGTH  Maximum length in octets for a character data type column, which matches COLUMN_SIZE for single-byte character set data, or NULL for non-character data types.
- * ORDINAL_POSITION The 1-indexed position of the column in the table.
- * IS_NULLABLE  A string value where 'YES' means that the column is nullable and 'NO' means that the column is not nullable.
+ * <b>Column name</b>:: <b>Description</b>
+ * TABLE_CAT:: Name of the catalog. The value is NULL if this table does not have catalogs.
+ * TABLE_SCHEM:: Name of the schema.
+ * TABLE_NAME:: Name of the table or view.
+ * COLUMN_NAME:: Name of the column.
+ * DATA_TYPE:: The SQL data type for the column represented as an integer value.
+ * TYPE_NAME:: A string representing the data type for the column.
+ * COLUMN_SIZE:: An integer value representing the size of the column.
+ * BUFFER_LENGTH:: Maximum number of bytes necessary to store data from this column.
+ * DECIMAL_DIGITS:: The scale of the column, or NULL where scale is not applicable.
+ * NUM_PREC_RADIX:: An integer value of either 10 (representing an exact numeric data type), 2 (representing an approximate numeric data type), or NULL (representing a data type for which radix is not applicable).
+ * NULLABLE:: An integer value representing whether the column is nullable or not.
+ * REMARKS:: Description of the column.
+ * COLUMN_DEF:: Default value for the column.
+ * SQL_DATA_TYPE:: An integer value representing the size of the column.
+ * SQL_DATETIME_SUB:: Returns an integer value representing a datetime subtype code, or NULL for SQL data types to which this does not apply.
+ * CHAR_OCTET_LENGTH::  Maximum length in octets for a character data type column, which matches COLUMN_SIZE for single-byte character set data, or NULL for non-character data types.
+ * ORDINAL_POSITION:: The 1-indexed position of the column in the table.
+ * IS_NULLABLE:: A string value where 'YES' means that the column is nullable and 'NO' means that the column is not nullable.
  */
 VALUE ibm_db_columns(int argc, VALUE *argv, VALUE self)
 {
@@ -1962,11 +1968,11 @@ VALUE ibm_db_columns(int argc, VALUE *argv, VALUE self)
  * 
  * qualifier
  *     A qualifier for DB2 databases running on OS/390 or z/OS servers. For other databases, pass NULL
- * or an empty string. 
+ *     or an empty string. 
  * 
  * schema
  *     The schema which contains the tables. If schema is NULL, IBM_DB::foreign_keys() matches the schema
- * for the current connection. 
+ *     for the current connection. 
  * 
  * table-name
  *     The name of the table. 
@@ -1976,21 +1982,21 @@ VALUE ibm_db_columns(int argc, VALUE *argv, VALUE self)
  * Returns a statement resource with a result set containing rows describing the foreign keys for
  * the specified table. The result set is composed of the following columns:
  * 
- * Column name  Description
- * PKTABLE_CAT  Name of the catalog for the table containing the primary key. The value is NULL if this table does not have catalogs.
- * PKTABLE_SCHEM  Name of the schema for the table containing the primary key.
- * PKTABLE_NAME Name of the table containing the primary key.
- * PKCOLUMN_NAME  Name of the column containing the primary key.
- * FKTABLE_CAT  Name of the catalog for the table containing the foreign key. The value is NULL if this table does not have catalogs.
- * FKTABLE_SCHEM  Name of the schema for the table containing the foreign key.
- * FKTABLE_NAME Name of the table containing the foreign key.
- * FKCOLUMN_NAME  Name of the column containing the foreign key.
- * KEY_SEQ  1-indexed position of the column in the key.
- * UPDATE_RULE  Integer value representing the action applied to the foreign key when the SQL operation is UPDATE.
- * DELETE_RULE  Integer value representing the action applied to the foreign key when the SQL operation is DELETE.
- * FK_NAME  The name of the foreign key.
- * PK_NAME  The name of the primary key.
- * DEFERRABILITY  An integer value representing whether the foreign key deferrability is SQL_INITIALLY_DEFERRED, SQL_INITIALLY_IMMEDIATE, or SQL_NOT_DEFERRABLE.
+ * <b>Column name</b>::  <b>Description</b>
+ * PKTABLE_CAT:: Name of the catalog for the table containing the primary key. The value is NULL if this table does not have catalogs.
+ * PKTABLE_SCHEM:: Name of the schema for the table containing the primary key.
+ * PKTABLE_NAME:: Name of the table containing the primary key.
+ * PKCOLUMN_NAME:: Name of the column containing the primary key.
+ * FKTABLE_CAT:: Name of the catalog for the table containing the foreign key. The value is NULL if this table does not have catalogs.
+ * FKTABLE_SCHEM:: Name of the schema for the table containing the foreign key.
+ * FKTABLE_NAME:: Name of the table containing the foreign key.
+ * FKCOLUMN_NAME:: Name of the column containing the foreign key.
+ * KEY_SEQ:: 1-indexed position of the column in the key.
+ * UPDATE_RULE:: Integer value representing the action applied to the foreign key when the SQL operation is UPDATE.
+ * DELETE_RULE:: Integer value representing the action applied to the foreign key when the SQL operation is DELETE.
+ * FK_NAME:: The name of the foreign key.
+ * PK_NAME:: The name of the primary key.
+ * DEFERRABILITY:: An integer value representing whether the foreign key deferrability is SQL_INITIALLY_DEFERRED, SQL_INITIALLY_IMMEDIATE, or SQL_NOT_DEFERRABLE.
  */
 VALUE ibm_db_foreign_keys(int argc, VALUE *argv, VALUE self)
 {
@@ -2070,15 +2076,16 @@ VALUE ibm_db_foreign_keys(int argc, VALUE *argv, VALUE self)
  * 
  * ===Return Values
  * 
- * Returns a statement resource with a result set containing rows describing the primary keys for the specified table. The result set is composed of the following columns:
+ * Returns a statement resource with a result set containing rows describing the primary keys for the specified table.
+ * The result set is composed of the following columns:
  * 
- * Column name  Description
- * TABLE_CAT  Name of the catalog for the table containing the primary key. The value is NULL if this table does not have catalogs.
- * TABLE_SCHEM  Name of the schema for the table containing the primary key.
- * TABLE_NAME Name of the table containing the primary key.
- * COLUMN_NAME  Name of the column containing the primary key.
- * KEY_SEQ  1-indexed position of the column in the key.
- * PK_NAME  The name of the primary key.
+ * <b>Column name</b>:: <b>Description</b>
+ * TABLE_CAT:: Name of the catalog for the table containing the primary key. The value is NULL if this table does not have catalogs.
+ * TABLE_SCHEM:: Name of the schema for the table containing the primary key.
+ * TABLE_NAME:: Name of the table containing the primary key.
+ * COLUMN_NAME:: Name of the column containing the primary key.
+ * KEY_SEQ:: 1-indexed position of the column in the key.
+ * PK_NAME:: The name of the primary key.
  */
 VALUE ibm_db_primary_keys(int argc, VALUE *argv, VALUE self)
 {
@@ -2164,34 +2171,30 @@ VALUE ibm_db_primary_keys(int argc, VALUE *argv, VALUE self)
  * Returns a statement resource with a result set containing rows describing the parameters for the stored procedures
  * matching the specified parameters. The rows are composed of the following columns:
  * 
- * Column name  Description
- * PROCEDURE_CAT  The catalog that contains the procedure. The value is NULL if this table does not have catalogs.
- * PROCEDURE_SCHEM  Name of the schema that contains the stored procedure.
- * PROCEDURE_NAME Name of the procedure.
- * COLUMN_NAME  Name of the parameter.
- * COLUMN_TYPE  
- * 
- * An integer value representing the type of the parameter:
- * 
- * Return value Parameter type
- * 1 (SQL_PARAM_INPUT)  Input (IN) parameter.
- * 2 (SQL_PARAM_INPUT_OUTPUT) Input/output (INOUT) parameter.
- * 3 (SQL_PARAM_OUTPUT) Output (OUT) parameter.
- * 
- * DATA_TYPE  The SQL data type for the parameter represented as an integer value.
- * TYPE_NAME  A string representing the data type for the parameter.
- * COLUMN_SIZE  An integer value representing the size of the parameter.
- * BUFFER_LENGTH  Maximum number of bytes necessary to store data for this parameter.
- * DECIMAL_DIGITS The scale of the parameter, or NULL where scale is not applicable.
- * NUM_PREC_RADIX An integer value of either 10 (representing an exact numeric data type), 2 (representing an approximate numeric data type), or NULL (representing a data type for which radix is not applicable).
- * NULLABLE An integer value representing whether the parameter is nullable or not.
- * REMARKS  Description of the parameter.
- * COLUMN_DEF Default value for the parameter.
- * SQL_DATA_TYPE  An integer value representing the size of the parameter.
- * SQL_DATETIME_SUB Returns an integer value representing a datetime subtype code, or NULL for SQL data types to which this does not apply.
- * CHAR_OCTET_LENGTH  Maximum length in octets for a character data type parameter, which matches COLUMN_SIZE for single-byte character set data, or NULL for non-character data types.
- * ORDINAL_POSITION The 1-indexed position of the parameter in the CALL statement.
- * IS_NULLABLE  A string value where 'YES' means that the parameter accepts or returns NULL values and 'NO' means that the parameter does not accept or return NULL values.
+ * <b>Column name</b>::  <b>Description</b>
+ * PROCEDURE_CAT:: The catalog that contains the procedure. The value is NULL if this table does not have catalogs.
+ * PROCEDURE_SCHEM:: Name of the schema that contains the stored procedure.
+ * PROCEDURE_NAME:: Name of the procedure.
+ * COLUMN_NAME:: Name of the parameter.
+ * COLUMN_TYPE:: An integer value representing the type of the parameter:
+ *               Return value:: Parameter type
+ *               1:: (SQL_PARAM_INPUT)  Input (IN) parameter.
+ *               2:: (SQL_PARAM_INPUT_OUTPUT) Input/output (INOUT) parameter.
+ *               3:: (SQL_PARAM_OUTPUT) Output (OUT) parameter.
+ * DATA_TYPE:: The SQL data type for the parameter represented as an integer value.
+ * TYPE_NAME:: A string representing the data type for the parameter.
+ * COLUMN_SIZE:: An integer value representing the size of the parameter.
+ * BUFFER_LENGTH:: Maximum number of bytes necessary to store data for this parameter.
+ * DECIMAL_DIGITS:: The scale of the parameter, or NULL where scale is not applicable.
+ * NUM_PREC_RADIX:: An integer value of either 10 (representing an exact numeric data type), 2 (representing anapproximate numeric data type), or NULL (representing a data type for which radix is not applicable).
+ * NULLABLE:: An integer value representing whether the parameter is nullable or not.
+ * REMARKS:: Description of the parameter.
+ * COLUMN_DEF:: Default value for the parameter.
+ * SQL_DATA_TYPE:: An integer value representing the size of the parameter.
+ * SQL_DATETIME_SUB:: Returns an integer value representing a datetime subtype code, or NULL for SQL data types to which this does not apply.
+ * CHAR_OCTET_LENGTH:: Maximum length in octets for a character data type parameter, which matches COLUMN_SIZE for single-byte character set data, or NULL for non-character data types.
+ * ORDINAL_POSITION:: The 1-indexed position of the parameter in the CALL statement.
+ * IS_NULLABLE:: A string value where 'YES' means that the parameter accepts or returns NULL values and 'NO' means that the parameter does not accept or return NULL values.
  */
 VALUE ibm_db_procedure_columns(int argc, VALUE *argv, VALUE self)
 {
@@ -2284,15 +2287,15 @@ VALUE ibm_db_procedure_columns(int argc, VALUE *argv, VALUE self)
  * 
  * Returns a statement resource with a result set containing rows describing the stored procedures matching the specified parameters. The rows are composed of the following columns:
  * 
- * Column name  Description
- * PROCEDURE_CAT  The catalog that contains the procedure. The value is NULL if this table does not have catalogs.
- * PROCEDURE_SCHEM  Name of the schema that contains the stored procedure.
- * PROCEDURE_NAME Name of the procedure.
- * NUM_INPUT_PARAMS Number of input (IN) parameters for the stored procedure.
- * NUM_OUTPUT_PARAMS  Number of output (OUT) parameters for the stored procedure.
- * NUM_RESULT_SETS  Number of result sets returned by the stored procedure.
- * REMARKS  Any comments about the stored procedure.
- * PROCEDURE_TYPE Always returns 1, indicating that the stored procedure does not return a return value.
+ * <b>Column name</b>:: <b>Description</b>
+ * PROCEDURE_CAT:: The catalog that contains the procedure. The value is NULL if this table does not have catalogs.
+ * PROCEDURE_SCHEM:: Name of the schema that contains the stored procedure.
+ * PROCEDURE_NAME:: Name of the procedure.
+ * NUM_INPUT_PARAMS:: Number of input (IN) parameters for the stored procedure.
+ * NUM_OUTPUT_PARAMS:: Number of output (OUT) parameters for the stored procedure.
+ * NUM_RESULT_SETS:: Number of result sets returned by the stored procedure.
+ * REMARKS:: Any comments about the stored procedure.
+ * PROCEDURE_TYPE:: Always returns 1, indicating that the stored procedure does not return a return value.
  */
 VALUE ibm_db_procedures(int argc, VALUE *argv, VALUE self)
 {
@@ -2378,31 +2381,32 @@ VALUE ibm_db_procedures(int argc, VALUE *argv, VALUE self)
  * scope
  *     Integer value representing the minimum duration for which the unique row identifier is valid. This can be one of the following values:
  * 
- *     Integer value  SQL constant  Description
- *     0  SQL_SCOPE_CURROW  Row identifier is valid only while the cursor is positioned on the row.
- *     1  SQL_SCOPE_TRANSACTION Row identifier is valid for the duration of the transaction.
- *     2  SQL_SCOPE_SESSION Row identifier is valid for the duration of the connection.
+ *     0: Row identifier is valid only while the cursor is positioned on the row. (SQL_SCOPE_CURROW)
+ *     1: Row identifier is valid for the duration of the transaction. (SQL_SCOPE_TRANSACTION)
+ *     2: Row identifier is valid for the duration of the connection. (SQL_SCOPE_SESSION)
  * 
  * ===Return Values
  * 
- * Returns a statement resource with a result set containing rows with unique row identifier information for a table. The rows are composed of the following columns:
- * 
- * Column name  Description
- * SCOPE  
- * 
- * Integer value  SQL constant  Description
- * 0  SQL_SCOPE_CURROW  Row identifier is valid only while the cursor is positioned on the row.
- * 1  SQL_SCOPE_TRANSACTION Row identifier is valid for the duration of the transaction.
- * 2  SQL_SCOPE_SESSION Row identifier is valid for the duration of the connection.
+ * Returns a statement resource with a result set containing rows with unique row identifier information for a table.
+ * The rows are composed of the following columns:
  * 
- * COLUMN_NAME  Name of the unique column.
- * DATA_TYPE  SQL data type for the column.
- * TYPE_NAME  Character string representation of the SQL data type for the column.
- * COLUMN_SIZE  An integer value representing the size of the column.
- * BUFFER_LENGTH  Maximum number of bytes necessary to store data from this column.
- * DECIMAL_DIGITS The scale of the column, or NULL where scale is not applicable.
- * NUM_PREC_RADIX An integer value of either 10 (representing an exact numeric data type), 2 (representing an approximate numeric data type), or NULL (representing a data type for which radix is not applicable).
- * PSEUDO_COLUMN  Always returns 1.
+ * <b>Column name</b>:: <b>Description</b>
+ * SCOPE:: Integer value representing the minimum duration for which the unique row identifier is valid.
+ *
+ *         0: Row identifier is valid only while the cursor is positioned on the row. (SQL_SCOPE_CURROW)
+ *
+ *         1: Row identifier is valid for the duration of the transaction. (SQL_SCOPE_TRANSACTION)
+ *
+ *         2: Row identifier is valid for the duration of the connection. (SQL_SCOPE_SESSION)
+ * COLUMN_NAME:: Name of the unique column.
+ * DATA_TYPE:: SQL data type for the column.
+ * TYPE_NAME:: Character string representation of the SQL data type for the column.
+ * COLUMN_SIZE:: An integer value representing the size of the column.
+ * BUFFER_LENGTH:: Maximum number of bytes necessary to store data from this column.
+ * DECIMAL_DIGITS:: The scale of the column, or NULL where scale is not applicable.
+ * NUM_PREC_RADIX:: An integer value of either 10 (representing an exact numeric data type),2 (representing an
+ *                  approximate numeric data type), or NULL (representing a data type for which radix is not applicable).
+ * PSEUDO_COLUMN:: Always returns 1.
  */
 VALUE ibm_db_special_columns(int argc, VALUE *argv, VALUE self)
 {
@@ -2482,7 +2486,8 @@ VALUE ibm_db_special_columns(int argc, VALUE *argv, VALUE self)
  *     A qualifier for DB2 databases running on OS/390 or z/OS servers. For other databases, pass NULL or an empty string. 
  * 
  * schema
- *     The schema that contains the targeted table. If this parameter is NULL, the statistics and indexes are returned for the schema of the current user. 
+ *     The schema that contains the targeted table. If this parameter is NULL, the statistics and indexes are
+ *     returned for the schema of the current user. 
  * 
  * table_name
  *     The name of the table. 
@@ -2496,47 +2501,44 @@ VALUE ibm_db_special_columns(int argc, VALUE *argv, VALUE self)
  * 
  * ===Return Values
  * 
- * Returns a statement resource with a result set containing rows describing the statistics and indexes for the base tables matching the specified parameters. The rows are composed of the following columns:
- * 
- * Column name  Description
- * TABLE_CAT  The catalog that contains the table. The value is NULL if this table does not have catalogs.
- * TABLE_SCHEM  Name of the schema that contains the table.
- * TABLE_NAME Name of the table.
- * NON_UNIQUE 
- * 
- * An integer value representing whether the index prohibits unique values, or whether the row represents statistics on the table itself:
- * 
- * Return value Parameter type
- * 0 (SQL_FALSE)  The index allows duplicate values.
- * 1 (SQL_TRUE) The index values must be unique.
- * NULL This row is statistics information for the table itself.
- * 
- * INDEX_QUALIFIER  A string value representing the qualifier that would have to be prepended to INDEX_NAME to fully qualify the index.
- * INDEX_NAME A string representing the name of the index.
- * TYPE 
- * 
- * An integer value representing the type of information contained in this row of the result set:
- * 
- * Return value Parameter type
- * 0 (SQL_TABLE_STAT) The row contains statistics about the table itself.
- * 1 (SQL_INDEX_CLUSTERED)  The row contains information about a clustered index.
- * 2 (SQL_INDEX_HASH) The row contains information about a hashed index.
- * 3 (SQL_INDEX_OTHER)  The row contains information about a type of index that is neither clustered nor hashed.
- * 
- * ORDINAL_POSITION The 1-indexed position of the column in the index. NULL if the row contains statistics information about the table itself.
- * COLUMN_NAME  The name of the column in the index. NULL if the row contains statistics information about the table itself.
- * ASC_OR_DESC  A if the column is sorted in ascending order, D if the column is sorted in descending order, NULL if the row contains statistics information about the table itself.
- * CARDINALITY  
- * 
- * If the row contains information about an index, this column contains an integer value representing the number of unique values in the index.
- * 
- * If the row contains information about the table itself, this column contains an integer value representing the number of rows in the table.
- * PAGES  
- * 
- * If the row contains information about an index, this column contains an integer value representing the number of pages used to store the index.
+ * Returns a statement resource with a result set containing rows describing the statistics and indexes for the base tables
+ * matching the specified parameters. The rows are composed of the following columns:
  * 
- * If the row contains information about the table itself, this column contains an integer value representing the number of pages used to store the table.
- * FILTER_CONDITION Always returns NULL.
+ * <b>Column name</b>:: <b>Description</b>
+ * TABLE_CAT:: The catalog that contains the table. The value is NULL if this table does not have catalogs.
+ * TABLE_SCHEM:: Name of the schema that contains the table.
+ * TABLE_NAME:: Name of the table.
+ * NON_UNIQUE:: An integer value representing whether the index prohibits unique values, or whether the row represents
+ *              statistics on the table itself:
+ * 
+ *              Return value:: Parameter type
+ *              0 (SQL_FALSE):: The index allows duplicate values.
+ *              1 (SQL_TRUE):: The index values must be unique.
+ *              NULL:: This row is statistics information for the table itself.
+ * 
+ * INDEX_QUALIFIER:: A string value representing the qualifier that would have to be prepended to INDEX_NAME to fully qualify the index.
+ * INDEX_NAME:: A string representing the name of the index.
+ * TYPE:: An integer value representing the type of information contained in this row of the result set:
+ * 
+ *        Return value:: Parameter type
+ *        0 (SQL_TABLE_STAT):: The row contains statistics about the table itself.
+ *        1 (SQL_INDEX_CLUSTERED):: The row contains information about a clustered index.
+ *        2 (SQL_INDEX_HASH):: The row contains information about a hashed index.
+ *        3 (SQL_INDEX_OTHER):: The row contains information about a type of index that is neither clustered nor hashed.
+ * 
+ * ORDINAL_POSITION:: The 1-indexed position of the column in the index. NULL if the row contains statistics information about the table itself.
+ * COLUMN_NAME:: The name of the column in the index. NULL if the row contains statistics information about the table itself.
+ * ASC_OR_DESC:: A if the column is sorted in ascending order, D if the column is sorted in descending order, NULL
+ *               if the row contains statistics information about the table itself.
+ * CARDINALITY:: If the row contains information about an index, this column contains an integer value representing the number
+ *               of unique values in the index.
+ *               If the row contains information about the table itself, this column contains an integer value representing the
+ *               number of rows in the table.
+ * PAGES:: If the row contains information about an index, this column contains an integer value representing the number of pages
+ *         used to store the index.
+ *         If the row contains information about the table itself, this column contains an integer value representing the number
+ *         of pages used to store the table.
+ * FILTER_CONDITION:: Always returns NULL.
  */
 VALUE ibm_db_statistics(int argc, VALUE *argv, VALUE self)
 {
@@ -2596,8 +2598,7 @@ VALUE ibm_db_statistics(int argc, VALUE *argv, VALUE self)
  * IBM_DB::table_privileges --  Returns a result set listing the tables and associated privileges in a database
  * 
  * ===Description
- * resource IBM_DB::table_privileges ( resource connection [, string qualifier [, string schema 
- *                                                     [, string table_name]]] )
+ * resource IBM_DB::table_privileges ( resource connection [, string qualifier [, string schema [, string table_name]]] )
  * 
  * Returns a result set listing the tables and associated privileges in a database.
  * 
@@ -2622,16 +2623,15 @@ VALUE ibm_db_statistics(int argc, VALUE *argv, VALUE self)
  * Returns a statement resource with a result set containing rows describing the privileges for the
  * tables that match the specified parameters. The rows are composed of the following columns:
  * 
- * Column name  Description
- * TABLE_CAT  The catalog that contains the table. The value is NULL if this table does not have catalogs.
- * TABLE_SCHEM  Name of the schema that contains the table.
- * TABLE_NAME Name of the table.
- * GRANTOR  Authorization ID of the user who granted the privilege.
- * GRANTEE  Authorization ID of the user to whom the privilege was granted.
- * PRIVILEGE  The privilege that has been granted. This can be one of ALTER, CONTROL, DELETE, INDEX,
- * INSERT, REFERENCES, SELECT, or UPDATE.
- * IS_GRANTABLE A string value of "YES" or "NO" indicating whether the grantee can grant the privilege
- * to other users.
+ * <b>Column name</b>:: <b>Description</b>
+ * TABLE_CAT:: The catalog that contains the table. The value is NULL if this table does not have catalogs.
+ * TABLE_SCHEM:: Name of the schema that contains the table.
+ * TABLE_NAME:: Name of the table.
+ * GRANTOR:: Authorization ID of the user who granted the privilege.
+ * GRANTEE:: Authorization ID of the user to whom the privilege was granted.
+ * PRIVILEGE:: The privilege that has been granted. This can be one of ALTER, CONTROL, DELETE, INDEX,
+ *             INSERT, REFERENCES, SELECT, or UPDATE.
+ * IS_GRANTABLE:: A string value of "YES" or "NO" indicating whether the grantee can grant the privilege to other users.
  */
 VALUE ibm_db_table_privileges(int argc, VALUE *argv, VALUE self)
 {
@@ -2719,18 +2719,21 @@ VALUE ibm_db_table_privileges(int argc, VALUE *argv, VALUE self)
  *     The name of the table. This parameter accepts a search pattern containing _ and % as wildcards. 
  * 
  * table-type
- *     A list of comma-delimited table type identifiers. To match all table types, pass NULL or an empty string. Valid table type identifiers include: ALIAS, HIERARCHY TABLE, INOPERATIVE VIEW, NICKNAME, MATERIALIZED QUERY TABLE, SYSTEM TABLE, TABLE, TYPED TABLE, TYPED VIEW, and VIEW. 
+ *     A list of comma-delimited table type identifiers. To match all table types, pass NULL or an empty string.
+ *     Valid table type identifiers include: ALIAS, HIERARCHY TABLE, INOPERATIVE VIEW, NICKNAME, MATERIALIZED QUERY
+ *     TABLE, SYSTEM TABLE, TABLE, TYPED TABLE, TYPED VIEW, and VIEW. 
  * 
  * ===Return Values
  * 
- * Returns a statement resource with a result set containing rows describing the tables that match the specified parameters. The rows are composed of the following columns:
+ * Returns a statement resource with a result set containing rows describing the tables that match the specified parameters.
+ * The rows are composed of the following columns:
  * 
- * Column name  Description
- * TABLE_CAT  The catalog that contains the table. The value is NULL if this table does not have catalogs.
- * TABLE_SCHEM  Name of the schema that contains the table.
- * TABLE_NAME Name of the table.
- * TABLE_TYPE Table type identifier for the table.
- * REMARKS  Description of the table.
+ * <b>Column name</b>:: <b>Description</b>
+ * TABLE_CAT:: The catalog that contains the table. The value is NULL if this table does not have catalogs.
+ * TABLE_SCHEMA:: Name of the schema that contains the table.
+ * TABLE_NAME:: Name of the table.
+ * TABLE_TYPE:: Table type identifier for the table.
+ * REMARKS:: Description of the table.
  */
 VALUE ibm_db_tables(int argc, VALUE *argv, VALUE self)
 {
@@ -2791,7 +2794,8 @@ VALUE ibm_db_tables(int argc, VALUE *argv, VALUE self)
  * Commits an in-progress transaction on the specified connection resource and begins a new transaction.
  * Ruby applications normally default to AUTOCOMMIT mode, so IBM_DB::commit() is not necessary unless
  * AUTOCOMMIT has been turned off for the connection resource.
- *     Note: If the specified connection resource is a persistent connection, all transactions
+ *
+ * <b>Note:</b> If the specified connection resource is a persistent connection, all transactions
  * in progress for all applications using that persistent connection will be committed. For this reason,
  * persistent connections are not recommended for use in applications that require transactions. 
  * 
@@ -4008,7 +4012,8 @@ VALUE ibm_db_num_fields(int argc, VALUE *argv, VALUE self)
  * if the number of rows is 0, consider modifying your application to attempt to return the first row
  * with one of IBM_DB::fetch_assoc(), IBM_DB::fetch_both(), IBM_DB::fetch_array(), or IBM_DB::fetch_row(), and branch
  * if the fetch function returns FALSE.
- *     Note: If you issue a SELECT statement using a scrollable cursor, IBM_DB::num_rows() returns the
+ *
+ * <b>Note:</b> If you issue a SELECT statement using a scrollable cursor, IBM_DB::num_rows() returns the
  * number of rows returned by the SELECT statement. However, the overhead associated with scrollable cursors
  * significantly degrades the performance of your application, so if this is the only reason you are
  * considering using scrollable cursors, you should use a forward-only cursor and either 
@@ -4146,7 +4151,7 @@ VALUE ibm_db_field_name(int argc, VALUE *argv, VALUE self)
  * 
  * column
  *     Specifies the column in the result set. This can either be an integer representing the
- * 0-indexed position of the column, or a string containing the name of the column. 
+ *     0-indexed position of the column, or a string containing the name of the column. 
  * 
  * ===Return Values
  * 
@@ -4254,7 +4259,7 @@ VALUE ibm_db_field_num(int argc, VALUE *argv, VALUE self)
  * 
  * column
  *     Specifies the column in the result set. This can either be an integer representing the
- * 0-indexed position of the column, or a string containing the name of the column. 
+ *     0-indexed position of the column, or a string containing the name of the column. 
  * 
  * ===Return Values
  * 
@@ -4304,7 +4309,7 @@ VALUE ibm_db_field_precision(int argc, VALUE *argv, VALUE self)
  * 
  * column
  *     Specifies the column in the result set. This can either be an integer representing the
- * 0-indexed position of the column, or a string containing the name of the column. 
+ *     0-indexed position of the column, or a string containing the name of the column. 
  * 
  * ===Return Values
  * 
@@ -4353,7 +4358,7 @@ VALUE ibm_db_field_scale(int argc, VALUE *argv, VALUE self)
  * 
  * column
  *     Specifies the column in the result set. This can either be an integer representing the
- * 0-indexed position of the column, or a string containing the name of the column. 
+ *     0-indexed position of the column, or a string containing the name of the column. 
  * 
  * ===Return Values
  * 
@@ -4445,7 +4450,7 @@ VALUE ibm_db_field_type(int argc, VALUE *argv, VALUE self)
  * 
  * column
  *     Specifies the column in the result set. This can either be an integer representing the
- * 0-indexed position of the column, or a string containing the name of the column. 
+ *     0-indexed position of the column, or a string containing the name of the column. 
  * 
  * ===Return Values
  * 
@@ -4528,8 +4533,13 @@ VALUE ibm_db_cursor_type(int argc, VALUE *argv, VALUE self)
  * ===Description
  * bool IBM_DB::rollback ( resource connection )
  * 
- * Rolls back an in-progress transaction on the specified connection resource and begins a new transaction. Ruby applications normally default to AUTOCOMMIT mode, so IBM_DB::rollback() normally has no effect unless AUTOCOMMIT has been turned off for the connection resource.
- *     Note: If the specified connection resource is a persistent connection, all transactions in progress for all applications using that persistent connection will be rolled back. For this reason, persistent connections are not recommended for use in applications that require transactions. 
+ * Rolls back an in-progress transaction on the specified connection resource and begins a new transaction. Ruby
+ * applications normally default to AUTOCOMMIT mode, so IBM_DB::rollback() normally has no effect unless AUTOCOMMIT
+ * has been turned off for the connection resource.
+ *
+ * <b>Note:</b> If the specified connection resource is a persistent connection, all transactions in progress for all
+ * applications using that persistent connection will be rolled back. For this reason, persistent connections are not
+ * recommended for use in applications that require transactions. 
  * 
  * ===Parameters
  * 
@@ -5346,7 +5356,7 @@ VALUE ibm_db_fetch_row(int argc, VALUE *argv, VALUE self)
  * row_number
  * 
  *     Requests a specific 1-indexed row from the result set. Passing this parameter results in a
- * Ruby warning if the result set uses a forward-only cursor. 
+ *     Ruby warning if the result set uses a forward-only cursor. 
  * 
  * ===Return Values
  * 
@@ -5416,6 +5426,7 @@ VALUE ibm_db_fetch_object(int argc, VALUE *argv, VALUE self)
  * ===Description
  * 
  * array IBM_DB::fetch_array ( resource stmt [, int row_number] )
+ *
  * Returns an array, indexed by column position, representing a row in a result set. The columns are 0-indexed.
  * 
  * ===Parameters
@@ -5424,7 +5435,7 @@ VALUE ibm_db_fetch_object(int argc, VALUE *argv, VALUE self)
  *     A valid stmt resource containing a result set. 
  * 
  * row_number
- *     Requests a specific 1-indexed row from the result set. Passing this parameter results in a 
+ *     Requests a specific 1-indexed row from the result set. Passing this parameter results in a
  *     Ruby warning if the result set uses a forward-only cursor. 
  * 
  * ===Return Values
@@ -5457,7 +5468,7 @@ VALUE ibm_db_fetch_array(int argc, VALUE *argv, VALUE self)
  * 
  * row_number
  *     Requests a specific 1-indexed row from the result set. Passing this parameter results in a
- * Ruby warning if the result set uses a forward-only cursor. 
+ *     Ruby warning if the result set uses a forward-only cursor. 
  * 
  * ===Return Values
  * 
@@ -5475,22 +5486,20 @@ VALUE ibm_db_fetch_both(int argc, VALUE *argv, VALUE self)
  * IBM_DB::set_option --  Sets the specified option in the resource.
  * 
  * ===Description
- * bool IBM_DB::set_option ( resource stmt, array options, int type )
+ * bool IBM_DB::set_option ( resource resc, array options, int type )
  * 
- * Returns an array, indexed by both column name and position, representing a row in a result set.
- * Note that the row returned by IBM_DB::fetch_both() requires more memory than the single-indexed
- * arrays returned by IBM_DB::fetch_assoc() or IBM_DB::fetch_array().
+ * Sets options for a connection or statement resource. You cannot set options for result set resources.
  * 
  * ===Parameters
  * 
- * stmt
- *     A valid stmt resource containing a result set. 
+ * resc
+ *     A valid connection or statement resource.
  * 
  * options
  *     The options to be set
  *
  * type
- *     A field that specifies the resource type (1 = Connection)
+ *     A field that specifies the resource type (1 = Connection, NON-1 = Statement)
  * 
  * ===Return Values
  * 
@@ -5547,61 +5556,60 @@ VALUE ibm_db_set_option(int argc, VALUE *argv, VALUE self)
  * ===Description
  * object IBM_DB::server_info ( resource connection )
  * 
- * This function returns an object with read-only properties that return information about the IBM DB2, Cloudscape, or Apache Derby database server. The following table lists the database server properties:
- * 
- * Table 1. Database server properties
- * Property name  Return type Description
- * DBMS_NAME  string  The name of the database server to which you are connected. For DB2 servers this is a combination of DB2 followed by the operating system on which the database server is running.
- * DBMS_VER string  The version of the database server, in the form of a string "MM.mm.uuuu" where MM is the major version, mm is the minor version, and uuuu is the update. For example, "08.02.0001" represents major version 8, minor version 2, update 1.
- * DB_CODEPAGE  int The code page of the database to which you are connected.
- * DB_NAME  string  The name of the database to which you are connected.
- * DFT_ISOLATION  string  The default transaction isolation level supported by the server:
- * 
- * UR
- *     Uncommitted read: changes are immediately visible by all concurrent transactions. 
- * 
- * CS
- *     Cursor stability: a row read by one transaction can be altered and committed by a second concurrent transaction. 
- * 
- * RS
- *     Read stability: a transaction can add or remove rows matching a search condition or a pending transaction. 
- * 
- * RR
- *     Repeatable read: data affected by pending transaction is not available to other transactions. 
- * 
- * NC
- *     No commit: any changes are visible at the end of a successful operation. Explicit commits and rollbacks are not allowed. 
- * 
- * IDENTIFIER_QUOTE_CHAR  string  The character used to delimit an identifier.
- * INST_NAME  string  The instance on the database server that contains the database.
- * ISOLATION_OPTION array An array of the isolation options supported by the database server. The isolation options are described in the DFT_ISOLATION property.
- * KEYWORDS array An array of the keywords reserved by the database server.
- * LIKE_ESCAPE_CLAUSE bool  TRUE if the database server supports the use of % and _ wildcard characters. FALSE if the database server does not support these wildcard characters.
- * MAX_COL_NAME_LEN int Maximum length of a column name supported by the database server, expressed in bytes.
- * MAX_IDENTIFIER_LEN int Maximum length of an SQL identifier supported by the database server, expressed in characters.
- * MAX_INDEX_SIZE int Maximum size of columns combined in an index supported by the database server, expressed in bytes.
- * MAX_PROC_NAME_LEN  int Maximum length of a procedure name supported by the database server, expressed in bytes.
- * MAX_ROW_SIZE int Maximum length of a row in a base table supported by the database server, expressed in bytes.
- * MAX_SCHEMA_NAME_LEN  int Maximum length of a schema name supported by the database server, expressed in bytes.
- * MAX_STATEMENT_LEN  int Maximum length of an SQL statement supported by the database server, expressed in bytes.
- * MAX_TABLE_NAME_LEN int Maximum length of a table name supported by the database server, expressed in bytes.
- * NON_NULLABLE_COLUMNS bool  TRUE if the database server supports columns that can be defined as NOT NULL, FALSE if the database server does not support columns defined as NOT NULL.
- * PROCEDURES bool  TRUE if the database server supports the use of the CALL statement to call stored procedures, FALSE if the database server does not support the CALL statement.
- * SPECIAL_CHARS  string  A string containing all of the characters other than a-Z, 0-9, and underscore that can be used in an identifier name.
- * SQL_CONFORMANCE  string  The level of conformance to the ANSI/ISO SQL-92 specification offered by the database server:
- * 
- * 
- * ENTRY
- *     Entry-level SQL-92 compliance. 
- * 
- * FIPS127
- *     FIPS-127-2 transitional compliance. 
- * 
- * FULL
- *     Full level SQL-92 compliance. 
- * 
- * INTERMEDIATE
- *     Intermediate level SQL-92 compliance. 
+ * This function returns a read-only object with information about the IBM DB2, Cloudscape, or Apache Derby database server.
+ * The following table lists the database server properties:
+ * 
+ * ===Table 1. Database server properties
+ * <b>Property name</b>:: <b>Description (Return type)</b>
+ * DBMS_NAME:: The name of the database server to which you are connected. For DB2 servers this is a combination
+ *             of DB2 followed by the operating system on which the database server is running. (string)
+ * DBMS_VER:: The version of the database server, in the form of a string "MM.mm.uuuu" where MM is the major version,
+ *            mm is the minor version, and uuuu is the update. For example, "08.02.0001" represents major version 8,
+ *            minor version 2, update 1. (string)
+ * DB_CODEPAGE:: The code page of the database to which you are connected. (int)
+ * DB_NAME:: The name of the database to which you are connected. (string)
+ * DFT_ISOLATION:: The default transaction isolation level supported by the server: (string)
+ * 
+ *                 UR:: Uncommitted read: changes are immediately visible by all concurrent transactions. 
+ * 
+ *                 CS:: Cursor stability: a row read by one transaction can be altered and committed by a second concurrent transaction. 
+ * 
+ *                 RS:: Read stability: a transaction can add or remove rows matching a search condition or a pending transaction. 
+ * 
+ *                 RR:: Repeatable read: data affected by pending transaction is not available to other transactions. 
+ * 
+ *                 NC:: No commit: any changes are visible at the end of a successful operation. Explicit commits and rollbacks are not allowed. 
+ * 
+ * IDENTIFIER_QUOTE_CHAR:: The character used to delimit an identifier. (string)
+ * INST_NAME:: The instance on the database server that contains the database. (string)
+ * ISOLATION_OPTION:: An array of the isolation options supported by the database server. The isolation options are described
+ *                    in the DFT_ISOLATION property. (array)
+ * KEYWORDS:: An array of the keywords reserved by the database server. (array)
+ * LIKE_ESCAPE_CLAUSE:: TRUE if the database server supports the use of % and _ wildcard characters. FALSE if the database server
+ *                      does not support these wildcard characters. (bool)
+ * MAX_COL_NAME_LEN:: Maximum length of a column name supported by the database server, expressed in bytes. (int)
+ * MAX_IDENTIFIER_LEN:: Maximum length of an SQL identifier supported by the database server, expressed in characters. (int)
+ * MAX_INDEX_SIZE:: Maximum size of columns combined in an index supported by the database server, expressed in bytes. (int)
+ * MAX_PROC_NAME_LEN:: Maximum length of a procedure name supported by the database server, expressed in bytes. (int)
+ * MAX_ROW_SIZE:: Maximum length of a row in a base table supported by the database server, expressed in bytes. (int)
+ * MAX_SCHEMA_NAME_LEN:: Maximum length of a schema name supported by the database server, expressed in bytes. (int)
+ * MAX_STATEMENT_LEN:: Maximum length of an SQL statement supported by the database server, expressed in bytes. (int)
+ * MAX_TABLE_NAME_LEN:: Maximum length of a table name supported by the database server, expressed in bytes. (bool)
+ * NON_NULLABLE_COLUMNS:: TRUE if the database server supports columns that can be defined as NOT NULL, FALSE if the database
+ *                        server does not support columns defined as NOT NULL. (bool)
+ * PROCEDURES:: TRUE if the database server supports the use of the CALL statement to call stored procedures, FALSE if the
+ *              database server does not support the CALL statement. (bool)
+ * SPECIAL_CHARS:: A string containing all of the characters other than a-Z, 0-9, and underscore that can be used in an
+ *                 identifier name. (string)
+ * SQL_CONFORMANCE:: The level of conformance to the ANSI/ISO SQL-92 specification offered by the database server: (string)
+ * 
+ *                   ENTRY:: Entry-level SQL-92 compliance. 
+ * 
+ *                   FIPS127:: FIPS-127-2 transitional compliance. 
+ * 
+ *                   FULL:: Full level SQL-92 compliance. 
+ * 
+ *                   INTERMEDIATE:: Intermediate level SQL-92 compliance. 
  * 
  * ===Parameters
  * 
@@ -5984,30 +5992,27 @@ VALUE ibm_db_server_info(int argc, VALUE *argv, VALUE self)
  * ===Description
  * object IBM_DB::client_info ( resource connection )
  * 
- * This function returns an object with read-only properties that return information about the DB2 database client. The following table lists the DB2 client properties:
+ * This function returns a read-only object with information about the DB2 database client. The following table lists the DB2 client properties:
  * 
  * ====Table 1. DB2 client properties
  *
- * ====Property name      Return type     Description
+ * <b>Property name</b>:: <b>Description (Return type)</b>
  *
- * APPL_CODEPAGE  int The application code page.
- * CONN_CODEPAGE  int The code page for the current connection.
- * DATA_SOURCE_NAME string  The data source name (DSN) used to create the current connection to the database.
- * DRIVER_NAME  string  The name of the library that implements the DB2 Call Level Interface (CLI) specification.
- * DRIVER_ODBC_VER  string  The version of ODBC that the DB2 client supports. This returns a string "MM.mm" where MM is the major version and mm is the minor version. The DB2 client always returns "03.51".
- * DRIVER_VER string  The version of the client, in the form of a string "MM.mm.uuuu" where MM is the major version, mm is the minor version, and uuuu is the update. For example, "08.02.0001" represents major version 8, minor version 2, update 1.
- * ODBC_SQL_CONFORMANCE string  The level of ODBC SQL grammar supported by the client:
- * 
- * MINIMUM
- *   Supports the minimum ODBC SQL grammar. 
+ * APPL_CODEPAGE:: The application code page. (int)
  *
- * CORE
- *   Supports the core ODBC SQL grammar. 
- * 
- * EXTENDED
- *    Supports extended ODBC SQL grammar. 
- * 
- * ODBC_VER string  The version of ODBC that the ODBC driver manager supports. This returns a string "MM.mm.rrrr" where MM is the major version, mm is the minor version, and rrrr is the release. The DB2 client always returns "03.01.0000".
+ * CONN_CODEPAGE:: The code page for the current connection. (int)
+ *
+ * DATA_SOURCE_NAME:: The data source name (DSN) used to create the current connection to the database. (string)
+ *
+ * DRIVER_NAME:: The name of the library that implements the DB2 Call Level Interface (CLI) specification. (string)
+ *
+ * DRIVER_ODBC_VER:: The version of ODBC that the DB2 client supports. This returns a string "MM.mm" where MM is the major version and mm is the minor version. The DB2 client always returns "03.51". (string)
+ *
+ * DRIVER_VER:: The version of the client, in the form of a string "MM.mm.uuuu" where MM is the major version, mm is the minor version, and uuuu is the update. For example, "08.02.0001" represents major version 8, minor version 2, update 1. (string)
+ *
+ * ODBC_SQL_CONFORMANCE:: There are three levels of ODBC SQL grammar supported by the client: MINIMAL (Supports the minimum ODBC SQL grammar), CORE (Supports the core ODBC SQL grammar), EXTENDED (Supports extended ODBC SQL grammar). (string)
+ *
+ * ODBC_VER:: The version of ODBC that the ODBC driver manager supports. This returns a string "MM.mm.rrrr" where MM is the major version, mm is the minor version, and rrrr is the release. The DB2 client always returns "03.01.0000". (string)
  *
  * ===Parameters
  * 
@@ -6200,59 +6205,89 @@ VALUE ibm_db_active(int argc, VALUE *argv, VALUE self)
 /*  */
 
 /*
- * IBM_DB::get_option --  Gets the specified option value from the server.
+ * IBM_DB::get_option --  Gets the specified option in the resource.
  *
  * ===Description
- * bool IBM_DB::get_option ( resource connection, int option )
+ * mixed IBM_DB::get_option ( resource resc, int options, int type )
  *
- * Returns a string, that is the current setting of a connection attribute.
+ * Returns a value, that is the current setting of a connection or statement attribute.
  *
  * ===Parameters
  *
- * connection
- *     A valid connection resource.
+ * resc
+ *     A valid connection or statement resource containing a result set. 
  *
- * option
- *     The option to be retrieved
- *     Availabe options to be passed are:
- *      - userid
- *      - acctstr
- *      - applname
- *      - wrkstnname
+ * options
+ *     The options to be retrieved
+ *
+ * type
+ *     A field that specifies the resource type (1 = Connection, non - 1 = Statement)
  *
  * ===Return Values
  *
- * Returns the current setting of the connection attribute provided.
+ * Returns the current setting of the resource attribute provided.
  */
 VALUE ibm_db_get_option(int argc, VALUE *argv, VALUE self)
 {
-  VALUE connection = Qnil;
+  VALUE conn_or_stmt = Qnil;
   VALUE option = Qnil;
+  VALUE r_type = Qnil;
   SQLCHAR *value = NULL;
-  conn_handle *conn_res;
+  SQLINTEGER value_int = 0;
+  conn_handle *conn_res = NULL;
+  stmt_handle *stmt_res = NULL;
   SQLCHAR *op_string = NULL;
   SQLINTEGER op_integer = 0;
+  long type = 0;
   int rc;
 
-  rb_scan_args(argc, argv, "2", &connection, &option);
+  rb_scan_args(argc, argv, "3", &conn_or_stmt, &option, &r_type);
 
-  if (!NIL_P(connection)) {
-    Data_Get_Struct(connection, conn_handle, conn_res);
+  if (!NIL_P(r_type)) type = NUM2LONG(r_type);
 
-    if (!conn_res->handle_active) {
-      rb_throw("Connection is not active", Qnil);
-    }
-    if (!NIL_P(option)) {
+  if (!NIL_P(conn_or_stmt)) {
+    /* Checking to see if we are getting a connection option (1) or a statement option (non - 1) */
+    if (type == 1) {
+      Data_Get_Struct(conn_or_stmt, conn_handle, conn_res);
+
+      /* Check to ensure the connection resource given is active */
+      if (!conn_res->handle_active) {
+        rb_throw("Connection is not active", Qnil);
+      }
+      /* Check that the option given is not null */
+      if (!NIL_P(option)) {
         op_integer=(SQLINTEGER)FIX2INT(option);
         /* ACCTSTR_LEN is the largest possible length of the options to retrieve */
         value = ALLOC_N(char, ACCTSTR_LEN + 1);
         rc = SQLGetConnectAttr((SQLHDBC)conn_res->hdbc, op_integer, (SQLPOINTER)value, ACCTSTR_LEN, NULL);
-        if ( rc == SQL_ERROR ) {
+        if (rc == SQL_ERROR) {
           _ruby_ibm_db_check_sql_errors( conn_res->hdbc, SQL_HANDLE_DBC, rc, 1, NULL, -1, 1);
         }
-      return rb_str_new2((char *)value);
+        return rb_str_new2((char *)value);
+      } else {
+        rb_throw("Supplied parameter is invalid", Qnil);
+      }
+    /* At this point we know we are to retreive a statement option */
     } else {
-      rb_throw("Supplied parameter is invalid", Qnil);
+      Data_Get_Struct(conn_or_stmt, stmt_handle, stmt_res);
+
+      /* Check that the option given is not null */
+      if (!NIL_P(option)) {
+        op_integer=(SQLINTEGER)FIX2INT(option);
+        /* Checking that the option to get is the cursor type because that is what we support here */
+        if (op_integer == SQL_ATTR_CURSOR_TYPE) {
+          rc = SQLGetStmtAttr((SQLHSTMT)stmt_res->hstmt, op_integer, &value_int, SQL_IS_INTEGER, NULL);
+          if (rc == SQL_ERROR) {
+            _ruby_ibm_db_check_sql_errors(stmt_res->hstmt, SQL_HANDLE_STMT, rc, 1, NULL, -1, 1);
+          }
+          return INT2NUM(value_int);
+        } else {
+          rb_throw("Supplied parameter is invalid", Qnil);
+        }
+      } else {
+        rb_throw("Supplied parameter is invalid", Qnil);
+      }
+
     }
   }
 }