activerecord-oracle_enhanced-adapter 1.7.7 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa268d433a58212089a08ecef9e43c163abde038
-  data.tar.gz: 4c57883d8eaa819b01c58342cd1d1ef679228f46
+  metadata.gz: 1ee1b843fcd1ec26d858001def3874b07ad7e42b
+  data.tar.gz: '079d2060aa9778cfd83b2ff527fae49316d722ab'
 SHA512:
-  metadata.gz: e5f806719336de611f0b0665c16ed334c35c544f2e6b9462e2e6788f41417f33e43b524769c47bc6b1b6bb67c47316c2ac84b69132f6e3253f1d32d6d5f72441
-  data.tar.gz: 03f58f1cbdec17d82868588f78f1dd26cf6532ec819410f7c0d0cdd17a4611dee283bb55f2496befba03b9e37fe13ede1cff77b5792e9fd1ef87c49bf6110caf
+  metadata.gz: 9e5a0750962779f3da3cce127223ed7c4eefb8f7a95a5b6efe0f55a6d1d3a360013f24f893956ff4c32c6eb7f98e2eb6eff082aea574dafc2a71cf83e292e77b
+  data.tar.gz: 61b9e6b44542a1d0a8811e79c0403ec340f6bbeeb1fa55adc7670ee484a9100cf5e3c72a30f23133a6b3b458782bc503198372298430a00a4dc35f7ffbd9de71

data/History.md

@@ -1,3 +1,228 @@
+## 1.8.0 / 2017-04-27
+
+* Major enhancements
+  * Support Rails 5.1.0
+  * Add JSON attribute support [#1240]
+  * Update `database.yml` when `rails new <new_app> -d oracle` specified [rails/rails#28257]
+
+* Changes and bug fixes
+  * No changes since 1.8.0.rc3
+
+## 1.8.0.rc3 / 2017-04-24
+
+* Changes and bug fixes
+  * Include VERSION file in gem [#1302, #1303]
+
+## 1.8.0.rc2 / 2017-04-19
+
+* Changes and bug fixes
+  * Fix `select_all` with legacy `binds` [#1246,#1248,#1250]
+  * Fix the `BINARY_FLOAT` column type returns nil in JRuby [#1244, #1254, #1255]
+  * Handle `TIMESTAMP WITH TIMEZONE` separately from `TIMEZONE` [#1206, #1267, #1268]
+  * Changing `NLS_DATE_FORMAT` and `NLS_TIMESTAMP_FORMAT` is not supported [#1267, #1268]
+  * Let abstract adapter type cast Date, DateTime and Time for JRuby [#1272, #1273]
+  * Collapse a file specification in gemspec [#1296, #1297]
+  * Do not write VERSION directly with gemspec [#1298, #1299]
+  * Omit specification of release date in gemspec [#1298, #1299]
+  * Add missing `timestamptz.rb` to gemspec at release18 branch [#1286]
+  * Remove specs for unsupported behaviour which causes `ORA-01861` [#1267, #1269, #1271]
+  * Address `OCIException: OCI8 was already closed` at specs for JSON [#1265, #1266]
+  * Bump Ruby version to 2.2.7 [#1261]
+
+## 1.8.0.rc1 / 2017-03-20
+
+* Major enhancements
+  * Support Rails 5.1.0.rc1
+  * Add JSON attribute support #1240
+  * Update `database.yml` when `rails new <new_app> -d oracle` specified [rails/rails#28257]
+
+* Changes and bug fixes
+  * Eliminate a redundant empty lines in schema.rb generated by SchemaDumper [#1232]
+  * Align the columns of db/structure.sql [#1242]
+  * Use Abstract StatementPool [#1228]
+  * Decouple Composite Primary Key code [#1224, #1225]
+  * Push `valid_type?` up to abstract adapter [#1208]
+  * Oracle12 visitor is also available for 12.2 [#1217]
+  * Oracle Database 12c Release 2 bundles new ojdbc8.jar [#1218]
+  * Deprecate `supports_migrations?` on connection adapters [#1209]
+  * Use `ActiveRecord::SchemaMigration.table_name` [#1221]
+  * No need to check if `changed?` defined [#1226]
+  * No need to initialize `@quoted_column_names` and `@quoted_table_names` [#1227]
+  * Hard code `empty_blob()` or `empty_clob()` based on types [#1229]
+  * ruby-plsql 0.6.0 or higher version is required [#1216]
+  * No need to specify `rack` in Gemfile [#1230]
+  * Bundle from more secure source [#1243]
+  * Add Travis CI build status [#1231]
+  * Bump JRuby to 9.1.8.0 [#1222]
+  * Remove a duplicate spec testing `Model.distinct.count` [#1235]
+  * Suppress unused and not initialized warnings [#1215]
+  * Suppress `WARNING: Using the `raise_error` matcher without providing a specific error` [#1219]
+  * Suppress `WARNING: Using `expect { }.not_to raise_error(...)` risks false positives` [#1220]
+
+## 1.8.0.beta1 / 2017-02-27
+
+* Major enhancements
+  * Support Rails 5.1.0.beta1
+  * Fallback :bigint to :integer for primary keys [#1077]
+  * Drop Java SE 6 or older version of Java SE support [#1126]
+  * Drop JRuby 9.0.x support for Rails 5.1 [#1147]
+  * Refactor ColumnDumper to support consistent Virtual column with Rails [#1185]
+  * Schema dumper supports `t.index` in `create_table` [#1187]
+  * `table_exists?` only checks tables, does not check views [#1179, #1191]
+  * `data_sources` returns tables and views [#1192]
+  * `Model.table_comment` syntax is not supported anymore [#1199]
+  * Remove Oracle enhanced adapter own foreign key implementations [#977]
+
+* Changes and bug fixes
+  * Rails 5.1.0.beta1 is out [#1204]
+  * Composite foreign keys are not supported [#1188]
+  * Introduce `supports_virtual_columns?` [#1184]
+  * Made it able to change column with adding comment [#1156, #1164]
+  * Omit table comment option of schema.rb if it is blank [#1159]
+  * Fix to return nil if column comment is blank at table creation [#1158]
+  * `bind_param` arity change, not to take column [#1203]
+  * ActiveRecord `structure_dump` and `structure_load` signature changes [#1125]
+  * Quoting booleans should return a frozen string [#956]
+  * Pass `type_casted_binds` to log subscriber [#957]
+  * `supports_datetime_with_precision?` always returns `true` [#964]
+  * Handle ORA-00942 and ORA-00955 as `ActiveRecord::StatementInvalid` [#1093]
+  * Raise `ActiveRecord::StatementInvalid` at `rename_index` when old index does not exist [#1195]
+  * Handle `ORA-01418: specified index does not exist` as `ActiveRecord::StatementInvalid` [#1195]
+  * Raise ActiveRecord::NotNullViolation when OCIError: ORA-01400 [#1174]
+  * Rails 5.1 : insert into `returning_id` not working since rails/rails#26002 [#988, #1088]
+  * Make `exec_{insert,update}` signatures consistent [#966]
+  * Introduce OracleEnhanced `ColumnMethods` module and `AlterTable` `Table` classes [#1081]
+  * `empty_insert_statement_value` is not implemented [#1180]
+  * Switch to keyword args for `type_to_sql` [#1167, #1168]
+  * Replace `all_timestamp_attributes` with `all_timestamp_attributes_in_model` [#1129]
+  * `current_database` returns the expected database name [#1135]
+  * Use `supports_foreign_keys_in_create?` [#1143]
+  * Address `add_column` gets `ArgumentError: wrong number of arguments` [#1157, #1170]
+  * Address `change_column` `ArgumentError: wrong number of arguments` [#1171, #1172]
+  * SchemaDumper should not dump views as tables [#1192]
+  * Use Abstract `select_rows(arel, name = nil, binds = [])` [#1132]
+  * Address `OCIError: ORA-01756: quoted string not properly terminated:` [#1102]
+  * Use `table_exists?` and `tables` [#1170, #1178]
+  * Move `ActiveModel::Type::Text` to `ActiveRecord::Type::Text` [#1082]
+  * Support schema option for views [#1190]
+  * Quote table and trigger names containing sinqle quote character [#1192]
+  * Restore :raw type migration support [#1176]
+  * Refactor Boolean type by removing duplicate code [#1047]
+  * Remove deprecated methods to get and set columns [#958]
+  * Remove `is_?` deprecated methods [#959]
+  * Remove `quote_date_with_to_date` and `quote_timestamp_with_to_timestamp` #960
+  * Remove unnecessary comments in Type [#961]
+  * Remove options[:default] for virtual columns [#962]
+  * Remove `self.emulate_dates` and `self.emulate_dates_by_column_name` [#963]
+  * Delete `self.boolean_to_string` [#967]
+  * Delete Oracle enhanced its own `join_to_update` [#968]
+  * Remove `self.ignore_table_columns` [#969]
+  * Remove unused `self.virtual_columns` [#970]
+  * Remove `dump_schema_information` and `initialize_schema_migrations_table` [#972]
+  * Remove `fallback_string_to_date`, `fallback_string_to_time` [#974, #975, #1112]
+  * Remove `dependent` option from `add_foreign_key` [#976]
+  * Remove specs testing Rails `self.ignored_columns` features [#987]
+  * Remove `add_foreign_key` specs with `table_name_prefix` and `table_name_suffix` [#990]
+  * Remove `type_cast` method just calling super [#1201]
+  * Remove `ids_in_list_limit` alias [#1202]
+  * Remove unused comments from data types spec [#1079]
+  * Remove deprecated `table_exists?` and `tables` [#1100, #1178]
+  * Remove deprecated `name` argument from `#tables` [#1189]
+  * Prefer `SYS_CONTEXT` function than `v$nls_parameters` view [#1107]
+  * `initialize_schema_migrations_table` method has been removed [#1144]
+  * `index_name_exists?` at schema statements spec is not necessary [#1197]
+  * Remove comments for `data_source_exists?` [#1200]
+  * Address DEPRECATION WARNING: Passing a column to `quote` has been deprecated. [#978]
+  * Deprecate `supports_primary_key?` [#1177]
+  * Deprecate passing `default` to `index_name_exists?` [#1175]
+  * Suppress `add_index_options` method `DEPRECATION WARNING:` [#1193]
+  * Suppress `remove_index` method deprecation warning [#1194]
+  * Suppress DEPRECATION WARNING at `rename_index` [#1195]
+  * Suppress `oracle_enhanced_adapter.rb:591: warning: assigned but unused` [#1198]
+  * Use rails rubocop setting [#1111]
+  * Rubocop addresses `Extra empty line detected at class body beginning.` [#1078]
+  * Address `Lint/EndAlignment` offences by changing code ifself [#1113]
+  * rubocop `AlignWith` has been renamed to `EnforcedStyleAlignWith` [#1142]
+  * Add `Style/EmptyLinesAroundMethodBody` [#1173]
+  * Address git warnings: [#1000]
+  * Update `required_rubygems_version` just following rails.gemspec [#1110]
+  * Use the latest ruby-plsql while developing alpha version [#1114]
+  * Use the latest arel master while developing alpha version [#1115]
+  * Bump Arel to 8.0 [#1120, #1121, #1124]
+  * Use released Arel 8 [#1205]
+  * Remove duplicate license information [#965] 
+  * Clean up comments and un-commented specs for table comment feature [#971]
+  * Use Rails migration `create_table` to create table and sequence [#991]
+  * Removed a invalid spec about TIMESTAMP column [#1020]
+  * Remove specs which set `attribute :hire_date, :date` [#1024]
+  * Remove version specification for rspec [#1055]
+  * Suppress `create_table(:test_employees, {:force=>true})` message [#1080]
+  * Perform `drop_table :test_employees` [#1087]
+  * Address rspec deprecation warning [#1089]
+  * Suppress rspec warning [#1101]
+  * Suppress `Dropped database 'ORCL'` messages while running rspec [#1103]
+  * Address rspec warnings by checking with `raise_errors_for_deprecations!` [#1104]
+  * `clear_cache!` always exists at least since Rails 4.0 [#1106]
+  * Use SimpleCov [#1108]
+  * Enable RSpec `--warnings` option [#1116]
+  * Remove entry for rcov since it already migrated to simplecov [#1118]
+  * Add spec for #1149 `TypeError: can't cast Java::JavaSql::Timestamp` [#1152]
+  * Remove a duplicated specs [#1163]
+  * Specify `--require spec_helper` in .rspec [#1186]
+  * Add 'pry' and 'pry-nav' for JRuby debug [#973]
+  * Remove ruby-debug [#1196]
+  * Use Ubuntu Trusty at travis [#1095]
+  * Address travis.yml has multilpe language entries [#1109]
+  * Use docker-oracle-xe-11g for Travis CI [#1117]
+  * Modify `JRUBY_OPTS` for Travis CI [#1119]
+  * Add ruby-head and jruby-head to .travis.yml [#1127]
+  * Use JRuby 9.1.7.0 [#1138]
+  * Add JRuby 9.0.4.0 and allow JRuby 9.0.5.0 failures [#1146]
+  * Tiny fix for .travis.yml after migrating to docker-oracle-xe-11g [#1183]
+  * Templates updated to use Rails master branch for Rails 5.1 [#1133]
+  * Update running tests to include rails-dev-box [#1140]
+
+* Known issues
+  * Legacy primary key support testing [#1207]
+  * PrimaryKeyIntegerNilDefaultTest failures [#1162]
+  * Skip `explain should explain query with bind` with JRuby [#1091]
+
+## 1.7.10 / 2017-02-03
+
+* Changes and bug fixes
+  * Address `TypeError: can't cast Java::JavaSql::Timestamp` [#1147, 1153]
+  * Use docker-oracle-xe-11g for Travis CI for release17 branch [#1150]
+  * Use JRuby 9.1.7.0 for release17 branch [#1154]
+  * Pending until further investigation made for #908 for release17 branch [#1151]
+
+* Known issues
+ * No changes since 1.7.7
+
+## 1.7.9 / 2016-12-26
+
+* Changes and bug fixes
+
+  * Fix ORA-00933 error when executing `rails db:schema:load` [#1084]
+  * Quoting booleans should return a frozen string [#1083]
+  * CI against ruby 2.4.0 [#1096, #1086]
+
+* Known issues
+ * No changes since 1.7.7
+
+## 1.7.8 / 2016-12-06
+
+* Changes and bug fixes
+  * Separate schema migration insert statements correctly [#1074]
+  * Add `use_old_oracle_visitor` example [#1068]
+  * `supports_fetch_first_n_rows_and_offset?` returns `false` when `use_old_oracle_visitor` is true {1070, #1075]
+  * Suppress `create_table(:posts, {:force=>true})` message [#1067, #1072]
+  * Enable rubocop and Code Climate [#1056, #1057, #1060, #1062, #1071]
+  * Bump MRI version for travis [#1054, #1059]
+  * Drop `ActiveRecord::InternalMetadata.table_name` after each spec [#1073]
+
+* Known issues
+ * No changes since 1.7.7
+
 ## 1.7.7 / 2016-11-15
 
 * Changes and bug fixes

data/README.md

@@ -10,6 +10,17 @@ Oracle enhanced ActiveRecord adapter provides Oracle database access from Ruby o
 
 INSTALLATION
 ------------
+### Rails 5.1
+
+Oracle enhanced adapter version 1.8 just supports Rails 5.1 and does not support Rails 5.0 or lower version of Rails.
+When using Ruby on Rails version 5.1 then in Gemfile include
+
+```ruby
+# Use oracle as the database for Active Record
+gem 'activerecord-oracle_enhanced-adapter', '~> 1.8.0'
+gem 'ruby-oci8' # only for CRuby users
+```
+
 ### Rails 5.0
 
 Oracle enhanced adapter version 1.7 just supports Rails 5.0 and does not support Rails 4.2 or lower version of Rails.
@@ -240,6 +251,9 @@ ActiveSupport.on_load(:active_record) do
     # start primary key sequences from 1 (and not 10000) and take just one next value in each session
     self.default_sequence_start_value = "1 NOCACHE INCREMENT BY 1"
 
+    # Use old visitor for Oracle 12c database
+    self.use_old_oracle_visitor = true
+
     # other settings ...
   end
 end

data/VERSION

@@ -1 +1 @@
-1.7.7
+1.8.0

data/lib/active_record/connection_adapters/emulation/oracle_adapter.rb

@@ -1,5 +1,5 @@
 class ActiveRecord::ConnectionAdapters::OracleAdapter < ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter #:nodoc:
   def adapter_name
-    'Oracle'
+    "Oracle"
   end
 end

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

@@ -1,11 +1,9 @@
 module ActiveRecord
   module ConnectionAdapters #:nodoc:
     class OracleEnhancedColumn < Column
-
       attr_reader :table_name, :nchar, :virtual_column_data_default, :returning_id #:nodoc:
 
       def initialize(name, default, sql_type_metadata = nil, null = true, table_name = nil, virtual = false, returning_id = nil, comment = nil) #:nodoc:
-
         @virtual = virtual
         @virtual_column_data_default = default.inspect if virtual
         @returning_id = returning_id
@@ -18,7 +16,7 @@ module ActiveRecord
         # Is column NCHAR or NVARCHAR2 (will need to use N'...' value quoting for these data types)?
         # Define only when needed as adapter "quote" method will check at first if instance variable is defined.
         if sql_type_metadata
-          @object_type = sql_type_metadata.sql_type.include? '.'
+          @object_type = sql_type_metadata.sql_type.include? "."
         end
         # TODO: Need to investigate when `sql_type` becomes nil
       end
@@ -63,75 +61,21 @@ module ActiveRecord
         super
       end
 
-      # Get column comment from schema definition.
-      # Will work only if using default ActiveRecord connection.
-#      def comment
-#        #TODO: may be deprecated due to conflict with variable
-#        ActiveRecord::Base.connection.column_comment(@table_name, name)
-#      end
-      
       private
 
-      def self.extract_value_from_default(default)
-        case default
+        def self.extract_value_from_default(default)
+          case default
           when String
             default.gsub(/''/, "'")
-          else
+            else
             default
-        end
-      end
-
-      def guess_date_or_time(value)
-        value.respond_to?(:hour) && (value.hour == 0 and value.min == 0 and value.sec == 0) ?
-          Date.new(value.year, value.month, value.day) : value
-      end
-      
-      class << self
-        protected
-
-        def fallback_string_to_date(string) #:nodoc:
-          if OracleEnhancedAdapter.string_to_date_format || OracleEnhancedAdapter.string_to_time_format
-            ActiveSupport::Deprecation.warn(<<-MSG.squish)
-              `fallback_string_to_date` has been deprecated.
-              It will be removed from next version of Oracle enhanced adapter.
-              Users are unlikely to see this message since this method has gone
-              from ActiveRecord::ConnectionAdapters::Column in Rails 4.2.
-            MSG
-            return (string_to_date_or_time_using_format(string).to_date rescue super)
           end
-          super
         end
 
-        def fallback_string_to_time(string) #:nodoc:
-          if OracleEnhancedAdapter.string_to_time_format || OracleEnhancedAdapter.string_to_date_format
-            ActiveSupport::Deprecation.warn(<<-MSG.squish)
-              `fallback_string_to_time` has been deprecated.
-              It will be removed from next version of Oracle enhanced adapter.
-              Users are unlikely to see this message since this method has gone
-              from ActiveRecord::ConnectionAdapters::Column in Rails 4.2.
-            MSG
-            return (string_to_date_or_time_using_format(string).to_time rescue super)
-          end
-          super
-        end
-
-        def string_to_date_or_time_using_format(string) #:nodoc:
-          ActiveSupport::Deprecation.warn(<<-MSG.squish)
-            `string_to_date_or_time_using_format` has been deprecated.
-            It will be removed from next version of Oracle enhanced adapter.
-            Users are unlikely to see this message since `fallback_string_to_date`
-            and `fallback_string_to_time` have gone
-            from ActiveRecord::ConnectionAdapters::Column in Rails 4.2.
-          MSG
-          if OracleEnhancedAdapter.string_to_time_format && dt=Date._strptime(string, OracleEnhancedAdapter.string_to_time_format)
-            return Time.parse("#{dt[:year]}-#{dt[:mon]}-#{dt[:mday]} #{dt[:hour]}:#{dt[:min]}:#{dt[:sec]}#{dt[:zone]}")
-          end
-          DateTime.strptime(string, OracleEnhancedAdapter.string_to_date_format).to_date
+        def guess_date_or_time(value)
+          value.respond_to?(:hour) && ((value.hour == 0) && (value.min == 0) && (value.sec == 0)) ?
+            Date.new(value.year, value.month, value.day) : value
         end
-        
-      end
     end
-
   end
-
 end

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

@@ -2,68 +2,22 @@ module ActiveRecord #:nodoc:
   module ConnectionAdapters #:nodoc:
     module OracleEnhanced #:nodoc:
       module ColumnDumper #:nodoc:
-
-        def column_spec(column)
-          spec = Hash[prepare_column_options(column).map { |k, v| [k, "#{k}: #{v}"] }]
-          spec[:name] = column.name.inspect
-          if column.virtual?
-            spec[:type] = "virtual"
-          else
-            spec[:type] = schema_type(column).to_s
-          end
-          spec
-        end
-
         def prepare_column_options(column)
-          spec = {}
-
-          if limit = schema_limit(column)
-            spec[:limit] = limit
-          end
-
-          if precision = schema_precision(column)
-            spec[:precision] = precision
-          end
-
-          if scale = schema_scale(column)
-            spec[:scale] = scale
-          end
+          spec = super
 
-          if virtual_as = schema_virtual_as(column)
-            spec[:as] = virtual_as
+          if supports_virtual_columns? && column.virtual?
+            spec[:as] = column.virtual_column_data_default
+            spec = { type: schema_type(column).inspect }.merge!(spec) unless column.type == :decimal
           end
 
-          if virtual_type = schema_virtual_type(column)
-            spec[:virtual_type] = virtual_type
-          end
-
-          default = schema_default(column) if column.has_default?
-          spec[:default]   = default unless default.nil?
-
-          spec[:null] = 'false' unless column.null
-
-          spec[:comment] = column.comment.inspect if column.comment.present?
-
           spec
         end
 
-        def migration_keys
-          # TODO `& column_specs.map(&:keys).flatten` should be exetuted here
-          [:name, :limit, :precision, :scale, :default, :null, :as, :virtual_type, :comment]
-        end
-
         private
 
-        def schema_virtual_as(column)
-          column.virtual_column_data_default if column.virtual?
-        end
-
-        def schema_virtual_type(column)
-          unless column.type == :decimal
-            column.type.inspect if column.virtual?
+          def default_primary_key?(column)
+            schema_type(column) == :integer
           end
-        end
-
       end
     end
   end

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

@@ -2,7 +2,6 @@ module ActiveRecord
   module ConnectionAdapters
     # interface independent methods
     class OracleEnhancedConnection #:nodoc:
-
       def self.create(config)
         case ORACLE_ENHANCED_CONNECTION
         when :oci
@@ -30,8 +29,8 @@ module ActiveRecord
       # Used always by JDBC connection as well by OCI connection when describing tables over database link
       def describe(name)
         name = name.to_s
-        if name.include?('@')
-          name, db_link = name.split('@')
+        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}"
         else
@@ -39,8 +38,8 @@ module ActiveRecord
           default_owner = @owner
         end
         real_name = ActiveRecord::ConnectionAdapters::OracleEnhanced::Quoting.valid_table_name?(name) ? name.upcase : name
-        if real_name.include?('.')
-          table_owner, table_name = real_name.split('.')
+        if real_name.include?(".")
+          table_owner, table_name = real_name.split(".")
         else
           table_owner, table_name = default_owner, real_name
         end
@@ -66,11 +65,11 @@ module ActiveRecord
             AND synonym_name = '#{real_name}'
         SQL
         if result = select_one(sql)
-          case result['name_type']
-          when 'SYNONYM'
+          case result["name_type"]
+          when "SYNONYM"
             describe("#{result['owner'] && "#{result['owner']}."}#{result['table_name']}#{db_link}")
           else
-            db_link ? [result['owner'], result['table_name'], db_link] : [result['owner'], result['table_name']]
+            db_link ? [result["owner"], result["table_name"], db_link] : [result["owner"], result["table_name"]]
           end
         else
           raise OracleEnhancedConnectionException, %Q{"DESC #{name}" failed; does it exist?}
@@ -97,28 +96,26 @@ module ActiveRecord
         result = select(sql, name = nil)
         result.map { |r| r.values.first }
       end
-
     end
 
     # Returns array with major and minor version of database (e.g. [12, 1])
     def database_version
       raise NoMethodError, "Not implemented for this raw driver"
-    end 
-    
-    class OracleEnhancedConnectionException < StandardError #:nodoc:
     end
 
+    class OracleEnhancedConnectionException < StandardError #:nodoc:
+    end
   end
 end
 
 # if MRI or YARV
-if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby'
+if !defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby"
   ORACLE_ENHANCED_CONNECTION = :oci
-  require 'active_record/connection_adapters/oracle_enhanced/oci_connection'
+  require "active_record/connection_adapters/oracle_enhanced/oci_connection"
 # if JRuby
-elsif RUBY_ENGINE == 'jruby'
+elsif RUBY_ENGINE == "jruby"
   ORACLE_ENHANCED_CONNECTION = :jdbc
-  require 'active_record/connection_adapters/oracle_enhanced/jdbc_connection'
+  require "active_record/connection_adapters/oracle_enhanced/jdbc_connection"
 else
   raise "Unsupported Ruby engine #{RUBY_ENGINE}"
 end