activerecord-oracle_enhanced-adapter 5.2.8 → 6.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa24e2267bec0862bb898b8f03c11af04a34543d38f75e8b39a5b46000009437
-  data.tar.gz: '0485525d25c1f4307c1e9b958cd2f1b286bc5d10542e2fd8615e499a00c989c2'
+  metadata.gz: 88d4ded25c413bd3ad25d89e39551c5709e070365d687c515bca47e8c8f327fa
+  data.tar.gz: 7e3c7a298c9e4fed4a66c08a8085883ecaf52698841fdf91bbd5fc98213dac41
 SHA512:
-  metadata.gz: e70d58d735fec37fd8e19122f37b284397f152c911e3baf8127d8828cefd7b9f139d1acf2f3e147def7c82be26decd7e4f4eb10e85e63489ef6933ab089f83b7
-  data.tar.gz: 5651ab5ab00219a433b7281959d51068ea47dcd33648761cd4dc4f22c69f285dd79a8c73e262fdabe81042e9751dcb02021392c472649f7662b593daf1187d60
+  metadata.gz: 7c90e048c399283b8125ae3aa6929140ead8db07cab427894993445ceb09d0c0665080444a28be6e8609fb26387b5d6bca50f1de2623c090626e2b4275c01d74
+  data.tar.gz: db3ff9ab3f530b13074bd7dc9cf2146c0da1756e9a8c57429567f1122716dc0bc03e5724e35cb7e0349830e686146379f404b554f265a3292850608043797b66

data/History.md

@@ -1,21 +1,87 @@
-## 5.2.8 / 2019-12-25
+## 6.0.0.beta1 / 2018-03-18
+
+* Major changes
+
+  * Rails 6 requires Ruby 2.5 [#1801]
+  * Support longer identifier for Oracle database 12.2 or higher [#1703 #1705]
+  * Introduce `use_shorter_identifier` [#1707]
+  * Change `default_sequence_start_value` from 10000 to 1 [#1636]
+  * Supports `supports_optimizer_hints?` [#1850 #1852]
+  * `OracleEnhanced::SchemaStatements#tables` excludes materialized views [#1708]
+  * rake db:structure:dump extracts views by default [#1625 #1641]
+  * Drop db link support [#1668 #1681 #1696 #1706]
+  * Drop trigger based primary key support for Rails 6 [#1669]
+  * Don't allow unsupported NLS parameters [#1685]
+  * fix Handling with char-column problem [#1760]
+  * Make `t.timestamps` with precision by default [#1818]
+  * fix mapping of decimal type to map to `NUMBER` instead of `DECIMAL` [#1840]
 
 * Changes and bug fixes
-  * Uninstall SimpleCov [#1968 #1970]
 
-## 5.2.7 / 2019-12-20
+  * Handle ORA-02292 as `InvalidForeignKey` [#1771]
+  * Suppress deprecated warning for `table_name_length` [#1772]
+  * `update_attributes!` will be deprecated in Rails 6 [#1665]
+  * `update_attributes` will be deprecated in Rails 6 [#1667]
+  * Remove `OCI8#describe` to use `OracleEnhanced::Connection#describe` [#1639]
+  * Remove `strip_heredoc` [#1652]
+  * Remove `rails/arel` from Gemfile [#1711]
+  * Remove `rails/arel` from bug report templates [skip ci] [#1715]
+  * Remove NativeException [#1666 #1762]
+  * Do not set nil value to java.util.Properties [#1763]
+  * Deprecated `table_name_length` and `column_name_length` [#1770]
+  * Add a check to supported Oracle database version [#1773]
+  * Update bug report templates [#1777]
+  * Use `supports_foreign_keys?` instead of removed `supports_foreign_keys_in_create?` [#1825]
+  * Ensure `clear_cache!` clears the prepared statements cache [#1845]
 
-* Changes and bug fixes
-  * Address undefined local variable or method sql' [#1932 #1962 #1964]
-  * CI against Ruby 2.6.4 and Ruby 2.5.6 [#1922]
-  * Lock simplecov version for Ruby 2.2 and 2.3 [#1902]
-
-## 5.2.6 / 2019-05-17
+* Refactoring
 
-* Changes and bug fixes
-  * Add TCP keepalive and TCP keepalive time configurations [#1874 #1878]
-  * CI against Ruby 2.6.2 and 2.5.5 #1849
-  * CI against Ruby 2.4.6 #1858
+  * Extract `structure_dump_views` and `structure_dump_synonyms` [#1640]
+  * Remove unnecessary `respond_to?(:report_on_exception)` [#1664]
+  * Remove deprecated `#insert_fixtures` method for Rails 6.0 [#1815]
+  * Use `SYS_CONTEXT('userenv', 'current_schema')` to find schema objects [#1671]
+  * Use `SYS_CONTEXT('userenv', 'current_schema')` for owner [#1672]
+  * Suppress warning `BigDecimal.new` is deprecated [#1742]
+  * Refactor to initialize `TableDefinition` by kwargs [#1785]
+  * Redact SQL in errors [#1791]
+  * Arity change at `sql_for_insert` [#1814]
+
+* CI
+  * Use Ubuntu Xenial at Travis CI [#1790]
+  * Bump Ruby versions to 2.6.2 and 2.5.4 [#1847]
+  * CI against Ruby 2.5.5 [#1848]
+  * Do not run CI against Ruby 2.2, which will not be supported with Rails 6 [#1653]
+  * CI against JRuby 9.2.6.0 [#1824]
+  * Show ruby version at CI [#1829]
+  * Remove unused blocklist from .travis.yml [#1830]
+  * Add spec for custom sequence name [#1846]
+  * Restore old Code Climate behavior [#1716]
+  * Do not install bundler explicitly [#1725]
+
+* RuboCop 
+
+  * Add RuboCop to Gemfile [#1841]
+  * Bump RuboCop to 0.63.0 [#1816]
+  * No need to exclude `jdbc_connection.rb` for `Style/ColonMethodCall` cop [#1698]
+  * Enable `Style/ColonMethodCall` cop [#1658]
+  * Enable `Lint/StringConversionInInterpolation` cop [#1724]
+  * Add `Style/RedundantFreeze` to remove redudant `.freeze` [#1662]
+  * Use `Layout/EndAlignment` cop to support RuboCop 0.54 [#1709]
+  * Introduced StartWith, EndWith and RegexpMatch cops [#1738]
+  * Enable `Layout/EmptyLinesAroundBlockBody` cop [#1732]
+  * Turn on performance based cops [#1734]
+  * Enable performance unfreeze string cop [#1729]
+  * Enable `Lint/UriEscapeUnescape` cop [#1758]
+  * Enable Style/ParenthesesAroundCondition cop [#1759]
+  * Enable performance unfreeze string cop [#1729]
+  * Enable `Layout/SpaceAfterSemicolon` cop [#1800]
+  * Enable `Style/RedundantBegin` cop [#1802]
+  * Enable `Lint/ShadowingOuterLocalVariable` cop [#1810]
+  * Enable `Lint/UselessAssignment` cop [#1812]
+  * Enable `Lint/DeprecatedClassMethods` cop [#1813]
+  * Enable `Lint/ErbNewArguments` cop [#1823]
+  * Enable `Lint/AmbiguousOperator` and `Lint/AmbiguousRegexpLiteral` cops [#1842]
+  * Enable `Performance/ReverseEach` cop [#1843]
 
 ## 5.2.5 / 2019-03-05
 

data/README.md

@@ -6,7 +6,7 @@ Oracle enhanced adapter for ActiveRecord
 DESCRIPTION
 -----------
 
-Oracle enhanced ActiveRecord adapter provides Oracle database access from Ruby on Rails applications. Oracle enhanced adapter can be used from Ruby on Rails versions between 2.3.x and 5.1 and it is working with Oracle database versions from 10g to 12c.
+Oracle enhanced ActiveRecord adapter provides Oracle database access from Ruby on Rails applications. Oracle enhanced adapter can be used from Ruby on Rails versions between 2.3.x and 5.2 and it is working with Oracle database versions from 10g to 12c.
 
 INSTALLATION
 ------------
@@ -666,12 +666,6 @@ class Post < ActiveRecord::Base
 end
 ```
 
-* Respect database instance `cursor_sharing` value exact by default
-
-Oracle enhanced adapter changed `cursor_sharing` parameter value to `force` in Rails 5.1 or lower. However, Oracle enhanced adapter 5.2 supports prepared statements for dictionary queries There is no need to change `cursor_sharing` value to `exact` anymore.
-
-If you want to keep the old behavior in Rails 5.2, set `cursor_sharing: :force` explicitly in the database.yml.
-
 * Remove `OracleEnhancedAdapter.cache_columns` to use Rails `db:schema:cache:dump`
 
 Refer https://github.com/rsim/oracle-enhanced#schema-cache

data/VERSION

@@ -1 +1 @@
-5.2.8
+6.0.0.beta1

data/lib/active_record/connection_adapters/oracle_enhanced/connection.rb

@@ -24,11 +24,8 @@ module ActiveRecord
           def describe(name)
             name = name.to_s
             if name.include?("@")
-              name, db_link = name.split("@")
-              default_owner = _select_value("SELECT username FROM all_db_links WHERE db_link = '#{db_link.upcase}'")
-              db_link = "@#{db_link}"
+              raise ArgumentError "db link is not supported"
             else
-              db_link = nil
               default_owner = @owner
             end
             real_name = OracleEnhanced::Quoting.valid_table_name?(name) ? name.upcase : name
@@ -39,31 +36,31 @@ module ActiveRecord
             end
             sql = <<-SQL.strip.gsub(/\s+/, " ")
           SELECT owner, table_name, 'TABLE' name_type
-          FROM all_tables#{db_link}
+          FROM all_tables
           WHERE owner = '#{table_owner}'
             AND table_name = '#{table_name}'
           UNION ALL
           SELECT owner, view_name table_name, 'VIEW' name_type
-          FROM all_views#{db_link}
+          FROM all_views
           WHERE owner = '#{table_owner}'
             AND view_name = '#{table_name}'
           UNION ALL
-          SELECT table_owner, DECODE(db_link, NULL, table_name, table_name||'@'||db_link), 'SYNONYM' name_type
-          FROM all_synonyms#{db_link}
+          SELECT table_owner, table_name, 'SYNONYM' name_type
+          FROM all_synonyms
           WHERE owner = '#{table_owner}'
             AND synonym_name = '#{table_name}'
           UNION ALL
-          SELECT table_owner, DECODE(db_link, NULL, table_name, table_name||'@'||db_link), 'SYNONYM' name_type
-          FROM all_synonyms#{db_link}
+          SELECT table_owner, table_name, 'SYNONYM' name_type
+          FROM all_synonyms
           WHERE owner = 'PUBLIC'
             AND synonym_name = '#{real_name}'
         SQL
             if result = _select_one(sql)
               case result["name_type"]
               when "SYNONYM"
-                describe("#{result['owner'] && "#{result['owner']}."}#{result['table_name']}#{db_link}")
+                describe("#{result['owner'] && "#{result['owner']}."}#{result['table_name']}")
               else
-                db_link ? [result["owner"], result["table_name"], db_link] : [result["owner"], result["table_name"]]
+                [result["owner"], result["table_name"]]
               end
             else
               raise OracleEnhanced::ConnectionException, %Q{"DESC #{name}" failed; does it exist?}
@@ -85,7 +82,7 @@ module ActiveRecord
           # To avoid it is called from anywhere else, added _ at the beginning of the method name.
           def _oracle_downcase(column_name)
             return nil if column_name.nil?
-            column_name =~ /[a-z]/ ? column_name : column_name.downcase
+            /[a-z]/.match?(column_name) ? column_name : column_name.downcase
           end
 
           # _select_one and _select_value methods are expected to be called

data/lib/active_record/connection_adapters/oracle_enhanced/context_index.rb

@@ -86,7 +86,7 @@ module ActiveRecord
             create_index_column_trigger(table_name, index_name, options[:index_column], options[:index_column_trigger_on])
           end
 
-          sql = "CREATE INDEX #{quote_column_name(index_name)} ON #{quote_table_name(table_name)}".dup
+          sql = +"CREATE INDEX #{quote_column_name(index_name)} ON #{quote_table_name(table_name)}"
           sql << " (#{quoted_column_name})"
           sql << " INDEXTYPE IS CTXSYS.CONTEXT"
           parameters = []
@@ -153,7 +153,7 @@ module ActiveRecord
             CREATE OR REPLACE PROCEDURE #{quote_table_name(procedure_name)}
               (p_rowid IN	      ROWID,
               p_clob	IN OUT NOCOPY CLOB) IS
-              -- add_context_index_parameters #{(column_names + select_queries).inspect}#{!options.empty? ? ', '.dup << options.inspect[1..-2] : ''}
+              -- add_context_index_parameters #{(column_names + select_queries).inspect}#{!options.empty? ? +', ' << options.inspect[1..-2] : ''}
               #{
               selected_columns.map do |cols|
                 cols.map do |col|
@@ -170,7 +170,7 @@ module ActiveRecord
                 #{
                 (column_names.map do |col|
                   col = col.to_s
-                  "DBMS_LOB.WRITEAPPEND(p_clob, #{col.length + 2}, '<#{col}>');\n".dup <<
+                  +"DBMS_LOB.WRITEAPPEND(p_clob, #{col.length + 2}, '<#{col}>');\n" <<
                   "IF LENGTH(r1.#{col}) > 0 THEN\n" <<
                   "DBMS_LOB.WRITEAPPEND(p_clob, LENGTH(r1.#{col}), r1.#{col});\n" <<
                   "END IF;\n" <<
@@ -188,7 +188,7 @@ module ActiveRecord
                   "END LOOP;\n" <<
                   (cols.map do |col|
                     col = col.to_s
-                    "DBMS_LOB.WRITEAPPEND(p_clob, #{col.length + 2}, '<#{col}>');\n".dup <<
+                    +"DBMS_LOB.WRITEAPPEND(p_clob, #{col.length + 2}, '<#{col}>');\n" <<
                     "IF LENGTH(l_#{col}) > 0 THEN\n" <<
                     "DBMS_LOB.WRITEAPPEND(p_clob, LENGTH(l_#{col}), l_#{col});\n" <<
                     "END IF;\n" <<
@@ -225,7 +225,7 @@ module ActiveRecord
 
           def create_storage_preference(storage_name, tablespace)
             drop_ctx_preference(storage_name)
-            sql = "BEGIN\nCTX_DDL.CREATE_PREFERENCE('#{storage_name}', 'BASIC_STORAGE');\n".dup
+            sql = +"BEGIN\nCTX_DDL.CREATE_PREFERENCE('#{storage_name}', 'BASIC_STORAGE');\n"
             ["I_TABLE_CLAUSE", "K_TABLE_CLAUSE", "R_TABLE_CLAUSE",
             "N_TABLE_CLAUSE", "I_INDEX_CLAUSE", "P_TABLE_CLAUSE"].each do |clause|
               default_clause = case clause
@@ -241,7 +241,7 @@ module ActiveRecord
 
           def create_lexer_preference(lexer_name, lexer_type, options)
             drop_ctx_preference(lexer_name)
-            sql = "BEGIN\nCTX_DDL.CREATE_PREFERENCE('#{lexer_name}', '#{lexer_type}');\n".dup
+            sql = +"BEGIN\nCTX_DDL.CREATE_PREFERENCE('#{lexer_name}', '#{lexer_type}');\n"
             options.each do |key, value|
               plsql_value = case value
                             when String; "'#{value}'"
@@ -258,7 +258,7 @@ module ActiveRecord
 
           def create_wordlist_preference(wordlist_name, wordlist_type, options)
             drop_ctx_preference(wordlist_name)
-            sql = "BEGIN\nCTX_DDL.CREATE_PREFERENCE('#{wordlist_name}', '#{wordlist_type}');\n".dup
+            sql = +"BEGIN\nCTX_DDL.CREATE_PREFERENCE('#{wordlist_name}', '#{wordlist_type}');\n"
             options.each do |key, value|
               plsql_value = case value
                             when String; "'#{value}'"

data/lib/active_record/connection_adapters/oracle_enhanced/database_limits.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "active_support/deprecation"
+
 module ActiveRecord
   module ConnectionAdapters
     module OracleEnhanced
@@ -15,11 +17,13 @@ module ActiveRecord
         def table_name_length
           IDENTIFIER_MAX_LENGTH
         end
+        deprecate :table_name_length
 
         # the maximum length of a column name
         def column_name_length
           IDENTIFIER_MAX_LENGTH
         end
+        deprecate :column_name_length
 
         # Returns the maximum allowed length for an index name. This
         # limit is enforced by rails and Is less than or equal to

data/lib/active_record/connection_adapters/oracle_enhanced/database_statements.rb

@@ -13,9 +13,9 @@ module ActiveRecord
           log(sql, name) { @connection.exec(sql) }
         end
 
-        def clear_cache!
-          @statements.clear
+        def clear_cache! # :nodoc:
           reload_type_map
+          super
         end
 
         def exec_query(sql, name = "SQL", binds = [], prepare: false)
@@ -76,8 +76,8 @@ module ActiveRecord
 
         # New method in ActiveRecord 3.1
         # Will add RETURNING clause in case of trigger generated primary keys
-        def sql_for_insert(sql, pk, id_value, sequence_name, binds)
-          unless id_value || pk == false || pk.nil? ||  pk.is_a?(Array)
+        def sql_for_insert(sql, pk, sequence_name, binds)
+          unless pk == false || pk.nil? || pk.is_a?(Array)
             sql = "#{sql} RETURNING #{quote_column_name(pk)} INTO :returning_id"
             (binds = binds.dup) << ActiveRecord::Relation::QueryAttribute.new("returning_id", nil, Type::OracleEnhanced::Integer.new)
           end
@@ -91,7 +91,7 @@ module ActiveRecord
 
         # New method in ActiveRecord 3.1
         def exec_insert(sql, name = nil, binds = [], pk = nil, sequence_name = nil)
-          sql, binds = sql_for_insert(sql, pk, nil, sequence_name, binds)
+          sql, binds = sql_for_insert(sql, pk, sequence_name, binds)
           type_casted_binds = type_casted_binds(binds)
 
           log(sql, name, binds, type_casted_binds) do
@@ -108,7 +108,7 @@ module ActiveRecord
 
               cursor.bind_params(type_casted_binds)
 
-              if sql =~ /:returning_id/
+              if /:returning_id/.match?(sql)
                 # it currently expects that returning_id comes last part of binds
                 returning_id_index = binds.size
                 cursor.bind_returning_param(returning_id_index, Integer)
@@ -222,17 +222,6 @@ module ActiveRecord
           end
         end
 
-        # fallback to non bulk fixture insert
-        def insert_fixtures(fixtures, table_name)
-          ActiveSupport::Deprecation.warn(<<-MSG.squish)
-            `insert_fixtures` is deprecated and will be removed in the next version of Rails.
-            Consider using `insert_fixtures_set` for performance improvement.
-          MSG
-          fixtures.each do |fixture|
-            insert_fixture(fixture, table_name)
-          end
-        end
-
         def insert_fixtures_set(fixture_set, tables_to_delete = [])
           disable_referential_integrity do
             transaction(requires_new: true) do
@@ -263,7 +252,7 @@ module ActiveRecord
               value = klass.attribute_types[col.name].serialize(value)
             end
             uncached do
-              unless lob_record = select_one(sql = <<-SQL.strip.gsub(/\s+/, " "), "Writable Large Object")
+              unless lob_record = select_one(<<-SQL.strip.gsub(/\s+/, " "), "Writable Large Object")
                 SELECT #{quote_column_name(col.name)} FROM #{quote_table_name(table_name)}
                 WHERE #{quote_column_name(klass.primary_key)} = #{id} FOR UPDATE
               SQL

data/lib/active_record/connection_adapters/oracle_enhanced/database_tasks.rb

@@ -21,7 +21,7 @@ module ActiveRecord
           begin
             connection.execute "CREATE USER #{@config['username']} IDENTIFIED BY #{@config['password']}"
           rescue => e
-            if e.message =~ /ORA-01920/ # user name conflicts with another user or role name
+            if /ORA-01920/.match?(e.message) # user name conflicts with another user or role name
               connection.execute "ALTER USER #{@config['username']} IDENTIFIED BY #{@config['password']}"
             else
               raise e

data/lib/active_record/connection_adapters/oracle_enhanced/jdbc_connection.rb

@@ -18,7 +18,7 @@ begin
   # Oracle 12c Release 2 client provides ojdbc8.jar
   ojdbc_jars = %w(ojdbc8.jar ojdbc7.jar ojdbc6.jar)
 
-  if ENV_JAVA["java.class.path"] !~ Regexp.new(ojdbc_jars.join("|"))
+  if !ENV_JAVA["java.class.path"]&.match?(Regexp.new(ojdbc_jars.join("|")))
     # On Unix environment variable should be PATH, on Windows it is sometimes Path
     env_path = (ENV["PATH"] || ENV["Path"] || "").split(File::PATH_SEPARATOR)
     # Look for JDBC driver at first in lib subdirectory (application specific JDBC file version)
@@ -26,7 +26,7 @@ begin
     ["./lib"].concat($LOAD_PATH).concat(env_path).detect do |dir|
       # check any compatible JDBC driver in the priority order
       ojdbc_jars.any? do |ojdbc_jar|
-        if File.exists?(file_path = File.join(dir, ojdbc_jar))
+        if File.exist?(file_path = File.join(dir, ojdbc_jar))
           require file_path
           true
         end
@@ -113,7 +113,7 @@ module ActiveRecord
             if database && (using_tns_alias || host == "connection-string")
               url = "jdbc:oracle:thin:@#{database}"
             else
-              unless database.match(/^(\:|\/)/)
+              unless database.match?(/^(\:|\/)/)
                 # assume database is a SID if no colon or slash are supplied (backward-compatibility)
                 database = ":#{database}"
               end
@@ -125,6 +125,8 @@ module ActiveRecord
             time_zone = config[:time_zone] || ENV["TZ"] || java.util.TimeZone.default.getID
 
             properties = java.util.Properties.new
+            raise "username not set" unless username
+            raise "password not set" unless password
             properties.put("user", username)
             properties.put("password", password)
             properties.put("defaultRowPrefetch", "#{prefetch_rows}") if prefetch_rows
@@ -161,6 +163,10 @@ module ActiveRecord
             end
           end
 
+          OracleEnhancedAdapter::FIXED_NLS_PARAMETERS.each do |key, value|
+            exec "alter session set #{key} = '#{value}'"
+          end
+
           self.autocommit = true
 
           schema = config[:schema] && config[:schema].to_s
@@ -312,6 +318,8 @@ module ActiveRecord
               @raw_statement.setClob(position, value)
             when Type::OracleEnhanced::Raw
               @raw_statement.setString(position, OracleEnhanced::Quoting.encode_raw(value))
+            when Type::OracleEnhanced::CharacterString::Data
+              @raw_statement.setFixedCHAR(position, value.to_s)
             when String
               @raw_statement.setString(position, value)
             when Java::OracleSql::DATE
@@ -470,8 +478,13 @@ module ActiveRecord
             end
           when :BINARY_FLOAT
             rset.getFloat(i)
-          when :VARCHAR2, :CHAR, :LONG, :NVARCHAR2, :NCHAR
+          when :VARCHAR2, :LONG, :NVARCHAR2
             rset.getString(i)
+          when :CHAR, :NCHAR
+            char_str = rset.getString(i)
+            if !char_str.nil?
+              char_str.rstrip
+            end
           when :DATE
             if dt = rset.getDATE(i)
               d = dt.dateValue

data/lib/active_record/connection_adapters/oracle_enhanced/oci_connection.rb

@@ -15,7 +15,7 @@ end
 required_oci8_version = [2, 2, 4]
 oci8_version_ints = OCI8::VERSION.scan(/\d+/).map { |s| s.to_i }
 if (oci8_version_ints <=> required_oci8_version) < 0
-  $stderr.puts <<-EOS.strip_heredoc
+  $stderr.puts <<~EOS
     "ERROR: ruby-oci8 version #{OCI8::VERSION} is too old. Please install ruby-oci8 version #{required_oci8_version.join('.')} or later."
   EOS
 
@@ -125,6 +125,8 @@ module ActiveRecord
               @raw_cursor.bind_param(position, OracleEnhanced::Quoting.encode_raw(value))
             when ActiveModel::Type::Decimal
               @raw_cursor.bind_param(position, BigDecimal(value.to_s))
+            when Type::OracleEnhanced::CharacterString::Data
+              @raw_cursor.bind_param(position, value.to_character_str)
             when NilClass
               @raw_cursor.bind_param(position, nil, String)
             else
@@ -151,8 +153,19 @@ module ActiveRecord
           def fetch(options = {})
             if row = @raw_cursor.fetch
               get_lob_value = options[:get_lob_value]
+              col_index = 0
               row.map do |col|
-                @connection.typecast_result_value(col, get_lob_value)
+                col_value = @connection.typecast_result_value(col, get_lob_value)
+                col_metadata = @raw_cursor.column_metadata.fetch(col_index)
+                if !col_metadata.nil?
+                  key = col_metadata.data_type
+                  case key.to_s.downcase
+                  when "char"
+                    col_value = col.to_s.rstrip
+                  end
+                end
+                col_index = col_index + 1
+                col_value
               end
             end
           end
@@ -184,7 +197,16 @@ module ActiveRecord
             hash = column_hash.dup
 
             cols.each_with_index do |col, i|
-              hash[col] = typecast_result_value(row[i], get_lob_value)
+              col_value = typecast_result_value(row[i], get_lob_value)
+              col_metadata = cursor.column_metadata.fetch(i)
+              if !col_metadata.nil?
+                key = col_metadata.data_type
+                case key.to_s.downcase
+                when "char"
+                  col_value = col_value.to_s.rstrip
+                end
+              end
+              hash[col] = col_value
             end
 
             rows << hash
@@ -200,17 +222,7 @@ module ActiveRecord
         end
 
         def describe(name)
-          # fall back to SELECT based describe if using database link
-          return super if name.to_s.include?("@")
-          quoted_name = OracleEnhanced::Quoting.valid_table_name?(name) ? name : "\"#{name}\""
-          @raw_connection.describe(quoted_name)
-        rescue OCIException => e
-          if e.code == 4043
-            raise OracleEnhanced::ConnectionException, %Q{"DESC #{name}" failed; does it exist?}
-          else
-            # fall back to SELECT which can handle synonyms to database links
-            super
-          end
+          super
         end
 
         # Return OCIError error code
@@ -285,8 +297,6 @@ module ActiveRecord
       # The OracleEnhancedOCIFactory factors out the code necessary to connect and
       # configure an Oracle/OCI connection.
       class OracleEnhancedOCIFactory #:nodoc:
-        DEFAULT_TCP_KEEPALIVE_TIME = 600
-
         def self.new_connection(config)
           # to_s needed if username, password or database is specified as number in database.yml file
           username = config[:username] && config[:username].to_s
@@ -316,13 +326,11 @@ module ActiveRecord
           else
             database
           end
-
-          OCI8.properties[:tcp_keepalive] = config[:tcp_keepalive] == false ? false : true
+          OCI8.properties[:tcp_keepalive] = true
           begin
-            OCI8.properties[:tcp_keepalive_time] = config[:tcp_keepalive_time] || DEFAULT_TCP_KEEPALIVE_TIME
+            OCI8.properties[:tcp_keepalive_time] = 600
           rescue NotImplementedError
           end
-
           conn = OCI8.new username, password, connection_string, privilege
           conn.autocommit = true
           conn.non_blocking = true if async
@@ -342,6 +350,10 @@ module ActiveRecord
               conn.exec "alter session set #{key} = '#{value}'"
             end
           end
+
+          OracleEnhancedAdapter::FIXED_NLS_PARAMETERS.each do |key, value|
+            conn.exec "alter session set #{key} = '#{value}'"
+          end
           conn
         end
       end
@@ -349,18 +361,6 @@ module ActiveRecord
   end
 end
 
-class OCI8 #:nodoc:
-  def describe(name)
-    info = describe_table(name.to_s)
-    raise %Q{"DESC #{name}" failed} if info.nil?
-    if info.respond_to?(:obj_link) && info.obj_link
-      [info.obj_schema, info.obj_name, "@" + info.obj_link]
-    else
-      [info.obj_schema, info.obj_name]
-    end
-  end
-end
-
 # The OCI8AutoRecover class enhances the OCI8 driver with auto-recover and
 # reset functionality. If a call to #exec fails, and autocommit is turned on
 # (ie., we're not in the middle of a longer transaction), it will