ibm_db 0.4.0 → 0.4.6

data/ext/ruby_ibm_db.h

@@ -1,164 +1,164 @@
-/*
-  +----------------------------------------------------------------------+
-  |  Licensed Materials - Property of IBM                                |
-  |                                                                      |
-  | (C) Copyright IBM Corporation 2007.                                  |
-  +----------------------------------------------------------------------+
-  | Authors: Sushant Koduru, Lynh Nguyen, Kanchana Padmanabhan,          |
-  |          Dan Scott, Helmut Tessarek, Kellen Bombardier, Sam Ruby     |
-  +----------------------------------------------------------------------+
-*/
-
-#ifndef RUBY_IBM_DB_H
-#define RUBY_IBM_DB_H
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sqlcli1.h>
-
-#ifndef SQL_XML
-#define SQL_XML -370
-#endif
-
-#ifndef SQL_ATTR_REPLACE_QUOTED_LITERALS
-#define SQL_ATTR_REPLACE_QUOTED_LITERALS 116
-#endif
-
-#ifdef _WIN32
-#define RUBY_IBM_DB_API __declspec(dllexport)
-#else
-#define RUBY_IBM_DB_API
-#endif
-
-/* strlen(" SQLCODE=") added in */
-#define DB2_MAX_ERR_MSG_LEN (SQL_MAX_MESSAGE_LENGTH + SQL_SQLSTATE_SIZE + 10)
-
-/* Used in _ruby_parse_options */
-#define DB2_ERRMSG 1
-#define DB2_ERR 2
-
-/* DB2 instance environment variable */
-#define DB2_VAR_INSTANCE "DB2INSTANCE="
-
-/******** Makes code compatible with the options used by the user */
-#define BINARY 1
-#define CONVERT 2
-#define PASSTHRU 3
-#define PARAM_FILE 11
-
-#ifdef PASE
-#define SQL_IS_INTEGER 0
-#define SQL_BEST_ROWID 0
-#define SQLLEN long
-#define SQLFLOAT double
-#endif
-
-/*fetch*/
-#define FETCH_INDEX	0x01
-#define FETCH_ASSOC	0x02
-#define FETCH_BOTH	0x03
-
-/* Change column case */
-#define ATTR_CASE 3271982
-#define CASE_NATURAL 0
-#define CASE_LOWER 1
-#define CASE_UPPER 2
-
-/* maximum sizes */
-#define USERID_LEN 16
-#define ACCTSTR_LEN 200
-#define APPLNAME_LEN 32
-#define WRKSTNNAME_LEN 18
-
-void Init_ibm_db();
-
-VALUE ibm_db_connect(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_commit(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_pconnect(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_autocommit(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_bind_param(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_close(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_columnprivileges(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_column_privileges(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_columns(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_foreignkeys(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_foreign_keys(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_primarykeys(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_primary_keys(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_procedure_columns(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_procedures(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_specialcolumns(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_special_columns(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_statistics(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_tableprivileges(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_table_privileges(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_tables(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_commit(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_exec(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_prepare(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_execute(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_conn_errormsg(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_stmt_errormsg(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_conn_error(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_stmt_error(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_next_result(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_num_fields(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_num_rows(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_field_name(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_field_display_size(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_field_num(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_field_precision(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_field_scale(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_field_type(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_field_width(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_cursor_type(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_rollback(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_free_stmt(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_result(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_fetch_row(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_fetch_assoc(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_fetch_array(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_fetch_both(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_result_all(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_free_result(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_set_option(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_setoption(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_get_option(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_getoption(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_fetch_object(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_server_info(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_client_info(int argc, VALUE *argv, VALUE self);
-VALUE ibm_db_active(int argc, VALUE *argv, VALUE self);
-
-/*
-  Declare any global variables you may need between the BEGIN
-  and END macros here:
-*/
-struct _ibm_db_globals {
-  int  bin_mode;
-  char __ruby_conn_err_msg[DB2_MAX_ERR_MSG_LEN];
-  char __ruby_conn_err_state[SQL_SQLSTATE_SIZE + 1];
-  char __ruby_stmt_err_msg[DB2_MAX_ERR_MSG_LEN];
-  char __ruby_stmt_err_state[SQL_SQLSTATE_SIZE + 1];
-#ifdef PASE /* i5/OS ease of use turn off commit */
-  long i5_allow_commit;
-#endif /* PASE */
-};
-
-/*
-  TODO: make this threadsafe
-*/
-
-#define IBM_DB_G(v) (ibm_db_globals->v)
-
-#endif	/* RUBY_IBM_DB_H */
-
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * indent-tabs-mode: t
- * End:
- */
+/*
+  +----------------------------------------------------------------------+
+  |  Licensed Materials - Property of IBM                                |
+  |                                                                      |
+  | (C) Copyright IBM Corporation 2006, 2007.                            |
+  +----------------------------------------------------------------------+
+  | Authors: Sushant Koduru, Lynh Nguyen, Kanchana Padmanabhan,          |
+  |          Dan Scott, Helmut Tessarek, Kellen Bombardier, Sam Ruby     |
+  +----------------------------------------------------------------------+
+*/
+
+#ifndef RUBY_IBM_DB_H
+#define RUBY_IBM_DB_H
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <sqlcli1.h>
+
+#ifndef SQL_XML
+#define SQL_XML -370
+#endif
+
+#ifndef SQL_ATTR_REPLACE_QUOTED_LITERALS
+#define SQL_ATTR_REPLACE_QUOTED_LITERALS 116
+#endif
+
+#ifdef _WIN32
+#define RUBY_IBM_DB_API __declspec(dllexport)
+#else
+#define RUBY_IBM_DB_API
+#endif
+
+/* strlen(" SQLCODE=") added in */
+#define DB2_MAX_ERR_MSG_LEN (SQL_MAX_MESSAGE_LENGTH + SQL_SQLSTATE_SIZE + 10)
+
+/* Used in _ruby_parse_options */
+#define DB2_ERRMSG 1
+#define DB2_ERR 2
+
+/* DB2 instance environment variable */
+#define DB2_VAR_INSTANCE "DB2INSTANCE="
+
+/******** Makes code compatible with the options used by the user */
+#define BINARY 1
+#define CONVERT 2
+#define PASSTHRU 3
+#define PARAM_FILE 11
+
+#ifdef PASE
+#define SQL_IS_INTEGER 0
+#define SQL_BEST_ROWID 0
+#define SQLLEN long
+#define SQLFLOAT double
+#endif
+
+/*fetch*/
+#define FETCH_INDEX	0x01
+#define FETCH_ASSOC	0x02
+#define FETCH_BOTH	0x03
+
+/* Change column case */
+#define ATTR_CASE 3271982
+#define CASE_NATURAL 0
+#define CASE_LOWER 1
+#define CASE_UPPER 2
+
+/* maximum sizes */
+#define USERID_LEN 16
+#define ACCTSTR_LEN 200
+#define APPLNAME_LEN 32
+#define WRKSTNNAME_LEN 18
+
+void Init_ibm_db();
+
+VALUE ibm_db_connect(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_commit(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_pconnect(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_autocommit(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_bind_param(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_close(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_columnprivileges(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_column_privileges(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_columns(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_foreignkeys(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_foreign_keys(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_primarykeys(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_primary_keys(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_procedure_columns(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_procedures(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_specialcolumns(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_special_columns(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_statistics(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_tableprivileges(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_table_privileges(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_tables(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_commit(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_exec(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_prepare(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_execute(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_conn_errormsg(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_stmt_errormsg(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_conn_error(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_stmt_error(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_next_result(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_num_fields(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_num_rows(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_field_name(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_field_display_size(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_field_num(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_field_precision(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_field_scale(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_field_type(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_field_width(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_cursor_type(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_rollback(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_free_stmt(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_result(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_fetch_row(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_fetch_assoc(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_fetch_array(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_fetch_both(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_result_all(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_free_result(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_set_option(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_setoption(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_get_option(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_getoption(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_fetch_object(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_server_info(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_client_info(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_active(int argc, VALUE *argv, VALUE self);
+
+/*
+  Declare any global variables you may need between the BEGIN
+  and END macros here:
+*/
+struct _ibm_db_globals {
+  int  bin_mode;
+  char __ruby_conn_err_msg[DB2_MAX_ERR_MSG_LEN];
+  char __ruby_conn_err_state[SQL_SQLSTATE_SIZE + 1];
+  char __ruby_stmt_err_msg[DB2_MAX_ERR_MSG_LEN];
+  char __ruby_stmt_err_state[SQL_SQLSTATE_SIZE + 1];
+#ifdef PASE /* i5/OS ease of use turn off commit */
+  long i5_allow_commit;
+#endif /* PASE */
+};
+
+/*
+  TODO: make this threadsafe
+*/
+
+#define IBM_DB_G(v) (ibm_db_globals->v)
+
+#endif	/* RUBY_IBM_DB_H */
+
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ */

data/lib/active_record/connection_adapters/ibm_db_adapter.rb

@@ -42,7 +42,7 @@ module ActiveRecord
           end
 
           update_query << ") = "
-          # IBM DB accepts 'SET (column) = NULL'  but not (NULL),
+          # IBM_DB accepts 'SET (column) = NULL'  but not (NULL),
           # therefore the sql needs to be changed for a single NULL field.
           if params.size==1 && params[0] == 'NULL'
             update_query << "NULL"
@@ -72,7 +72,7 @@ module ActiveRecord
       begin
         require 'ibm_db' unless defined? IBM_DB
       rescue LoadError
-        raise LoadError, "Failed to load IBM DB Ruby driver."
+        raise LoadError, "Failed to load IBM_DB Ruby driver."
       end
 
       # Converts all +config+ keys to symbols
@@ -104,7 +104,7 @@ module ActiveRecord
       # Retrieve database objects fields in lowercase
       conn_options = {IBM_DB::ATTR_CASE => IBM_DB::CASE_LOWER}
       # Set connection's user info
-      conn_options[:user] = config[:user].to_s  if config.has_key?(:user)
+      conn_options[:app_user] = config[:app_user].to_s  if config.has_key?(:app_user)
       # Set connection's account info
       conn_options[:account] = config[:account].to_s  if config.has_key?(:account)
       # Set connection's application info
@@ -136,7 +136,7 @@ module ActiveRecord
         ConnectionAdapters::IBM_DBAdapter.new(connection, logger, config, conn_options)
       else
         # If the connection failed, it raises a Runtime error
-        raise "Failed to connect to the #{database} due to: #{IBM_DB::conn_errormsg}"
+        raise "Failed to connect to the [#{database}] due to: #{IBM_DB::conn_errormsg}"
       end
     end # method self.ibm_db_connection
   end # class Base
@@ -159,7 +159,7 @@ module ActiveRecord
       end
 
        private
-      # Mapping IBM DB SQL datatypes to Ruby data types
+      # Mapping IBM data servers SQL datatypes to Ruby data types
       def simplified_type(field_type)
         case field_type
           # if +field_type+ contains 'for bit data' handle it as a binary
@@ -189,40 +189,37 @@ module ActiveRecord
             :string
           when /boolean/i
             :boolean
+          when /rowid/i  # rowid is a supported datatype on z/OS and i/5
+            :rowid
         end
-
        end # method simplified_type
      end #class IBM_DBColumn
 
 
-    # The IBM_DB Adapter requires the native Ruby Driver for IBM Databases (ibm_db.so).
-    # +config+ is a hash passed as an argument to the class initializer.
-    # Connection parameters can be specified in 2 different ways:
-    # Local connection (through a database catalog alias):
-    # ==== Example
-    #   adapter: ibm_db
-    #   database: SAMPLE
-    #   username: user
-    #   password: pass
-    #   schema: myschema
-    #
-    # Remote TCP/IP connection:
-    # ==== Example
-    #   adapter: ibm_db
-    #   database: SAMPLE
-    #   username: user
-    #   password: pass
-    #   schema: myschema
-    #   host: my_hostname_or_address
-    #   port: 50000
-    #
-    # 'SAMPLE' is the database alias as it appears in the local IBM DB catalog
-    # Once you pick the type of connection you want to use, you need to fill-in all the fields above, as shown in the example.
-    # The current version allows you to set only one schema. If you don't specify a schema, the username is used as a schema.
+    # The IBM_DB Adapter requires the native Ruby driver (ibm_db)
+    # for IBM data servers (ibm_db.so).
+    # +config+ the hash passed as an initializer argument content:
+    # == mandatory parameters 
+    #   adapter:     'ibm_db'        // IBM_DB Adapter name
+    #   username:    'db2user'       // data server (database) user
+    #   password:    'secret'        // data server (database) password
+    #   database:    'ARUNIT'        // remote database name (or catalog entry alias)
+    # == optional (highly recommended for data server auditing and monitoring purposes)
+    #   schema:      'rails123'      // name space qualifier
+    #   account:     'tester'        // OS account (client workstation)
+    #   app_user:    'test11'        // authenticated application user
+    #   application: 'rtests'        // application name
+    #   workstation: 'plato'         // client workstation name
+    # == remote TCP/IP connection (required when no local database catalog entry available)
+    #   host:        'socrates'      // fully qualified hostname or IP address
+    #   port:        '50000'         // data server TCP/IP port number
+    # 
+    # When schema is not specified, the username value is used instead.
+    # 
     class IBM_DBAdapter < AbstractAdapter
       attr_reader :connection
       attr_accessor :sql
-      attr_reader :schema, :user, :account, :application, :workstation
+      attr_reader :schema, :app_user, :account, :application, :workstation
 
       # Name of the adapter
       def adapter_name
@@ -231,6 +228,8 @@ module ActiveRecord
 
       def initialize(connection, logger, config, conn_options)
         # Caching database connection configuration (+connect+ or +reconnect+ support)
+        @connection = connection
+        @conn_options = conn_options
         @database = config[:database]
         @username = config[:username]
         @password = config[:password]
@@ -241,14 +240,14 @@ module ActiveRecord
         @schema   = config[:schema]
 
         # Caching database connection options (auditing and billing support)
-        @user        = conn_options[:user]         if conn_options.has_key?(:user)
+        @app_user    = conn_options[:app_user]     if conn_options.has_key?(:app_user)
         @account     = conn_options[:account]      if conn_options.has_key?(:account)
         @application = conn_options[:application]  if conn_options.has_key?(:application)
         @workstation = conn_options[:workstation]  if conn_options.has_key?(:workstation)
 
         # Calls the parent class +ConnectionAdapters+' initializer
         # which sets @connection, @logger, @runtime and @last_verification
-        super(connection, logger)
+        super(@connection, logger)
 
         if @connection
           server_info = IBM_DB::server_info( @connection )
@@ -274,27 +273,29 @@ module ActiveRecord
               @servertype = IBM_DB2_I5.new(@connection, self)
           end
         end
-
         # Executes the +set schema+ statement using the schema identifier provided
-        stmt = execute("SET SCHEMA #{@schema}")  if @schema && @schema != @username
+        @servertype.set_schema(@schema) if @schema && @schema != @username
       end
 
+      # Optional connection attribute: database name space qualifier
       def schema=(name)
         unless name == @schema
           @schema = name
-          stmt = execute("SET SCHEMA #{@schema}")
+          @servertype.set_schema(@schema)
         end
       end
 
-      def user=(name)
-        unless name == @user
+      # Optional connection attribute: authenticated application user
+      def app_user=(name)
+        unless name == @app_user
           option = {IBM_DB::SQL_ATTR_INFO_USERID => "#{name}"}
           if IBM_DB::set_option( @connection, option, 1 )
-            @user = IBM_DB::get_option( @connection, IBM_DB::SQL_ATTR_INFO_USERID )
+            @app_user = IBM_DB::get_option( @connection, IBM_DB::SQL_ATTR_INFO_USERID )
           end
         end
       end
 
+      # Optional connection attribute: OS account (client workstation)
       def account=(name)
         unless name == @account
           option = {IBM_DB::SQL_ATTR_INFO_ACCTSTR => "#{name}"}
@@ -304,6 +305,7 @@ module ActiveRecord
         end
       end
 
+      # Optional connection attribute: application name
       def application=(name)
         unless name == @application
           option = {IBM_DB::SQL_ATTR_INFO_APPLNAME => "#{name}"}
@@ -313,6 +315,7 @@ module ActiveRecord
         end
       end
 
+      # Optional connection attribute: client workstation name
       def workstation=(name)
         unless name == @workstation
           option = {IBM_DB::SQL_ATTR_INFO_WRKSTNNAME => "#{name}"}
@@ -322,9 +325,9 @@ module ActiveRecord
         end
       end
 
-      # This adapter supports migrations
-      # Some limits applies, for example +remove_column+ and +change_column+
-      # are not currently implemented
+      # This adapter supports migrations.
+      # Current limitations: +remove_column+ is not currently supported
+      # while DB2 for zOS does not support +rename_column+
       def supports_migrations?
         true
       end
@@ -341,6 +344,8 @@ module ActiveRecord
       # Tests the connection status
       def active?
         IBM_DB::active @connection
+        rescue
+          false
       end
 
       # Private method used by +reconnect!+.
@@ -358,7 +363,7 @@ module ActiveRecord
         end
         # Sets the schema if different from default (username)
         if @schema && @schema != @username
-          execute("SET SCHEMA #{@schema}")
+          @servertype.set_schema(@schema)
         end
       end
       private :connect
@@ -388,45 +393,28 @@ module ActiveRecord
         @servertype.create_index_after_table(name, self)
       end
 
-      # DB2 throws an error SQL0214N  An expression in the ORDER BY
-      # clause in the following position, or starting with "UPPER..."
-      # in the "ORDER BY" clause is not valid.  Reason code = "2".
-      # SQLSTATE=42822
-      # If the order_by columns do not match the select columns, we change
-      # the select columns.
-      def distinct(columns, order_by)
-        if !order_by.nil? && !order_by.empty?
-           order_by_columns = order_by.upcase.split(',').collect! { |e| (e.split).first }
-           distinct_sql = (columns.upcase.split(',') + order_by_columns).uniq
-           distinct_sql.collect! {|e| e + ", " }
-           return "DISTINCT #{distinct_sql.to_s.strip.chop}"
-        else
-           return "DISTINCT #{columns}"
-        end
-      end
-
       # Returns an array of hashes with the column names as keys and
       # column values as values. +sql+ is the select query, and +name+ is an optional description for logging
       def select_all(sql, name = nil)
-        # Replaces {"= NULL" with "IS NULL"} OR {"IN (NULL)" with "IS NULL"}
-        sql.gsub!( /(=\s*NULL|IN\s*\(NULL\))/i, "IS NULL" )
-
+        # Replaces {"= NULL" with " IS NULL"} OR {"IN (NULL)" with " IS NULL"}
+        sql.gsub!( /(=\s*NULL|IN\s*\(NULL\))/i, " IS NULL" )
+        
         results = []
         # Invokes the method +execute+ in order to log and execute the sql instructions
         # and get a IBM_DB::Statement from which is possible to fetch the results
         if stmt = execute(sql, name)
           begin
-          # Fetches all the results available. IBM_DB::fetch_assoc(stmt) returns
-          # an hash for each single record.
-          # The loop stops when there aren't any more valid records to fetch
-           while single_hash = IBM_DB::fetch_assoc(stmt)
+            # Fetches all the results available. IBM_DB::fetch_assoc(stmt) returns
+            # an hash for each single record.
+            # The loop stops when there aren't any more valid records to fetch
+            while single_hash = IBM_DB::fetch_assoc(stmt)
               # Add the record to the +results+ array
               results <<  single_hash
-          end
+            end
           ensure
-          # Ensures to free the resources associated with the statement
-          IBM_DB::free_result stmt
-        end
+            # Ensures to free the resources associated with the statement
+            IBM_DB::free_result stmt
+          end
         end
         # The array of record hashes is returned
         results
@@ -450,30 +438,41 @@ module ActiveRecord
             return id_value || @servertype.last_generated_id
             # Ensures to free the resources associated with the statement
           ensure
-              IBM_DB::free_result(stmt)
+            IBM_DB::free_result(stmt)
           end
         end
       end
 
-      # Executes and logs a +sql+ commands and
+      # Executes and logs +sql+ commands and
       # returns a +IBM_DB::Statement+ object.
       def execute(sql, name = nil)
+        sql.gsub!( /(\s*xml DEFAULT NULL)/i, " xml NOT NULL" )
         # Logs and execute the sql instructions.
         # The +log+ method is defined in the parent class +AbstractAdapter+
         log(sql, name) do
-          if stmt = IBM_DB::exec(@connection, sql)
-            stmt   # Return the statement object
-          else
-            raise StatementInvalid, IBM_DB::stmt_errormsg
+          begin
+            if stmt = IBM_DB::exec(@connection, sql)
+              stmt   # Return the statement object
+            else
+              raise IBM_DB::stmt_errormsg
+            end
+          rescue StandardError
+            error_msg = IBM_DB::conn_errormsg ? IBM_DB::conn_errormsg : IBM_DB::stmt_errormsg
+            if error_msg && !error_msg.empty?
+              raise "Failed to execute statement due to error: #{error_msg}"
+            else
+              raise
+            end
           end
         end
       end
 
+      # Executes an "UPDATE" SQL statement
       def update(sql, name = nil)
         # Make sure the WHERE clause handles NULL's correctly
         sqlarray = sql.split(/\s*WHERE\s*/)
         if !sqlarray[1].nil?
-          sqlarray[1].gsub!( /(=\s*NULL|IN\s*\(NULL\))/i, "IS NULL" )
+          sqlarray[1].gsub!( /(=\s*NULL|IN\s*\(NULL\))/i, " IS NULL" )
           sql = sqlarray[0] + " WHERE " + sqlarray[1]
         end
 
@@ -501,7 +500,7 @@ module ActiveRecord
         IBM_DB::autocommit(@connection, IBM_DB::SQL_AUTOCOMMIT_OFF)
       end
 
-      # Commits the transaction (and turns on auto-committing)
+      # Commits the transaction and turns on auto-committing
       def commit_db_transaction
         # Commits the transaction
         IBM_DB::commit @connection rescue nil
@@ -509,7 +508,7 @@ module ActiveRecord
         IBM_DB::autocommit @connection, IBM_DB::SQL_AUTOCOMMIT_ON
       end
 
-      # Rolls back the transaction (and turns on auto-committing). Must be
+      # Rolls back the transaction and turns on auto-committing. Must be
       # done if the transaction block raises an exception or returns false
       def rollback_db_transaction
         # ROLLBACK the transaction
@@ -522,9 +521,9 @@ module ActiveRecord
       # Modifies a sql statement in order to implement a LIMIT and an OFFSET.
       # A LIMIT defines the number of rows that should be fetched, while
       # an OFFSET defines from what row the records must be fetched.
-      # IBM DB SQL implements a LIMIT with the instructions:
+      # IBM data servers implement a LIMIT in SQL statements through:
       # FETCH FIRST n ROWS ONLY, where n is the number of rows required.
-      # The implementation of OFFSET is more elaborate, and require the usage of
+      # The implementation of OFFSET is more elaborate, and requires the usage of
       # subqueries and the ROW_NUMBER() command in order to add row numbering
       # as an additional column to a copy of the existing table.
       # ==== Examples
@@ -557,15 +556,15 @@ module ActiveRecord
       # sql query given an offset and a limit
       def query_offset_limit(sql, offset, limit)
         # Defines what will be the last record
-          last_record = offset + limit
-          # Transforms the SELECT query in order to retrieve/fetch only
-          # a number of records after the specified offset.
-          # 'select' or 'SELECT' is replaced with the partial query below that adds the sys_row_num column
-          # to select with the condition of this column being between offset+1 and the offset+limit
-          sql.gsub!(/SELECT/i,"SELECT O.* FROM (SELECT I.*, ROW_NUMBER() OVER () sys_row_num FROM (SELECT")
-          # The final part of the query is appended to include a WHERE...BETWEEN...AND condition,
-          # and retrieve only a LIMIT number of records starting from the OFFSET+1
-          sql << ") AS I) AS O WHERE sys_row_num BETWEEN #{offset+1} AND #{last_record}"
+        last_record = offset + limit
+        # Transforms the SELECT query in order to retrieve/fetch only
+        # a number of records after the specified offset.
+        # 'select' or 'SELECT' is replaced with the partial query below that adds the sys_row_num column
+        # to select with the condition of this column being between offset+1 and the offset+limit
+        sql.gsub!(/SELECT/i,"SELECT O.* FROM (SELECT I.*, ROW_NUMBER() OVER () sys_row_num FROM (SELECT")
+        # The final part of the query is appended to include a WHERE...BETWEEN...AND condition,
+        # and retrieve only a LIMIT number of records starting from the OFFSET+1
+        sql << ") AS I) AS O WHERE sys_row_num BETWEEN #{offset+1} AND #{last_record}"
       end
       private :query_offset_limit
 
@@ -583,7 +582,7 @@ module ActiveRecord
       def quote(value, column = nil)
         case value
           # If it's a numeric value and the column type is not a string, it shouldn't be quoted
-          # (IBM DB doesn't accept quotes on numeric types)
+          # (IBM_DB doesn't accept quotes on numeric types)
           when Numeric
             # If the column type is text or string, return the quote value
             if column && column.type == :text || column && column.type == :string
@@ -594,30 +593,30 @@ module ActiveRecord
               value.to_s
             end
           when String, ActiveSupport::Multibyte::Chars
-          if column && column.type == :binary
-            # If quoting is required for the insert/update of a BLOB
-            unless caller[0] =~ /add_column_options/i
-              # Invokes a convertion from string to binary
-              "BLOB('?')"
-            else
-              # Quoting required for the default value of a column
-              "BLOB('#{value}')"
-            end
-          elsif column && column.type == :text
+            if column && column.type == :binary
+              # If quoting is required for the insert/update of a BLOB
               unless caller[0] =~ /add_column_options/i
-                "'@@@IBMTEXT@@@'"
+                # Invokes a convertion from string to binary
+                "BLOB('?')"
               else
-                "#{value}"
+                # Quoting required for the default value of a column
+                "BLOB('#{value}')"
               end
-          elsif column && column.type == :xml
-              unless caller[0] =~ /add_column_options/i
-                "'<ibm>@@@IBMXML@@@</ibm>'"
-              else
-                "#{value}"
-              end
-          else
-            "'#{quote_string(value)}'"
-          end
+            elsif column && column.type == :text
+                unless caller[0] =~ /add_column_options/i
+                  "'@@@IBMTEXT@@@'"
+                else
+                  "#{value}"
+                end
+            elsif column && column.type == :xml
+                unless caller[0] =~ /add_column_options/i
+                  "'<ibm>@@@IBMXML@@@</ibm>'"
+                else
+                  "#{value}"
+                end
+            else
+              "'#{quote_string(value)}'"
+            end
           when TrueClass then quoted_true    # return '1' for true
           when FalseClass then quoted_false  # return '0' for false
           when NilClass
@@ -669,12 +668,13 @@ module ActiveRecord
           :date        => { :name => "date" },
           :binary      => { :name => "blob" },
 
-          # IBM DB doesn't have a native boolean type.
+          # IBM data servers don't have a native boolean type.
           # A boolean can be represented  by a smallint,
           # adopting the convention that False is 0 and True is 1
           :boolean     => { :name => "smallint"},
           :xml         => { :name => "xml"},
-          :decimal     => { :name => "decimal" }
+          :decimal     => { :name => "decimal" },
+          :rowid       => { :name => "rowid" } # rowid is a supported datatype on z/OS and i/5
         }
       end
 
@@ -682,16 +682,16 @@ module ActiveRecord
       # unlike MySQL. It does support limits on float and decimal/numeric
       def type_to_sql(type, limit = nil, precision = nil, scale = nil)   
         if type == :integer && (!limit.nil? && limit > 0)
-           return 'integer'       
+          return 'integer'       
         elsif type == :double && (!limit.nil? && limit > 0)
-           return 'double'
+          return 'double'
         else
-           return super
+          return super
         end
       end 
 
       # Returns the maximum length a table alias identifier can be.
-      # IBM DB (cross-platform) table limit is 128 characters
+      # IBM data servers (cross-platform) table limit is 128 characters
       def table_alias_length
         128
       end
@@ -759,8 +759,8 @@ module ActiveRecord
         # Statement required to access all the columns information
         if stmt = IBM_DB::columns(@connection, nil, @schema.upcase, table_name.upcase)
           begin
-          # Fetches all the columns and assigns them to col.
-          # +col+ is an hash with keys/value pairs for a column
+            # Fetches all the columns and assigns them to col.
+            # +col+ is an hash with keys/value pairs for a column
             while col = IBM_DB::fetch_assoc(stmt)
               column_name = col["column_name"].downcase
               # Assigns the column default value.
@@ -779,7 +779,7 @@ module ActiveRecord
               # it appends the (column_length) string on the supported data types
               unless column_length.nil? || column_length == '' || column_type.sub!(/ \(\) for bit data/i,"(#{column_length}) FOR BIT DATA") || !column_type =~ /char|lob|graphic/i
                 if column_type =~ /decimal/i
-                   column_type << "(#{column_length},#{column_scale})"
+                  column_type << "(#{column_length},#{column_scale})"
                 else
                   column_type << "(#{column_length})"
                 end
@@ -793,8 +793,13 @@ module ActiveRecord
                 columns << IBM_DBColumn.new(column_name, column_default_value, column_type, column_nullable)
               end
             end
-          rescue
-            raise "Failed to retrieve column metadata due to error: #{IBM_DB::conn_errormsg}  ... #{IBM_DB::stmt_errormsg}"
+          rescue StandardError
+            error_msg = IBM_DB::conn_errormsg ? IBM_DB::conn_errormsg : IBM_DB::stmt_errormsg
+            if error_msg && !error_msg.empty?
+              raise "Failed to retrieve column metadata due to driver error: #{error_msg}"
+            else
+              raise
+            end
           end
         end
         # Returns the columns array
@@ -804,7 +809,7 @@ module ActiveRecord
       # Renames a table.
       # ==== Example
       # rename_table('octopuses', 'octopi')
-      # Overriden to satisfy IBM DB syntax
+      # Overriden to satisfy IBM data servers syntax
       def rename_table(name, new_name)
         # SQL rename table statement
         rename_table_sql = "RENAME TABLE #{name} TO #{new_name}"
@@ -818,14 +823,14 @@ module ActiveRecord
       # ===== Example
       #  rename_column(:suppliers, :description, :name)
       def rename_column(table_name, column_name, new_column_name)
-          @servertype.rename_column(table_name, column_name, new_column_name)
+        @servertype.rename_column(table_name, column_name, new_column_name)
       end
 
       # Removes the column from the table definition.
       # ===== Examples
       #  remove_column(:suppliers, :qualification)
       def remove_column(table_name, column_name)
-          @servertype.remove_column(table_name, column_name)
+        @servertype.remove_column(table_name, column_name)
       end
 
       # Changes the column's definition according to the new options.
@@ -834,18 +839,18 @@ module ActiveRecord
       #  change_column(:suppliers, :name, :string, :limit => 80)
       #  change_column(:accounts, :description, :text)
       def change_column(table_name, column_name, type, options = {})
-          @servertype.change_column(table_name, column_name, type, options)
+        @servertype.change_column(table_name, column_name, type, options)
       end
 
-      # Sets a new default value for a column.  You can't set the default
-      # value to +NULL+, In that case, you need to
-      # DatabaseStatements#execute the apppropriate SQL statement.
+      # Sets a new default value for a column. This does not set the default
+      # value to +NULL+, instead, it needs DatabaseStatements#execute which
+      # can execute the appropriate SQL statement for setting the value.
       # ==== Examples
       #  change_column_default(:suppliers, :qualification, 'new')
       #  change_column_default(:accounts, :authorized, 1)
-      # Method overriden to satisfy IBM DB syntax.
+      # Method overriden to satisfy IBM data servers syntax.
       def change_column_default(table_name, column_name, default)
-         # SQL statement which alters column's default value
+        # SQL statement which alters column's default value
         change_column_sql = "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} SET WITH DEFAULT #{quote(default)}"
         stmt = execute(change_column_sql)
         # Ensures to free the resources associated with the statement
@@ -902,20 +907,20 @@ module ActiveRecord
       # You can remove an index on multiple columns by specifying the first column.
       #   add_index :accounts, [:username, :password]
       #   remove_index :accounts, :username
-      # Overriden to use the IBM DB SQL syntax.
+      # Overriden to use the IBM data servers SQL syntax.
       def remove_index(table_name, options = {})
         execute("DROP INDEX #{index_name(table_name, options)}")
       end
 
       # Builds an index name from a table_name and column. If an index name has been passed,
-      # the method returns it. Overrides the default method to respect the IBM DB (cross-platform)
+      # the method returns it. Overrides the default method to respect the IBM data servers (cross-platform)
       # limit on indexes (max of 18 characters)
       def index_name(table_name, options)
         if Hash === options and options[:name] 
           # legacy support
-            # If a name has been specified, this is returned
-            options[:name]
-          else
+          # If a name has been specified, this is returned
+          options[:name]
+        else
           # We reverse the table name to reduce the chance of hitting duplicate
           # index name errors. For e.g. indexes on table names like accounts,
           # accounts_favorites
@@ -960,11 +965,15 @@ module ActiveRecord
         reorg_table(table_name)
       end
 
+      def set_schema(schema)
+        @caller.execute("SET SCHEMA #{schema}")
+      end
+
     end # class IBM_DataServer
 
     class IBM_DB2 < IBM_DataServer
       def rename_column(table_name, column_name, new_column_name)
-        raise NotImplementedError, "rename_column is not implemented yet in the IBM DB Adapter"
+        raise NotImplementedError, "rename_column is not implemented yet in the IBM_DB Adapter"
       end
 
       def primary_key
@@ -985,10 +994,19 @@ module ActiveRecord
       end
 
       def change_column(table_name, column_name, type, options)
-        @caller.execute "ALTER TABLE #{table_name} ALTER #{column_name} SET DATA TYPE #{@caller.type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
+        data_type = @caller.type_to_sql(type, options[:limit], options[:precision], options[:scale])
+        begin
+          @caller.execute "ALTER TABLE #{table_name} ALTER #{column_name} SET DATA TYPE #{data_type}"
+        rescue StandardError => exec_err
+          if exec_err.message.include?('SQLCODE=-190')
+            raise StatementInvalid, "Please consult documentation for compatible data types while changing column datatype. The column datatype change to [#{data_type}] is not supported by this data server: #{exec_err}"
+          else
+            raise
+          end
+        end
         reorg_table(table_name)
         if !options[:default].nil?
-           @caller.change_column_default(table_name, column_name, options[:default])
+          @caller.change_column_default(table_name, column_name, options[:default])
         end
       end
     end # class IBM_DB2
@@ -1035,6 +1053,13 @@ module ActiveRecord
       def remove_column(table_name, column_name)
         raise NotImplementedError, "remove_column is not supported for DB2/zOS server"
       end
+      
+      # Setting the SQLID on z/OS will also update the CURRENT SCHEMA
+      # special register, but not vice versa
+      def set_schema(schema)
+        @caller.execute("SET CURRENT SQLID ='#{schema}'")
+      end
+  
     end # class IBM_DB2_ZOS
 
     class IBM_DB2_ZOS_8 < IBM_DB2_ZOS
@@ -1050,4 +1075,4 @@ module ActiveRecord
     end # class IBM_DB2_I5
 
   end # module ConnectionAdapters
-end # module ActiveRecord
+end # module ActiveRecord