activerecord-oracle_enhanced-adapter 1.6.9 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3bf47194eb3711fcdc5cc04ea0c11ca3afe5ba8
-  data.tar.gz: cb7f41143131f866bf881a9fbc19d76785ff5c75
+  metadata.gz: 90fa8b1a7acfc65a87b37c9d9e6fab35b7a6fe35
+  data.tar.gz: 3d1fe46c3644b1a5ac00bc7c212df6e7e55fa1fb
 SHA512:
-  metadata.gz: 976de1d723fa15c16a103e6ea6c9961f1600a04f1e08f4817e804b1a05dca1aec5d1759a5a1a42c938061118caf1bd2f1b40f0b0328763b052631ff765e92e50
-  data.tar.gz: 01fa3f9969c749aa645571e219a5069c333d05afc39d138733ef723846da8ef8b0dfffef699cc3385c8df4a7233fff83bc551c08fead510aab683560a92166cd
+  metadata.gz: 04809974b2b2258aff6483828ae2d4c5db9d2b7ff7f6c5290c8d0c6f50b63d59b391c66efbe47bb3f911c0083fb16707c10479ddd4a3c1e7c9a00a5f8366cd04
+  data.tar.gz: 2fb86439af72485537fa6e6545eedffd2716e77f3ee640a5e207a1ff935add1f650c94a71e6b0ef0e50b7922b69d07dd4c92c222a42b028e6eacc9255800c3aa

data/Gemfile

@@ -1,23 +1,22 @@
 source 'http://rubygems.org'
 
 group :development do
-  gem 'jeweler', '~> 2.0'
-  gem 'rspec'
+  gem 'rspec', '~> 3.3'
   gem 'rdoc'
+  gem 'rake'
 
-  gem 'activerecord',   github: 'rails/rails', branch: '4-2-stable'
-  gem 'activemodel',    github: 'rails/rails', branch: '4-2-stable'
-  gem 'activesupport',  github: 'rails/rails', branch: '4-2-stable'
-  gem 'actionpack',     github: 'rails/rails', branch: '4-2-stable'
-  gem 'railties',       github: 'rails/rails', branch: '4-2-stable'
+  gem 'activerecord',   github: 'rails/rails', branch: '5-0-stable'
+  gem 'rack',           github: 'rack/rack', branch: 'master'
+  gem 'arel',           github: 'rails/arel', branch: 'master'
 
-  gem 'arel',           github: 'rails/arel', branch: '6-0-stable'
-  gem 'journey',        github: 'rails/journey'
-
-  gem 'activerecord-deprecated_finders'
   gem 'ruby-plsql', '>=0.5.0'
 
   platforms :ruby do
     gem 'ruby-oci8',    github: 'kubo/ruby-oci8'
+    gem 'byebug'
+  end
+
+  platforms :jruby do
+    gem 'ruby-debug'
   end
 end

data/History.md

@@ -1,19 +1,275 @@
-## 1.6.9 / 2017-03-29
+## 1.7.0 / 2016-08-04
 
-* Changes and bug fixes since 1.6.8
- * Fix the BINARY_FLOAT column type returns nil in JRuby [#1257]
+* Changes and bug fixes
+ * No changes since 1.7.0.rc1
 
-## 1.6.8 / 2017-03-18
+* Known issues
+ * No changes since 1.7.0.rc1
 
-* Changes and bug fixes since 1.6.7
- * Better fix to support "Relation#count does not support finder options anymore in Rails [#787, #788]
+## 1.7.0.rc1 / 2016-08-02
+
+* Changes and bug fixes
+
+ * Support `emulate_booleans_from_strings` in Rails 5 [#953, #942]
+ * Deprecate `self.is_boolean_column?` [#949]
+ * Deprecate `self.is_date_column?` and `is_date_column?` [#950]
+ * Deprecate `set_type_for_columns`, `set_type_for_columns` and `clear_types_for_columns` [#951]
+ * Deprecate `self.is_integer_column?` [#952]
+
+* Known issues
+
+ - Only with JRuby
+ * Rails 5 : explain should explain query with binds got Java::JavaSql::SQLException: Invalid column index [#908]
+    * Workaround: execute explain without bind or use CRuby
+ - CRuby and JRuby
+ * Rails 5 : custom methods for create record when exception is raised in after_create callback fails [#944]
+ * Rails 5 : specs need update to emulate_booleans_from_strings [#942]
+ * Rails 5 : undefined method `to_i' for #<Arel::Nodes::BindParam:0x00000002c92910> [#848, rails/arel#438]
+    * #848 reproduces when database version is 11gR2 or older, it does not reproduce with 12c
+    * One of the units test skipped when database version is 11gR2 or lower. [#946]
+
+## 1.7.0.beta7 / 2016-08-01
+
+* Changes and bug fixes
+
+ * Use OracleEnhanced::SchemaDumper#tables and #table
+   only if they have Oracle enhanced specific features [#947, #797]
+
+* Known issues
+
+ - Only with JRuby
+ * Rails 5 : explain should explain query with binds got Java::JavaSql::SQLException: Invalid column index [#908]
+ - CRuby and JRuby
+ * Rails 5 : custom methods for create record when exception is raised in after_create callback fails [#944]
+ * Rails 5 : emulate_booleans_from_strings support [#942]
+ * Rails 5 : undefined method `to_i' for #<Arel::Nodes::BindParam:0x00000002c92910> [#848, rails/arel#438]
+    * #848 reproduces when database version is 11gR2 or older, it does not reproduce with 12c
+    * One of the units test skipped when database version is 11gR2 or lower. [#946]
+
+## 1.7.0.beta6 / 2016-07-29
+
+* Changes and bug fixes
+
+ * Use attributes.keys to update all attributes when partial_write is disabled [#906 #943]
+
+* Known issues
+
+ - Only with JRuby
+ * Rails 5 : explain should explain query with binds got Java::JavaSql::SQLException: Invalid column index [#908]
+ - CRuby and JRuby
+ * Rails 5 : custom methods for create record when exception is raised in after_create callback fails [#944]
+ * Rails 5 : emulate_booleans_from_strings support [#942]
+ * Rails 5 : undefined method `to_i' for #<Arel::Nodes::BindParam:0x00000002c92910> [#848, rails/arel#438]
+    * #848 reproduces when database version is 11gR2 or older, it does not reproduce with 12c
+
+## 1.7.0.beta5 / 2016-07-28
+
+* Changes and bug fixes
+
+ * Use binds.size to set returning_id_index for returning_id [#907, #912 and #939]
+
+* Known issues
+
+ - Only with JRuby
+ * Rails 5 : explain should explain query with binds got Java::JavaSql::SQLException: Invalid column index [#908]
+ - CRuby and JRuby
+ * Rails 5 : custom methods for create, update and destroy not working [#906]
+ * Rails 5 : undefined method `to_i' for #<Arel::Nodes::BindParam:0x00000002c92910> [#848, rails/arel#438]
+    * #848 reproduces when database version is 11gR2 or older, it does not reproduce with 12c
+
+## 1.7.0.beta4 / 2016-07-27
+
+* Changes and bug fixes
+
+ * Call `bind_returning_param` when sql has returning_id and using JRuby [#937]
+ * Remove unused `col_type` to avoid warnings [#934]
+ * Remove TODO comment since Oracle DATE type can be mapped Rails Datetime with attribute API [#935]
+ * Remove rspec from runtime dependency [#933]
+ * Rename `add_dependency` to `add_runtime_dependency` [#933]
+ * Remove warnings for + when tested with JRuby 9.1.2 [#936]
+
+* Known issues
+
+ - Only with JRuby
+ * Rails 5 : create table with primary key trigger with default primary key not returning id [#912]
+    * #937 addresses two failures reported in #912
+ * Rails 5 : explain should explain query with binds got Java::JavaSql::SQLException: Invalid column index [#908]
+ - CRuby and JRuby
+ * Rails 5 : create table with primary key trigger not returning id [#907]
+ * Rails 5 : custom methods for create, update and destroy not working [#906]
+ * Rails 5 : undefined method `to_i' for #<Arel::Nodes::BindParam:0x00000002c92910> [#848, rails/arel#438]
+
+## 1.7.0.beta3 / 2016-07-22
+
+* Changes and bug fixes
+ * Not giving `bind_param` a 3rd argument `column` [#929, #909]
+
+* Known issues
+
+ - Only with JRuby
+ * Rails 5 : create table with primary key trigger with default primary key not returning id [#912]
+ * Rails 5 : explain should explain query with binds got Java::JavaSql::SQLException: Invalid column index [#908]
+ - CRuby and JRuby
+ * Rails 5 : create table with primary key trigger not returning id [#907]
+ * Rails 5 : custom methods for create, update and destroy not working [#906]
+ * Rails 5 : undefined method `to_i' for #<Arel::Nodes::BindParam:0x00000002c92910> [#848, rails/arel#438]
+
+## 1.7.0.beta2 / 2016-07-22
+
+* Changes and bug fixes
+
+ * Support CLOB for JRuby [#926, #910, #911]
+ * Arel 7.1.0 or higher version is required [#919]
+ * Document usage of ActiveRecord Attributes API in 1.7 [#924]
+ * Add a note about usage pecularities of context_index's index_column option to README [#924]
+ * Set required_ruby_version = '>= 2.2.2' [#916]
+ * Remove ActiveRecord::ConnectionAdapters::TableDefinition#aliased_types [#921]
+ * Update warning message for composite primary keys [#923]
+ * Remove specs deprecated in Oracle enhanced adapter 1.7 [#917]
+ * Rails 5 : has_and_belongs_to_many test gets ORA-01400 since primary key column "ID"
+    not included in insert statement [#856, rails/rails#25388, rails/rails#25578 ]
+   - This fix will be included in the next version of Rails which should be named 5.0.1
+
+* Known issues
+
+ - Only with JRuby
+ * Rails 5 : create table with primary key trigger with default primary key not returning id [#912]
+ * Rails 5 : SQL with bind parameters when NLS_NUMERIC_CHARACTERS is set to ', '
+    show Java::JavaSql::SQLSyntaxErrorException: / ORA-01722: invalid number [#909]
+ * Rails 5 : explain should explain query with binds got Java::JavaSql::SQLException: Invalid column index [#908]
+ - CRuby and JRuby
+ * Rails 5 : create table with primary key trigger not returning id [#907]
+ * Rails 5 : custom methods for create, update and destroy not working [#906]
+ * Rails 5 : undefined method `to_i' for #<Arel::Nodes::BindParam:0x00000002c92910> [#848, rails/arel#438]
+
+## 1.7.0.beta1 / 2016-07-18
+
+* Major enhancements
+
+ * Support Rails 5.0
+ * Use Arel::Visitors::Oracle12 to use better top-N query support [#671]
+ * Oracle TIMESTAMP sql type is associated with Rails `DateTime` type [#845]
+ * Rails :time as Oracle TIMESTAMP to support subsecond precision [#817, #816]
+ * Rails :datetime as Oracle TIMESTAMP to support subsecond precision [#739]
+ * Remove ActiveRecord::OracleEnhanced::Type::Timestamp [#815]
+ * Deprecate `quote_date_with_to_date` and `quote_timestamp_with_to_timestamp` [#879]
+ * Deprecate `set_boolean_columns` and `set_string_columns` [#874]
+ * Deprecate `set_integer_columns [#872]
+ * Deprecate `set_date_columns` and `set_datetime_columns` [#869]
+ * Deprecate `ignore_table_columns` to use Rails native `ignored_columns` [#855]
+ * Set :datetime for an attribute explicitly [#875, #876]
+ * Support `#views` #738
+ * Replace `table_exists?` with `data_source_exists?` [#842]
+ * Introduce `data_source_exists?` to return tables and views [#841]
+ * Implement primary_keys to prepare dumping composite primary key [#860]
+ * Support for any type primary key [#836]
+ * Dump composite primary keys [#863]
+ * Dump type and options for non default primary keys [#861]
+ * Support creating foreign keys in create table [#862]
+ * Support ActiveRecord native comment feature [#822, #821, #819]
+
+* Changes and bug fixes
+
+ * Fix cast_type issue [#795]
+ * Rename quote_value to quote_default_expression [#661]
+ * Change bind parameters order to come offset first then limit next [#831]
+ * type_cast arity change [#781]
+ * Initial support for sql_type_metadata [#656]
+ * Support bind_params for JDBC connections [#806]
+ * Use all_* dictionary replacing user_* ones [#713]
+ * Register `NUMBER(1)` sql_type to `Type::Boolean` [#844]
+ * Add `ActiveRecord::ValueTooLong` exception class [#827]
+ * Not passing `native_database_types` to `TableDefinition` [#747]
+ * Ignore index name in `index_exists?` when not passed a name to check for [#840]
+ * Add reversible syntax for change_column_default [#839]
+ * Support Oracle national character set NCHAR, NVARCHAR2 [#886]
+ * Support "limited" :returning_id [#894, #803]
+ * Support RAW sql data type in Rails 5 [#877]
+ * Remove `serialized_attributes` which is removed in Rails 5 [#694]
+ * Add deprecation warning for `bind_param` [#809]
+ * Remove `self.string_to_raw` from Column which is not called anymore [#813]
+ * Remove type_cast from Column [#811]
+ * Remove deprecated `distinct` method [#771]
+ * Remove alias_method_chain and rename oracle_enhanced_table to table [#864]
+ * Warn if `AR.primary_key` is called for a table with composite primary key [#837]
+ * Remove select method from Oracle enhanced adapter [#784]
+ * Remove version check to see if ::Rails::Railtie exists [#769]
+ * Remove FALSE_VALUES [#716]
+ * Remove TRUE_VALUES from OracleEnhancedColumn [#646]
+ * Remove insert_sql method [#866, #890]
+ * Rails5 remove require bind visitor [#853]
+ * substitute_at has been removed from Rails [#849]
+ * Serialize value for lob columns [#878]
+ * Do not cache prepared statements that are unlikely to have cache hits [#748]
+ * Handle BLOB type correctly [#804]
+ * Move ActiveRecord::Type to ActiveModel [#723]
+ * Remove cast_type to support Rails 5 Attribute API [#867]
+ * Handle ActiveModel::Type::Binary::Data type cast in _type_cast [#826]
+ * Use Abstract adapter `dump_schema_information` implementation [#857]
+ * Use ActiveRecord initialize_schema_migrations_table [#843]
+ * Use ActiveRecord::SchemaDumper#ignored? [#838]
+ * Use Abstract adapter join_to_update [#801, #800]
+ * Use ActiveRecord::OracleEnhanced::Type::Text [#887]
+ * Use ActiveRecord::OracleEnhanced::Type::String [#883]
+ * Use OracleEnhanced::ColumnDefinition [#650]
+ * Move to ActiveRecord::ConnectionAdapters::OracleEnhanced::SchemaDumper [#695]
+ * ColumnDumper uses Module#prepend [#696]
+ * Migrate from OracleEnhancedSchemaStatementExt to OracleEnhanced::SchemaStatementsExt [#768]
+ * Extract ActiveRecord::ConnectionAdapters::OracleEnhanced::Quoting [#764]
+ * Use keyword arguments for new table options [#820]
+ * Move `ruby_to_java_value` logic to `_type_cast` [#904]
+ * OracleEnhancedColumn.new needs sql_type_metadata including sql_type [#858]
+ * OracleEnhanced::JDBCQuoting and OCIQuoting [#897]
+ * Address `add_column_options!': undefined method `quote_value' [#647]
+ * Remove dirty tracking methods [#883]
+ * Use arel master branch for rails5 development [#645]
+ * Bump ruby-oci8 version to 2.2.0 or higher [#775] 
+ * Remove jeweler dependency [#766]
+ * Remove required_rubygems_version [#719]
+ * Remove journey which is already part of Rails [#701]
+ * Remove dependencies with non activerecord gems [#700]
+ * Remove activerecord-deprecated_finders [#698]
+ * Use rack master branch [#697]
+ * Clean up gemspec file and bump rspec, ruby-plsql and ruby-oci8 versions [#717]
+ * Remove magic comment for utf-8 [#772, #726]
+ * add_dependency with ruby-oci8 only if it runs cruby, not jruby [#902]
+ * Install ruby-debug for jruby [#899]
+ * Address dirty object tracking should not mark empty text as changed [#888]
+ * Revert "Update matcher to skip sql statements to get `table` metadata" [#881]
+ * No need to set @visitor instance variable here [#854]
+ * log binds should not be type_casted [#818]
+ * Fix schema dumper errors [#810]
+ * Address undefined method `cast_type' [#805]
+ * Better fix to support "Relation#count does not support finder options anymore in Rails [#788, #787]
+ * ActiveRecord::Calculations#count no longer accepts an options hash argument #754
+ * Supress WARNINGs using `raise_error` without specific errors [#724]
+ * Use RSpec 3 [#707]
+ * Update "OracleEnhancedAdapter boolean type detection based on string column types and names" [#873]
+ * Update "OracleEnhancedAdapter integer type detection based on column names" [#871]
+ * Update "OracleEnhancedAdapter date type detection based on column names" [#868]
+ * Do not set emulate_dates_by_column_name or emulate_dates in specs [#870]
+ * Update rake spec message to show default branch name as master [#648]
+ * Remove `ActiveRecord::Base.default_timezone = :local` from spec_helper [#901]
+ * Update to rspec3 syntax to avoid deprecation notices [#776]
+ * Remove RAILS_GEM_VERSION [#702]
  * Run Oracle enhanced adapter unit tests using Travis CI [#789]
  * Upgrade travis-oracle to Version 2.0.1 [#903]
- * NoMethodError: undefined method `write' for nil:NilClass for serialized column [#798, #1004]
- * Support connection strings in `DATABASE_URL` [#1036]
- * Rebuild primary key index to default_tablespaces[:index] [#1037]
- * Use docker oracle xe 11g for release16 branch [#1238]
- * Fix deprecated warnings in Ruby 2.4.0+ [#1237]
+
+* Known issues
+
+ - Only with JRuby
+ * Rails 5 : create table with primary key trigger with default primary key not returning id [#912]
+ * Rails 5 : dirty object tracking not working correctly for CLOB [#911]
+ * Rails 5 : handling of CLOB columns get failures [#910]
+ * Rails 5 : SQL with bind parameters when NLS_NUMERIC_CHARACTERS is set to ', ' 
+    show Java::JavaSql::SQLSyntaxErrorException: / ORA-01722: invalid number [#909]
+ * Rails 5 : explain should explain query with binds got Java::JavaSql::SQLException: Invalid column index [#908]
+ - CRuby and JRuby
+ * Rails 5 : create table with primary key trigger not returning id [#907]
+ * Rails 5 : custom methods for create, update and destroy not working [#906]
+ * Rails 5 : has_and_belongs_to_many test gets ORA-01400 since primary key column "ID" 
+    not included in insert statement [#856, rails/rails#25388]
+ * Rails 5 : undefined method `to_i' for #<Arel::Nodes::BindParam:0x00000002c92910> [#848, rails/arel#438]
 
 ## 1.6.7 / 2016-03-08
 

data/README.md

@@ -1,5 +1,3 @@
-[![Build Status](https://travis-ci.org/rsim/oracle-enhanced.svg?branch=master)](https://travis-ci.org/rsim/oracle-enhanced)
-
 activerecord-oracle_enhanced-adapter
 ====================================
 
@@ -8,10 +6,20 @@ 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 4.0 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.0 and it is working with Oracle database versions from 10g to 12c.
 
 INSTALLATION
 ------------
+### 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.
+When using Ruby on Rails version 5.0 then in Gemfile include
+
+```ruby
+# Use oracle as the database for Active Record
+gem 'activerecord-oracle_enhanced-adapter', '~> 1.7.0'
+```
+
 ### Rails 4.2
 
 Oracle enhanced adapter version 1.6 just supports Rails 4.2 and does not support Rails 4.1 or lower version of Rails.
@@ -191,12 +199,6 @@ environment variable, note that the adapter name uses a dash instead of an under
 DATABASE_URL=oracle-enhanced://localhost/XE
 ```
 
-You can also specify a connection string via the `DATABASE_URL`, as long as it doesn't have any whitespace:
-
-```bash
-DATABASE_URL=oracle-enhanced://user:secret@connection-string/(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=tcp)(HOST=localhost)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=xe)))
-```
-
 If you deploy JRuby on Rails application in Java application server that supports JNDI connections then you can specify JNDI connection as well:
 
 ```yml
@@ -255,14 +257,17 @@ class Employee < ActiveRecord::Base
   # specify sequence name
   self.sequence_name = "hr.hr_employee_s"
 
-  # set which DATE columns should be converted to Ruby Date
-  set_date_columns :hired_on, :birth_date_on
+  # set which DATE columns should be converted to Ruby Date using ActiveRecord Attribute API
+  # Starting from Oracle enhanced adapter 1.7 Oracle `DATE` columns are mapped to Ruby `Date` by default.
+  attribute :hired_on, :date
+  attribute :birth_date_on, :date
 
-  # set which DATE columns should be converted to Ruby Time
-  set_datetime_columns :last_login_time
+  # set which DATE columns should be converted to Ruby Time using ActiveRecord Attribute API
+  attribute :last_login_time, :datetime
 
-  # set which VARCHAR2 columns should be converted to true and false
-  set_boolean_columns :manager, :active
+  # set which VARCHAR2 columns should be converted to true and false using ActiveRecord Attribute API
+  attribute :manager, :boolean
+  attribute :active, :boolean
 
   # set which columns should be ignored in ActiveRecord
   ignore_table_columns :attribute1, :attribute2
@@ -275,6 +280,35 @@ You can also access remote tables over database link using
 self.table_name "hr_employees@db_link"
 ```
 
+Examples for Rails 4.x
+
+```ruby
+class Employee < ActiveRecord::Base
+  # specify schema and table name
+  self.table_name = "hr.hr_employees"
+
+  # specify primary key name
+  self.primary_key = "employee_id"
+
+  # specify sequence name
+  self.sequence_name = "hr.hr_employee_s"
+
+  # If you're using Rails 4.2 or earlier you can do this
+
+  # set which DATE columns should be converted to Ruby Date
+  set_date_columns :hired_on, :birth_date_on
+
+  # set which DATE columns should be converted to Ruby Time
+  set_datetime_columns :last_login_time
+
+  # set which VARCHAR2 columns should be converted to true and false
+  set_boolean_columns :manager, :active
+
+  # set which columns should be ignored in ActiveRecord
+  ignore_table_columns :attribute1, :attribute2
+end
+```
+
 Examples for Rails 3.2 and lower version of Rails
 
 ```ruby
@@ -426,6 +460,14 @@ Post.contains(:all_text, "aaa within title")
 Post.contains(:all_text, "bbb within comment_author")
 ```
 
+Please note that `index_column` must be a real column in your database and it's value will be overriden every time your `index_column_trigger_on` columns are changed. So, _do not use columns with real data as `index_column`_.
+
+Index column can be created as:
+
+```ruby
+add_column :posts, :all_text, :string, limit: 2, comment: 'Service column for context search index'
+```
+
 ### Oracle virtual columns support
 
 Since version R11G1 Oracle database allows adding computed [Virtual Columns](http://www.oracle-base.com/articles/11g/virtual-columns-11gr1.php) to the table.

data/RUNNING_TESTS.md

@@ -42,7 +42,7 @@ Running tests
         bundle install
         
 * Configure database credentials in one of two ways:
-    * copy spec/spec_config.yaml.template to spec/spec_config.yaml and modify as needed
+    * copy spec/spec_config.yaml.template to spec/config.yaml and modify as needed
     * set required environment variables (see DATABASE_NAME in spec_helper.rb)
 
 * Run tests with

data/Rakefile

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'bundler'
+require 'bundler/gem_tasks'
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
@@ -10,22 +11,6 @@ end
 
 require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  gem.name = "activerecord-oracle_enhanced-adapter"
-  gem.summary = "Oracle enhanced adapter for ActiveRecord"
-  gem.description = <<-EOS
-Oracle "enhanced" ActiveRecord adapter contains useful additional methods for working with new and legacy Oracle databases.
-This adapter is superset of original ActiveRecord Oracle adapter.
-EOS
-  gem.email = "raimonds.simanovskis@gmail.com"
-  gem.homepage = "http://github.com/rsim/oracle-enhanced"
-  gem.authors = ["Raimonds Simanovskis"]
-  gem.extra_rdoc_files = ['README.md']
-  gem.license = 'MIT'
-end
-Jeweler::RubygemsDotOrgTasks.new
-
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 

data/VERSION

@@ -1 +1 @@
-1.6.9
+1.7.0

data/activerecord-oracle_enhanced-adapter.gemspec

@@ -1,16 +1,12 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
 Gem::Specification.new do |s|
   s.name = %q{activerecord-oracle_enhanced-adapter}
-  s.version = "1.6.9"
+  s.version = "1.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_ruby_version     = '>= 2.2.2'
   s.license = 'MIT'
   s.authors = [%q{Raimonds Simanovskis}]
-  s.date = %q{2017-03-29}
+  s.date = %q{2016-08-04}
   s.description = %q{Oracle "enhanced" ActiveRecord adapter contains useful additional methods for working with new and legacy Oracle databases.
 This adapter is superset of original ActiveRecord Oracle adapter.
 }
@@ -36,11 +32,13 @@ This adapter is superset of original ActiveRecord Oracle adapter.
     "lib/active_record/connection_adapters/oracle_enhanced/context_index.rb",
     "lib/active_record/connection_adapters/oracle_enhanced/cpk.rb",
     "lib/active_record/connection_adapters/oracle_enhanced/database_statements.rb",
-    "lib/active_record/connection_adapters/oracle_enhanced/dirty.rb",
     "lib/active_record/connection_adapters/oracle_enhanced/database_tasks.rb",
     "lib/active_record/connection_adapters/oracle_enhanced/jdbc_connection.rb",
+    "lib/active_record/connection_adapters/oracle_enhanced/jdbc_quoting.rb",
     "lib/active_record/connection_adapters/oracle_enhanced/oci_connection.rb",
+    "lib/active_record/connection_adapters/oracle_enhanced/oci_quoting.rb",
     "lib/active_record/connection_adapters/oracle_enhanced/procedures.rb",
+    "lib/active_record/connection_adapters/oracle_enhanced/quoting.rb",
     "lib/active_record/connection_adapters/oracle_enhanced/schema_creation.rb",
     "lib/active_record/connection_adapters/oracle_enhanced/schema_definitions.rb",
     "lib/active_record/connection_adapters/oracle_enhanced/schema_dumper.rb",
@@ -49,8 +47,10 @@ This adapter is superset of original ActiveRecord Oracle adapter.
     "lib/active_record/connection_adapters/oracle_enhanced/structure_dump.rb",
     "lib/active_record/connection_adapters/oracle_enhanced/version.rb",
     "lib/active_record/oracle_enhanced/type/integer.rb",
-    "lib/active_record/oracle_enhanced/type/timestamp.rb",
+    "lib/active_record/oracle_enhanced/type/national_character_string.rb",
     "lib/active_record/oracle_enhanced/type/raw.rb",
+    "lib/active_record/oracle_enhanced/type/string.rb",
+    "lib/active_record/oracle_enhanced/type/text.rb",
     "lib/activerecord-oracle_enhanced-adapter.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_connection_spec.rb",
@@ -69,7 +69,6 @@ This adapter is superset of original ActiveRecord Oracle adapter.
   ]
   s.homepage = %q{http://github.com/rsim/oracle-enhanced}
   s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.6}
   s.summary = %q{Oracle enhanced adapter for ActiveRecord}
   s.test_files = [
     "spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb",
@@ -87,46 +86,10 @@ This adapter is superset of original ActiveRecord Oracle adapter.
     "spec/active_record/connection_adapters/oracle_enhanced_structure_dump_spec.rb",
     "spec/spec_helper.rb"
   ]
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<jeweler>, ["~> 2.0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.4"])
-      s.add_development_dependency(%q<activerecord>, ["~> 4.2.1"])
-      s.add_development_dependency(%q<activemodel>, [">= 0"])
-      s.add_development_dependency(%q<activesupport>, [">= 0"])
-      s.add_development_dependency(%q<actionpack>, [">= 0"])
-      s.add_development_dependency(%q<railties>, [">= 0"])
-      s.add_development_dependency(%q<arel>, [">= 0"])
-      s.add_development_dependency(%q<journey>, [">= 0"])
-      s.add_development_dependency(%q<ruby-plsql>, [">= 0.4.4"])
-      s.add_development_dependency(%q<ruby-oci8>, [">= 2.0.4"])
-    else
-      s.add_dependency(%q<jeweler>, ["~> 2.0"])
-      s.add_dependency(%q<rspec>, ["~> 2.4"])
-      s.add_dependency(%q<activerecord>, ["~> 4.2.1"])
-      s.add_dependency(%q<activemodel>, [">= 0"])
-      s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<actionpack>, [">= 0"])
-      s.add_dependency(%q<railties>, [">= 0"])
-      s.add_dependency(%q<arel>, [">= 0"])
-      s.add_dependency(%q<journey>, [">= 0"])
-      s.add_dependency(%q<ruby-plsql>, [">= 0.4.4"])
-      s.add_dependency(%q<ruby-oci8>, [">= 2.0.4"])
-    end
-  else
-    s.add_dependency(%q<jeweler>, ["~> 2.0"])
-    s.add_dependency(%q<rspec>, ["~> 2.4"])
-    s.add_dependency(%q<activerecord>, ["~> 4.2.1"])
-    s.add_dependency(%q<activemodel>, [">= 0"])
-    s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<actionpack>, [">= 0"])
-    s.add_dependency(%q<railties>, [">= 0"])
-    s.add_dependency(%q<arel>, [">= 0"])
-    s.add_dependency(%q<journey>, [">= 0"])
-    s.add_dependency(%q<ruby-plsql>, [">= 0.4.4"])
-    s.add_dependency(%q<ruby-oci8>, [">= 2.0.4"])
-  end
+  s.add_runtime_dependency(%q<activerecord>, ["~> 5.0.0"])
+  s.add_runtime_dependency(%q<arel>, ["~> 7.1.0"])
+  s.add_runtime_dependency(%q<ruby-plsql>, [">= 0.5.0"])
+  s.add_runtime_dependency(%q<ruby-oci8>, [">= 2.2.0"]) if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby'
+  s.license = 'MIT'
 end
+

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

@@ -4,11 +4,8 @@ module ActiveRecord
 
       attr_reader :table_name, :nchar, :virtual_column_data_default, :returning_id #:nodoc:
 
-      FALSE_VALUES << 'N'
-      TRUE_VALUES << 'Y'
+      def initialize(name, default, sql_type_metadata = nil, null = true, table_name = nil, virtual = false, returning_id = nil, comment = nil) #:nodoc:
 
-      def initialize(name, default, cast_type, sql_type = nil, null = true, table_name = nil, virtual=false, returning_id=false) #:nodoc:
-        @table_name = table_name
         @virtual = virtual
         @virtual_column_data_default = default.inspect if virtual
         @returning_id = returning_id
@@ -17,22 +14,15 @@ module ActiveRecord
         else
           default_value = self.class.extract_value_from_default(default)
         end
-        super(name, default_value, cast_type, sql_type, null)
+        super(name, default_value, sql_type_metadata, null, table_name, comment: comment)
         # 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 
-          @nchar = true if cast_type.class == ActiveRecord::Type::String && sql_type[0,1] == 'N'
-          @object_type = sql_type.include? '.'
+        if sql_type_metadata
+          @object_type = sql_type_metadata.sql_type.include? '.'
         end
         # TODO: Need to investigate when `sql_type` becomes nil
       end
 
-      def type_cast(value) #:nodoc:
-        return OracleEnhancedColumn::string_to_raw(value) if type == :raw
-        return guess_date_or_time(value) if type == :datetime && OracleEnhancedAdapter.emulate_dates
-        super
-      end
-
       def virtual?
         @virtual
       end
@@ -73,16 +63,12 @@ module ActiveRecord
         super
       end
 
-      # convert RAW column values back to byte strings.
-      def self.string_to_raw(string) #:nodoc:
-        string
-      end
-
       # Get column comment from schema definition.
       # Will work only if using default ActiveRecord connection.
-      def comment
-        ActiveRecord::Base.connection.column_comment(@table_name, name)
-      end
+#      def comment
+#        #TODO: may be deprecated due to conflict with variable
+#        ActiveRecord::Base.connection.column_comment(@table_name, name)
+#      end
       
       private