ibm_db 1.0.0 → 1.0.1

data/CHANGES

@@ -1,5 +1,11 @@
 Change Log
 ==============
+2008/12/18 (IBM_DB adapter 1.0.1, driver 1.0.1) :
+  - Support for datatype decfloat
+  - Changes in installation process. Now user should set IBM_DB_INCLUDE env variable instead of IBM_DB_DIR
+  - Support for specifying the Authentication type to be used during connection in adapter
+  - Corrected the ignorance of a connection, when the connection is successful with a warning
+  - ActiveRecord-2.2.2 test suite changes for IBM_DB
 2008/11/06 (IBM_DB adapter 1.0.0, driver 0.10.0):
   - Support for short-hand migration syntax for datatype char and double in create_table
   - Support for short-hand migration syntax for datatypes xml, char and double in change_table

data/README

@@ -1,5 +1,5 @@
 =====================================================================
-README for the IBM_DB Adapter (1.0.0) and Driver (0.10.0) (2008/11/06)
+README for the IBM_DB Adapter (1.0.1) and Driver (1.0.1) (2008/12/18)
 For ActiveRecord Version >= 1.15.5 (and Rails >= 1.2.5)
 =====================================================================
 
@@ -30,7 +30,7 @@ Ruby environment, including Rails, to interact with IBM data servers.
 
 Note : -	1)	If using activerecord version below 2.0 then it requires that the ibm_db adapter be registered with the list of connection adapters by manually adding ibm_db at line 77 (approx) in the file activerecord.rb (GEM_HOME\activerecord-<version>\lib\). 
 
-		2)	The IBM_DB driver can also be built separately (from source) and used in direct API calls.
+		    2)	The IBM_DB driver can also be built separately (from source) and used in direct API calls.
 
 1. Windows platforms:
 =====================
@@ -43,10 +43,10 @@ Note : -	1)	If using activerecord version below 2.0 then it requires that the ib
     D:\>gem install ibm_db
     Bulk updating gem source index for: http://gems.rubyforge.org
     Select which gem to install for your platform (i386-mswin32)
-    1. ibm_db 0.9.5 (mswin32)
-    2. ibm_db 0.9.5 (ruby)
-    3. ibm_db 0.9.4 (mswin32)
-    4. ibm_db 0.9.4 (ruby)
+    1. ibm_db 1.0.0 (mswin32)
+    2. ibm_db 1.0.0 (ruby)
+    3. ibm_db 0.10.0 (mswin32)
+    4. ibm_db 0.10.0 (ruby)
 
   Running gem install ibm_db you are presented with two choices for each release 
   (mswin32 or ruby)choose mswin32. This will install the IBM_DB gem containing 
@@ -75,14 +75,14 @@ Note : -	1)	If using activerecord version below 2.0 then it requires that the ib
    Note: DB2 environment is required while using an arbitrary user account
          (other than the DB2 install user account)
    $ . /home/db2inst1/sqllib/db2profile
-   $ export IBM_DB_DIR=/opt/ibm/db2/V9.1
-   $ export IBM_DB_LIB=/opt/ibm/db2/V9.1/lib32
+   $ export IBM_DB_INCLUDE=DB2HOME/include (eg. /home/db2inst1/sqllib/include or /opt/ibm/db2/v9.5/include)
+   $ export IBM_DB_LIB=DB2HOME/lib     (eg. /home/db2inst1/sqllib/lib or /opt/ibm/db2/V9.5/lib32)
    $ gem install ibm_db
      Select which gem to install for your platform (i686-linux)
-     1. ibm_db 0.9.5 (mswin32)
-     2. ibm_db 0.9.5 (ruby)
-     3. ibm_db 0.9.4 (ruby)
-     4. ibm_db 0.9.4 (mswin32)
+     1. ibm_db 1.0.0 (mswin32)
+     2. ibm_db 1.0.0 (ruby)
+     3. ibm_db 0.10.0 (ruby)
+     4. ibm_db 0.10.0 (mswin32)
      ...
      Running gem install ibm_db you are presented with two choices for each release
      (mswin32 or ruby) choose ruby. This will build the native extension (ibm_db driver) and installs the ibm_db gem.
@@ -94,7 +94,7 @@ Note : -	1)	If using activerecord version below 2.0 then it requires that the ib
      Installing RDoc documentation for ibm_db-0.6.5...
      
   TEST (simple gem install verification)
-   Note: The manual step after install if using activerecord version below 2.0 is:
+   Note: The manual step after install, if using activerecord version below 2.0 is:
          add ibm_db into GEM_HOME\1.8\gems\activerecord-1.15.3\lib\active_record.rb (Line 77)
    $ irb
      irb(main):001:0> gem 'ibm_db'
@@ -144,8 +144,8 @@ here only for reference, and also involves running the unit tests.
         port:     50000
 
     - To compile and link with DB2 client libraries:
-      $ export IBM_DB_DIR=/opt/ibm/db2/V9.1
-      $ export IBM_DB_LIB=/opt/ibm/db2/V9.1/lib32
+       $ export IBM_DB_INCLUDE=DB2HOME/include (eg. /home/db2inst1/sqllib/include or /opt/ibm/db2/v9.5/include)
+       $ export IBM_DB_LIB=DB2HOME/lib     (eg. /home/db2inst1/sqllib/lib or /opt/ibm/db2/V9.5/lib32)
 
   Windows platforms:
     - Install Visual C++ 2005, Platform SDK (latest), .Net SDK (latest)
@@ -153,7 +153,7 @@ here only for reference, and also involves running the unit tests.
       CALL "C:\Program Files\Microsoft Platform SDK for Windows Server 2005\SetEnv.Cmd"
       CALL "C:\Program Files\Microsoft Visual C++ Toolkit 2005\vcvars32.bat"
       SET LIB=%LIB%;C:\Program Files\Microsoft Visual Studio .NET 2005\Vc8\lib
-    - To configure database connection parameters edit config.yaml
+    - To configure database connection parameters edit config.yml
   
  Build and Execution:
   rake 
@@ -162,7 +162,7 @@ here only for reference, and also involves running the unit tests.
   rake onlytests
 
  Execution of a single test inside the tests directory can be done by the following:
-  export SINGLE_RUBY_TEST=test_001.rb
+  export SINGLE_RUBY_TEST=test_001_CtlgConn.rb
   rake 
 
 

data/ext/extconf.rb

@@ -3,7 +3,7 @@
 # +----------------------------------------------------------------------+
 # |  Licensed Materials - Property of IBM                                |
 # |                                                                      |
-# | (C) Copyright IBM Corporation 2006, 2007.                            |
+# | (C) Copyright IBM Corporation 2006, 2007,2008                        |
 # +----------------------------------------------------------------------+
 
 require 'mkmf'
@@ -11,32 +11,35 @@ WIN = RUBY_PLATFORM =~ /mswin/
 
 # use ENV['DB2DIR'] or latest db2 you can find
 # (we need to revisit default when db2 10.x comes out)
-IBM_DB_DIR = (ENV['IBM_DB_DIR'] or 
-          (Dir['/opt/*/db2/*'].sort_by {|f| File.basename(f)}).last )
-dir_config('IBM_DB',IBM_DB_DIR)
+IBM_DB_INCLUDE = (ENV['IBM_DB_INCLUDE'] or 
+          (Dir['/opt/*/db2/*/include'].sort_by {|f| File.basename(f)}).last )
+IBM_DB_LIB = (ENV['IBM_DB_LIB'] or
+           (Dir['/opt/*/db2/*/lib32'].sort_by {|f| File.basename(f)}).last )
+           
+dir_config('IBM_DB',IBM_DB_INCLUDE,IBM_DB_LIB)
 
 def crash(str)
   printf(" extconf failure: %s\n", str)
   exit 1
 end
 
-unless (have_library(WIN ? 'db2cli' : 'db2','SQLConnect') or find_library(WIN ? 'db2cli' : 'db2','SQLConnect', ENV['IBM_DB_LIB']))
+unless (have_library(WIN ? 'db2cli' : 'db2','SQLConnect') or find_library(WIN ? 'db2cli' : 'db2','SQLConnect', IBM_DB_LIB))
   crash(<<EOL)
 Unable to locate DB2 libraries.
 
-        Install IBM DB2 Univeral Database 
+Follow the steps below and retry
 
-        or
+Step 1: - Install IBM DB2 Universal Database Server/Client
 
-        If using rake, please set the environment variables
-        IBM_DB_DIR=/path/to/db2     (eg. /opt/IBM/db2/V9.1)
-        IBM_DB_LIB=/path/to/db2/lib (eg. /opt/IBM/db2/V9.1/lib32)
+step 2: - Set the environment variables IBM_DB_INCLUDE and IBM_DB_LIB as below 
+        
+             (assuming bash shell)
+        
+             export IBM_DB_INCLUDE=DB2HOME/include (eg. /home/db2inst1/sqllib/include or /opt/ibm/db2/v9.5/include)
+             export IBM_DB_LIB=DB2HOME/lib     (eg. /home/db2inst1/sqllib/lib or /opt/ibm/db2/V9.5/lib32)
 
-        or
-
-        Try passing one of the following options to extconf.rb:
-        --with-IBM_DB-dir=/path/to/db2     (eg. /opt/IBM/db2/V9.1)
-        --with-IBM_DB-lib=/path/to/db2/lib (eg. /opt/IBM/db2/V9.1/lib32)
+step 3: - Retry gem install
+        
 EOL
 end
 

data/ext/ibm_db.c

@@ -2,15 +2,17 @@
   +----------------------------------------------------------------------+
   |  Licensed Materials - Property of IBM                                |
   |                                                                      |
-  | (C) Copyright IBM Corporation 2006, 2007.                            |
+  | (C) Copyright IBM Corporation 2006, 2007,2008                            |
   +----------------------------------------------------------------------+
   | Authors: Sushant Koduru, Lynh Nguyen, Kanchana Padmanabhan,          |
   |          Dan Scott, Helmut Tessarek, Sam Ruby, Kellen Bombardier,    |
   |          Tony Cairns, Manas Dadarkar, Swetha Patel, Salvador Ledezma |
+  |          Mario Ds Briggs, Praveen Devarao, Ambrish Bhargava,         |
+  |          Tarun Pasrija                                               |
   +----------------------------------------------------------------------+
 */
 
-#define MODULE_RELEASE "0.10.0"
+#define MODULE_RELEASE "1.0.1"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -29,6 +31,7 @@ static void _ruby_ibm_db_check_sql_errors( SQLHANDLE handle, SQLSMALLINT hType,
 static void _ruby_ibm_db_assign_options( void* handle, int type, long opt_key, VALUE data );
 static void _ruby_ibm_db_clear_conn_err_cache();
 static void _ruby_ibm_db_clear_stmt_err_cache();
+static int _ruby_ibm_db_set_decfloat_rounding_mode_client(SQLHANDLE hdbc);
 static char * _ruby_ibm_db_instance_name;
 static int is_systemi, is_informix;		/* 1 == TRUE; 0 == FALSE; */
 
@@ -399,6 +402,7 @@ static void _ruby_ibm_db_free_result_struct(stmt_handle* handle)
         case SQL_DECIMAL:
         case SQL_NUMERIC:
         case SQL_XML:
+        case SQL_DECFLOAT:
           if ( handle->row_data[i].data.str_val != NULL ) {
             ruby_xfree(handle->row_data[i].data.str_val);
             handle->row_data[i].data.str_val = NULL;
@@ -967,6 +971,7 @@ static int _ruby_ibm_db_bind_column_helper(stmt_handle *stmt_res)
       case SQL_TYPE_TIME:
       case SQL_TYPE_TIMESTAMP:
       case SQL_BIGINT:
+      case SQL_DECFLOAT:
         in_length = stmt_res->column_info[i].size+1;
         row_data->str_val = (SQLCHAR *)ALLOC_N(char, in_length);
         rc = SQLBindCol((SQLHSTMT)stmt_res->hstmt, (SQLUSMALLINT)(i+1),
@@ -1202,13 +1207,25 @@ static VALUE _ruby_ibm_db_connect_helper( int argc, VALUE *argv, int isPersisten
             (SQLCHAR *)password, (SQLSMALLINT)password_len );
       }
 
-      if ( rc != SQL_SUCCESS ) {
+      if ( rc == SQL_ERROR ) {
         _ruby_ibm_db_check_sql_errors(conn_res->hdbc, SQL_HANDLE_DBC, rc, 1, NULL, -1, 1);
         SQLFreeHandle( SQL_HANDLE_DBC, conn_res->hdbc );
         SQLFreeHandle(SQL_HANDLE_ENV, conn_res->henv);
         break;
       }
 
+#ifdef CLI_DBC_SERVER_TYPE_DB2LUW
+#ifdef SQL_ATTR_DECFLOAT_ROUNDING_MODE
+                                                                                         
+        /**
+                    * Code for setting SQL_ATTR_DECFLOAT_ROUNDING_MODE
+                    * for implementation of Decfloat Datatype
+                    * */                                                                                   
+       _ruby_ibm_db_set_decfloat_rounding_mode_client(conn_res->hdbc);
+
+#endif
+#endif
+
       /* Get the server name */
       memset(server, 0, sizeof(server));
       rc = SQLGetInfo(conn_res->hdbc, SQL_DBMS_NAME, (SQLPOINTER)server, 2048, NULL);
@@ -1278,6 +1295,74 @@ static VALUE _ruby_ibm_db_connect_helper( int argc, VALUE *argv, int isPersisten
             conn_res);
   }
 }
+
+#ifdef CLI_DBC_SERVER_TYPE_DB2LUW
+#ifdef SQL_ATTR_DECFLOAT_ROUNDING_MODE
+/**
+ * Function for implementation of DECFLOAT Datatype
+ * 
+ * Description :
+ * This function retrieves the value of special register decflt_rounding
+ * from the database server which signifies the current rounding mode set
+ * on the server. For using decfloat, the rounding mode has to be in sync
+ * on the client as well as server. Thus we set here on the client, the
+ * same rounding mode as the server.
+ * @return: success or failure
+ * */
+static int _ruby_ibm_db_set_decfloat_rounding_mode_client(SQLHANDLE hdbc)
+{
+	SQLCHAR decflt_rounding[20];
+	SQLHANDLE hstmt;
+	int rc = 0;
+	int rounding_mode;
+	SQLINTEGER decfloat;
+	
+	
+	SQLCHAR *stmt = (SQLCHAR *)"values current decfloat rounding mode";
+	
+	/* Allocate a Statement Handle */
+	rc = SQLAllocHandle(SQL_HANDLE_STMT, hdbc, &hstmt);
+	if (rc == SQL_ERROR) {
+		_ruby_ibm_db_check_sql_errors(hdbc, SQL_HANDLE_DBC, rc, 1,
+				NULL, -1, 1);
+		return rc;
+	}
+	rc = SQLExecDirect((SQLHSTMT)hstmt, stmt, SQL_NTS);
+	if ( rc == SQL_ERROR ) {
+		_ruby_ibm_db_check_sql_errors((SQLHSTMT)hstmt,
+				SQL_HANDLE_STMT, rc, 1, NULL,
+				-1, 1);
+		return rc;
+	}
+	
+	rc = SQLBindCol((SQLHSTMT)hstmt, 1, SQL_C_DEFAULT, decflt_rounding, 20, NULL);
+	if ( rc == SQL_ERROR ) {
+		_ruby_ibm_db_check_sql_errors((SQLHSTMT)hstmt,
+				SQL_HANDLE_STMT, rc, 1, NULL,
+				-1, 1);
+		return rc;
+	}
+	rc = SQLFetch(hstmt);
+	rc = SQLFreeHandle(SQL_HANDLE_STMT, hstmt);
+	/* Now setting up the same rounding mode on the client*/
+	if(strcmp(decflt_rounding,"ROUND_HALF_EVEN")== 0) rounding_mode = ROUND_HALF_EVEN;
+	if(strcmp(decflt_rounding,"ROUND_HALF_UP")== 0) rounding_mode = ROUND_HALF_UP;
+	if(strcmp(decflt_rounding,"ROUND_DOWN")== 0) rounding_mode = ROUND_DOWN;
+	if(strcmp(decflt_rounding,"ROUND_CEILING")== 0) rounding_mode = ROUND_CEILING;
+	if(strcmp(decflt_rounding,"ROUND_FLOOR")== 0) rounding_mode = ROUND_FLOOR;
+
+#ifndef PASE	
+	rc = SQLSetConnectAttr(hdbc,SQL_ATTR_DECFLOAT_ROUNDING_MODE,(SQLPOINTER)rounding_mode ,SQL_NTS);
+#else
+	rc = SQLSetConnectAttr(hdbc,SQL_ATTR_DECFLOAT_ROUNDING_MODE,(SQLPOINTER)&rounding_mode ,SQL_NTS);
+#endif
+
+	
+	return rc;
+}
+#endif
+#endif
+
 /*  */
 
 /*  static void _ruby_ibm_db_clear_conn_err_cache ()
@@ -4458,6 +4543,7 @@ VALUE ibm_db_field_type(int argc, VALUE *argv, VALUE self)
     case SQL_DOUBLE:
     case SQL_DECIMAL:
     case SQL_NUMERIC:
+    case SQL_DECFLOAT:
       str_val = "real";
       break;
     case SQL_CLOB:
@@ -4814,6 +4900,7 @@ VALUE ibm_db_result(int argc, VALUE *argv, VALUE self)
       case SQL_BIGINT:
       case SQL_DECIMAL:
       case SQL_NUMERIC:
+      case SQL_DECFLOAT:
         if (column_type == SQL_DECIMAL || column_type == SQL_NUMERIC)
           in_length = stmt_res->column_info[col_num].size + stmt_res->column_info[col_num].scale + 2 + 1;
         else
@@ -5109,6 +5196,7 @@ static VALUE _ruby_ibm_db_bind_fetch_helper(int argc, VALUE *argv, int op)
         case SQL_BIGINT:
         case SQL_DECIMAL:
         case SQL_NUMERIC:
+        case SQL_DECFLOAT:
 
           if ( op & FETCH_ASSOC ) {
             rb_hash_aset(return_value, rb_str_new2((char *)stmt_res->column_info[i].name), rb_str_new2((char *)row_data->str_val));

data/ext/ruby_ibm_db.h

@@ -21,6 +21,11 @@
 #define SQL_XML -370
 #endif
 
+/* Needed for Backward compatibility */
+#ifndef SQL_DECFLOAT
+#define SQL_DECFLOAT -360
+#endif
+
 /* SQL_ATTR_USE_TRUSTED_CONTEXT,
  * SQL_ATTR_TRUSTED_CONTEXT_USERID and
  * SQL_ATTR_TRUSTED_CONTEXT_PASSWORD
@@ -95,6 +100,18 @@
 #define APPLNAME_LEN 32
 #define WRKSTNNAME_LEN 18
 
+/*
+ * Enum for Decfloat Rounding Modes
+ * */
+enum
+{
+        ROUND_HALF_EVEN = 0,
+        ROUND_HALF_UP,
+        ROUND_DOWN,
+        ROUND_CEILING,
+        ROUND_FLOOR
+}ROUNDING_MODE;
+
 void Init_ibm_db();
 
 VALUE ibm_db_connect(int argc, VALUE *argv, VALUE self);

data/lib/active_record/connection_adapters/ibm_db_adapter.rb

@@ -127,15 +127,17 @@ requires credentials: username and password"
       # Retrieve database objects fields in lowercase
       conn_options = {IBM_DB::ATTR_CASE => IBM_DB::CASE_LOWER}
       config.each do |key, value|
-        case key
-          when :app_user        # Set connection's user info
-            conn_options[IBM_DB::SQL_ATTR_INFO_USERID]     = value
-          when :account         # Set connection's account info
-            conn_options[IBM_DB::SQL_ATTR_INFO_ACCTSTR]    = value
-          when :application     # Set connection's application info
-            conn_options[IBM_DB::SQL_ATTR_INFO_APPLNAME]   = value
-          when :workstation     # Set connection's workstation info
-            conn_options[IBM_DB::SQL_ATTR_INFO_WRKSTNNAME] = value
+        if !value.nil?
+          case key
+            when :app_user        # Set connection's user info
+              conn_options[IBM_DB::SQL_ATTR_INFO_USERID]     = value
+            when :account         # Set connection's account info
+              conn_options[IBM_DB::SQL_ATTR_INFO_ACCTSTR]    = value
+            when :application     # Set connection's application info
+              conn_options[IBM_DB::SQL_ATTR_INFO_APPLNAME]   = value
+            when :workstation     # Set connection's workstation info
+              conn_options[IBM_DB::SQL_ATTR_INFO_WRKSTNNAME] = value
+          end    
         end
       end
 
@@ -147,7 +149,7 @@ requires credentials: username and password"
         host = config[:host]
         # A net address connection requires a port. If no port has been specified, 50000 is used by default
         port = config[:port] || 50000
-        # Connects to the database using the database, host, port, username and password specified
+        # Connects to the database using the database, host, port, authentication type, username and password specified
         # Starting with DB2 9.1FP5 secure connections using SSL are supported. 
         # On the client side using CLI this is supported from CLI version V95FP2 and onwards.
         # This feature is set by specifying SECURITY=SSL in the connection string.
@@ -160,6 +162,7 @@ requires credentials: username and password"
                        UID=#{username};\
                        PWD=#{password};"
         conn_string << "SECURITY=#{config[:security]};" if config.has_key?(:security)
+        conn_string << "AUTHENTICATION=#{config[:authentication]};" if config.has_key?(:authentication)
         connection = IBM_DB.connect conn_string, '', '', conn_options
       else
         # No host implies a local catalog-based connection: +database+ represents catalog alias
@@ -206,10 +209,10 @@ requires credentials: username and password"
             :boolean
           when /int|serial/i
             :integer
+          when /decimal|numeric|decfloat/i
+            :decimal
           when /float|double|real/i
             :float
-          when /decimal|numeric/i
-            :decimal
           when /timestamp|datetime/i
             :timestamp
           when /time/i
@@ -269,6 +272,12 @@ requires credentials: username and password"
         return self
       end
       
+      #Method to support the new syntax of rails 2.0 migrations (short-hand definitions) for columns of type decfloat
+      def decfloat(*args)
+        ibm_parse_column_attributes_args('decfloat',*args)
+        return self
+      end
+      
       #Method to support the new syntax of rails 2.0 migrations (short-hand definitions) for columns of type char [character]
       def char(*args)
         ibm_parse_column_attributes_args('char',*args)
@@ -302,6 +311,12 @@ requires credentials: username and password"
         ibm_parse_column_attributes_args('double',*args)
         return self
       end
+
+      #Method to support the new syntax of rails 2.0 migrations (short-hand definitions) for columns of type decfloat
+      def decfloat(*args)
+        ibm_parse_column_attributes_args('decfloat',*args)
+        return self
+      end
       
       #Method to support the new syntax of rails 2.0 migrations (short-hand definitions) for columns of type char [character]
       def char(*args)
@@ -355,21 +370,23 @@ requires credentials: username and password"
     # 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)
+    #   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
+    #   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
-    #   security:    'SSL'           // optional parameter enabling SSL encryption -
-    #                                // - Available only from CLI version V95fp2 and above
+    #   host:            'socrates'      // fully qualified hostname or IP address
+    #   port:            '50000'         // data server TCP/IP port number
+    #   security:        'SSL'           // optional parameter enabling SSL encryption -
+    #                                    // - Available only from CLI version V95fp2 and above
+    #   authentication:  'SERVER'        // AUTHENTICATION type which the client uses - 
+    #                                    // - to connect to the database server. By default value is SERVER
     # 
     # When schema is not specified, the username value is used instead.
     # 
@@ -385,23 +402,24 @@ requires credentials: username and password"
 
       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]
+        @connection       = connection
+        @conn_options     = conn_options
+        @database         = config[:database]
+        @username         = config[:username]
+        @password         = config[:password]
         if config.has_key?(:host)
-          @host   = config[:host]
-          @port   = config[:port] || 50000 # default port
+          @host           = config[:host]
+          @port           = config[:port] || 50000 # default port
         end
-        @schema   = config[:schema]
-        @security = config[:security] || nil
+        @schema           = config[:schema]
+        @security         = config[:security] || nil
+        @authentication   = config[:authentication] || nil
         
         # Caching database connection options (auditing and billing support)
-        @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)
+        @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
@@ -525,6 +543,7 @@ requires credentials: username and password"
                           UID=#{@username};\
                           PWD=#{@password};"
           @conn_string << "SECURITY=#{@security};" if @security
+          @conn_string << "AUTHENTICATION=#{@authentication};" if @authentication
           # Connects and assigns the resulting IBM_DB.Connection to the +@connection+ instance variable
           @connection = IBM_DB.connect(@conn_string, '', '', @conn_options)
         else
@@ -915,13 +934,20 @@ requires credentials: username and password"
           :rowid       => { :name => "rowid" }, # rowid is a supported datatype on z/OS and i/5
           :serial      => { :name => "serial" }, # rowid is a supported datatype on Informix Dynamic Server
           :char        => { :name => "char" },
-          :double      => { :name => @servertype.get_double_mapping }
+          :double      => { :name => @servertype.get_double_mapping },
+          :decfloat    => { :name => "decfloat"}
         }
       end
 
       # IBM data servers do not support limits on certain data types (unlike MySQL)
       # Limit is supported for the {float, decimal, numeric, varchar, clob, blob} data types.
       def type_to_sql(type, limit = nil, precision = nil, scale = nil)
+        if type.to_sym == :decfloat
+          sql_segment = native_database_types[type.to_sym][:name].to_s
+          sql_segment << "(#{precision})" if !precision.nil?
+          return sql_segment
+        end
+        
         return super if limit.nil?
 
         # strip off limits on data types not supporting them

data/test/cases/adapter_test.rb

@@ -109,6 +109,12 @@ class AdapterTest < ActiveRecord::TestCase
     end
   end
 
+  if current_adapter?(:PostgreSQLAdapter)
+    def test_encoding
+      assert_not_nil @connection.encoding
+    end
+  end
+
   def test_table_alias
     def @connection.test_table_alias_length() 10; end
     class << @connection

data/test/cases/associations/eager_test.rb

@@ -18,7 +18,7 @@ require 'models/developer'
 require 'models/project'
 
 class EagerAssociationTest < ActiveRecord::TestCase
-  fixtures :posts, :comments, :authors, :categories, :categories_posts,
+  fixtures :posts, :comments, :authors, :author_addresses, :categories, :categories_posts,
             :companies, :accounts, :tags, :taggings, :people, :readers,
             :owners, :pets, :author_favorites, :jobs, :references, :subscribers, :subscriptions, :books,
             :developers, :projects, :developers_projects
@@ -111,6 +111,46 @@ class EagerAssociationTest < ActiveRecord::TestCase
     end
   end
 
+  def test_finding_with_includes_on_has_many_association_with_same_include_includes_only_once
+    author_id = authors(:david).id
+    author = assert_queries(3) { Author.find(author_id, :include => {:posts_with_comments => :comments}) } # find the author, then find the posts, then find the comments
+    author.posts_with_comments.each do |post_with_comments|
+      assert_equal post_with_comments.comments.length, post_with_comments.comments.count
+      assert_equal nil, post_with_comments.comments.uniq!
+    end
+  end
+
+  def test_finding_with_includes_on_has_one_assocation_with_same_include_includes_only_once
+    author = authors(:david)
+    post = author.post_about_thinking_with_last_comment
+    last_comment = post.last_comment
+    author = assert_queries(3) { Author.find(author.id, :include => {:post_about_thinking_with_last_comment => :last_comment})} # find the author, then find the posts, then find the comments
+    assert_no_queries do
+      assert_equal post, author.post_about_thinking_with_last_comment
+      assert_equal last_comment, author.post_about_thinking_with_last_comment.last_comment
+    end
+  end
+
+  def test_finding_with_includes_on_belongs_to_association_with_same_include_includes_only_once
+    post = posts(:welcome)
+    author = post.author
+    author_address = author.author_address
+    post = assert_queries(3) { Post.find(post.id, :include => {:author_with_address => :author_address}) } # find the post, then find the author, then find the address
+    assert_no_queries do
+      assert_equal author, post.author_with_address
+      assert_equal author_address, post.author_with_address.author_address
+    end
+  end
+
+  def test_finding_with_includes_on_null_belongs_to_association_with_same_include_includes_only_once
+    post = posts(:welcome)
+    post.update_attributes!(:author => nil)
+    post = assert_queries(2) { Post.find(post.id, :include => {:author_with_address => :author_address}) } # find the post, then find the author which is null so no query for the address
+    assert_no_queries do
+      assert_equal nil, post.author_with_address
+    end
+  end
+
   def test_loading_from_an_association
     posts = authors(:david).posts.find(:all, :include => :comments, :order => "posts.id")
     assert_equal 2, posts.first.comments.size
@@ -269,14 +309,23 @@ class EagerAssociationTest < ActiveRecord::TestCase
   end
 
   def test_eager_with_has_many_through
-    posts_with_comments = people(:michael).posts.find(:all, :include => :comments)
-    posts_with_author = people(:michael).posts.find(:all, :include => :author )
-    posts_with_comments_and_author = people(:michael).posts.find(:all, :include => [ :comments, :author ])
+    posts_with_comments = people(:michael).posts.find(:all, :include => :comments, :order => 'posts.id')
+    posts_with_author = people(:michael).posts.find(:all, :include => :author, :order => 'posts.id')
+    posts_with_comments_and_author = people(:michael).posts.find(:all, :include => [ :comments, :author ], :order => 'posts.id')
     assert_equal 2, posts_with_comments.inject(0) { |sum, post| sum += post.comments.size }
     assert_equal authors(:david), assert_no_queries { posts_with_author.first.author }
     assert_equal authors(:david), assert_no_queries { posts_with_comments_and_author.first.author }
   end
 
+  def test_eager_with_has_many_through_a_belongs_to_association
+    author = authors(:mary)
+    post = Post.create!(:author => author, :title => "TITLE", :body => "BODY")
+    author.author_favorites.create(:favorite_author_id => 1)
+    author.author_favorites.create(:favorite_author_id => 2)
+    posts_with_author_favorites = author.posts.find(:all, :include => :author_favorites)
+    assert_no_queries { posts_with_author_favorites.first.author_favorites.first.author_id }
+  end
+
   def test_eager_with_has_many_through_an_sti_join_model
     author = Author.find(:first, :include => :special_post_comments, :order => 'authors.id')
     assert_equal [comments(:does_it_hurt)], assert_no_queries { author.special_post_comments }
@@ -622,7 +671,7 @@ class EagerAssociationTest < ActiveRecord::TestCase
   end
 
   def test_count_with_include
-    if current_adapter?(:SQLServerAdapter, :SybaseAdapter)
+    if current_adapter?(:SybaseAdapter)
       assert_equal 3, authors(:david).posts_with_comments.count(:conditions => "len(comments.body) > 15")
     elsif current_adapter?(:OpenBaseAdapter)
       assert_equal 3, authors(:david).posts_with_comments.count(:conditions => "length(FETCHBLOB(comments.body)) > 15")