activerecord-oracle_enhanced-adapter 1.4.0 → 1.4.1

data/Gemfile

@@ -21,20 +21,31 @@ group :development do
       gem 'railties', "=#{ENV['RAILS_GEM_VERSION']}"
     end
   else
-    # uses local copy of Rails 3 and Arel gems
-    ENV['RAILS_GEM_PATH'] ||= File.expand_path('../../rails', __FILE__)
     %w(activerecord activemodel activesupport actionpack railties).each do |gem_name|
-      gem gem_name, :path => File.join(ENV['RAILS_GEM_PATH'], gem_name)
+      if ENV['RAILS_GEM_PATH']
+        gem gem_name, :path => File.join(ENV['RAILS_GEM_PATH'], gem_name)
+      else
+        gem gem_name, :git => "git://github.com/rails/rails"
+      end
     end
 
-    ENV['AREL_GEM_PATH'] ||= File.expand_path('../../arel', __FILE__)
-    gem 'arel', :path => ENV['AREL_GEM_PATH']
+    if ENV['AREL_GEM_PATH']
+      gem 'arel', :path => ENV['AREL_GEM_PATH']
+    else
+      gem 'arel', :git => "git://github.com/rails/arel"
+    end
+
+    if ENV['JOURNEY_GEM_PATH']
+      gem 'journey', :path => ENV['JOURNEY_GEM_PATH']
+    else
+      gem "journey", :git => "git://github.com/rails/journey"
+    end
   end
 
   gem 'ruby-plsql', '>=0.4.4'
 
   platforms :ruby do
-    gem 'ruby-oci8', '~> 2.0.4'
+    gem 'ruby-oci8', '>=2.0.4'
   end
 
 end

data/{History.txt → History.md}

@@ -1,4 +1,21 @@
-== 1.4.0 2011-08-09
+### 1.4.1 / 2011-01-27
+
+* Enhancements:
+  * Support for Rails 3.2
+  * Support for ActiveRecord 3.2 explain plans [#116]
+  * Support for ActiveRecord 3.1 statement pool, to avoid `ORA-01000` maximum open cursors exceeded (default `statement_limit` is 250 and can be changed in `database.yml`) [#100]
+  * Added error handling for `rename_table` method in migrations [#137]
+* Bug fixes:
+  * Store primary key as `nil` in cache at first time for table without primary key [#84]
+  * Fixed inserting records with decimal type columns (`ORA-01722` invalid number exceptions) [#130]
+  * Check virtual columns only in models that are using `oracle-enhanced` adapter, to avoid problems when using multiple database adapters [#85]
+  * Don't drop the user in rake `db:create` and `db:drop` tasks [#103]
+  * Don't add `db:create` and `db:drop` when ActiveRecord is not used as the primary datastore [#128]
+  * Quote column names in LOB statements to avoid `ORA-00936` errors [#91]
+  * Don't add the `RETURNING` clause if using `composite_primary_keys` gem [#132]
+  * Added `join_to_update` method that is necessary for ActiveRecord 3.1 to ensure that correct UPDATE statement is generated using `WHERE ... IN` subquery with offset condition
+
+### 1.4.0 / 2011-08-09
 
 * Enhancements:
   * Support for Rails 3.1
@@ -17,7 +34,7 @@
   * Fixed schema dump not to conflict with other database adapters that are used in the same application
   * Allow $ in table name prefix or suffix
 
-== 1.3.2 2011-01-05
+### 1.3.2 / 2011-01-05
 
 * Enhancements:
   * If no :host or :port is provided then connect with :database name (do not default :host to localhost)
@@ -31,7 +48,7 @@
   * Quote NCHAR and NVARCHAR2 type values with N'...'
   * Numeric username and/or password in database.yml will be automatically converted to string
 
-== 1.3.1 2010-09-09
+### 1.3.1 / 2010-09-09
 
 * Enhancements:
   * Tested with Rails 3.0.0 release
@@ -48,7 +65,7 @@
   * removed String.mb_chars upcase and downcase methods for Ruby 1.9 as Rails 3.0.0 already includes Unicode aware upcase and downcase methods for Ruby 1.9
   * Fixes for latest ActiveRecord unit tests
 
-== 1.3.0 2010-06-21
+### 1.3.0 / 2010-06-21
 
 * Enhancements:
   * Rails 3.0.0.beta4 and Rails 2.3.x compatible
@@ -68,7 +85,7 @@
   * Fixes for schema dump and structure dump (use correct statement separator)
   * Only use Oracle specific schema dump for Oracle connections
 
-== 1.2.4 2010-02-23
+### 1.2.4 / 2010-02-23
 
 * Enhancements:
   * rake db:test:purge will drop all schema objects from test schema (including views, synonyms, packages, functions, procedures) -
@@ -85,7 +102,7 @@
     (to avoid issues with _before_type_cast values for id attributes because _before_type_cast is used in form helpers)
   * clear table columns cache after columns definition change in migrations
 
-== 1.2.3 2009-12-09
+### 1.2.3 / 2009-12-09
 
 * Enhancements
   * support fractional seconds in TIMESTAMP values
@@ -105,7 +122,7 @@
   * fixed custom create/update/delete methods with ActiveRecord 2.3+ and timestamps
   * do not call oracle_enhanced specific schema dump methods when using other database adapters
 
-== 1.2.2 2009-09-28
+### 1.2.2 / 2009-09-28
 
 * Enhancements
   * improved RDoc documentation of public methods
@@ -139,7 +156,7 @@
   * ignore :limit option for :text and :binary columns in migrations
   * patches for ActiveRecord schema dumper to remove table prefixes and suffixes from schema.rb
 
-== 1.2.1 2009-06-07
+### 1.2.1 / 2009-06-07
 
 * Enhancements
   * caching of table indexes query which makes schema dump much faster
@@ -150,7 +167,7 @@
   * Made test tasks respect RAILS_ENV
   * fixed support for composite primary keys for tables with LOBs
 
-== 1.2.0 2009-03-22
+### 1.2.0 / 2009-03-22
 
 * Enhancements
   * support for JRuby and JDBC
@@ -161,7 +178,7 @@
 * Bug fixes:
   * several bug fixes that were identified during running of ActiveRecord unit tests
 
-== 1.1.9 2009-01-02
+### 1.1.9 / 2009-01-02
 
 * Enhancements
   * Added support for table and column comments in migrations
@@ -171,7 +188,7 @@
   * Do not mark empty decimals, strings and texts (stored as NULL in database) as changed when reassigning them (starting from Rails 2.1)
   * Create booleans as VARCHAR2(1) columns if emulate_booleans_from_strings is true
 
-== 1.1.8 2008-10-10
+### 1.1.8 / 2008-10-10
 
 * Bug fixes:
   * Fixed storing of serialized LOB columns
@@ -185,12 +202,12 @@
   * Fixed bug when ActiveRecord::Base.allow_concurrency = true
     (see http://dev.rubyonrails.org/ticket/11134)
 
-== 1.1.7 2008-08-20
+### 1.1.7 / 2008-08-20
 
 * Bug fixes:
   * Fixed that adapter works without ruby-plsql gem (in this case just custom create/update/delete methods are not available)
 
-== 1.1.6 2008-08-19
+### 1.1.6 / 2008-08-19
 
 * Enhancements:
   * Added support for set_date_columns and set_datetime_columns
@@ -200,7 +217,7 @@
 * Bug fixes:
   * Do not call write_lobs callback when custom create or update methods are defined
     
-== 1.1.5 2008-07-27
+### 1.1.5 / 2008-07-27
 
 * Bug fixes:
   * Fixed that write_lobs callback works with partial_updates enabled (added additional record lock before writing BLOB data to database)
@@ -208,26 +225,26 @@
   * Changed SQL SELECT in indexes method so that it will execute faster on some large data dictionaries
   * Support for other date and time formats when assigning string to :date or :datetime column
 
-== 1.1.4 2008-07-14
+### 1.1.4 / 2008-07-14
 
 * Enhancements:
   * Date/Time quoting changes to support composite_primary_keys
   * Added additional methods that are used by composite_primary_keys
 
-== 1.1.3 2008-07-10
+### 1.1.3 / 2008-07-10
 
 * Enhancements:
   * Added support for custom create, update and delete methods when working with legacy databases where
     PL/SQL API should be used for create, update and delete operations
 
-== 1.1.2 2008-07-08
+### 1.1.2 / 2008-07-08
 
 * Bug fixes:
   * Fixed after_save callback addition for session store in ActiveRecord version 2.0.2
   * Changed date column name recognition - now should match regex /(^|_)date(_|$)/i
     (previously "updated_at" was recognized as :date column and not as :datetime)
 
-== 1.1.1 2008-06-28
+### 1.1.1 / 2008-06-28
 
 * Enhancements:
   * Added ignore_table_columns option
@@ -237,7 +254,7 @@
   * Checks if CGI::Session::ActiveRecordStore::Session does not have enhanced_write_lobs callback before adding it
     (Rails 2.0 does not add this callback, Rails 2.1 does)
 
-== 1.1.0 2008-05-05
+### 1.1.0 / 2008-05-05
 
 * Forked from original activerecord-oracle-adapter-1.0.0.9216
 * Renamed oracle adapter to oracle_enhanced adapter

data/VERSION

@@ -1 +1 @@
-1.4.0
+1.4.1

data/activerecord-oracle_enhanced-adapter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{activerecord-oracle_enhanced-adapter}
-  s.version = "1.4.0"
+  s.version = "1.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Raimonds Simanovskis"]
-  s.date = %q{2011-08-09}
+  s.authors = [%q{Raimonds Simanovskis}]
+  s.date = %q{2012-01-27}
   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.
 }
@@ -20,7 +20,7 @@ This adapter is superset of original ActiveRecord Oracle adapter.
   s.files = [
     ".rspec",
     "Gemfile",
-    "History.txt",
+    "History.md",
     "License.txt",
     "README.md",
     "RUNNING_TESTS.md",
@@ -65,8 +65,8 @@ This adapter is superset of original ActiveRecord Oracle adapter.
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/rsim/oracle-enhanced}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  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",
@@ -97,8 +97,9 @@ This adapter is superset of original ActiveRecord Oracle adapter.
       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"])
+      s.add_development_dependency(%q<ruby-oci8>, [">= 2.0.4"])
     else
       s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
       s.add_dependency(%q<rspec>, ["~> 2.4"])
@@ -108,8 +109,9 @@ This adapter is superset of original ActiveRecord Oracle adapter.
       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"])
+      s.add_dependency(%q<ruby-oci8>, [">= 2.0.4"])
     end
   else
     s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
@@ -120,8 +122,9 @@ This adapter is superset of original ActiveRecord Oracle adapter.
     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"])
+    s.add_dependency(%q<ruby-oci8>, [">= 2.0.4"])
   end
 end
 

data/lib/active_record/connection_adapters/oracle_enhanced.rake

@@ -16,37 +16,46 @@ def redefine_task(*args, &block)
 end
 
 # Creates database user with db:create
-def create_database_with_oracle_enhanced(config)
-  if config['adapter'] == 'oracle_enhanced'
-    print "Please provide the SYSTEM password for your oracle installation\n>"
-    system_password = $stdin.gets.strip
-    ActiveRecord::Base.establish_connection(config.merge('username' => 'SYSTEM', 'password' => system_password))
-    ActiveRecord::Base.connection.execute "DROP USER #{config['username']} CASCADE" rescue nil
-    ActiveRecord::Base.connection.execute "CREATE USER #{config['username']} IDENTIFIED BY #{config['password']}"
-    ActiveRecord::Base.connection.execute "GRANT unlimited tablespace TO #{config['username']}"
-    ActiveRecord::Base.connection.execute "GRANT create session TO #{config['username']}"
-    ActiveRecord::Base.connection.execute "GRANT create table TO #{config['username']}"
-    ActiveRecord::Base.connection.execute "GRANT create sequence TO #{config['username']}"
-  else
-    create_database_without_oracle_enhanced(config)
+if defined?(create_database) == 'method'
+  def create_database_with_oracle_enhanced(config)
+    if config['adapter'] == 'oracle_enhanced'
+      print "Please provide the SYSTEM password for your oracle installation\n>"
+      system_password = $stdin.gets.strip
+      ActiveRecord::Base.establish_connection(config.merge('username' => 'SYSTEM', 'password' => system_password))
+      begin
+        ActiveRecord::Base.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
+          ActiveRecord::Base.connection.execute "ALTER USER #{config['username']} IDENTIFIED BY #{config['password']}"
+        else
+          raise e
+        end
+      end
+      ActiveRecord::Base.connection.execute "GRANT unlimited tablespace TO #{config['username']}"
+      ActiveRecord::Base.connection.execute "GRANT create session TO #{config['username']}"
+      ActiveRecord::Base.connection.execute "GRANT create table TO #{config['username']}"
+      ActiveRecord::Base.connection.execute "GRANT create sequence TO #{config['username']}"
+    else
+      create_database_without_oracle_enhanced(config)
+    end
   end
+  alias :create_database_without_oracle_enhanced :create_database
+  alias :create_database :create_database_with_oracle_enhanced
 end
-alias :create_database_without_oracle_enhanced :create_database
-alias :create_database :create_database_with_oracle_enhanced
 
 # Drops database user with db:drop
-def drop_database_with_oracle_enhanced(config)
-  if config['adapter'] == 'oracle_enhanced'
-    print "Please provide the SYSTEM password for your oracle installation\n>"
-    system_password = $stdin.gets.strip
-    ActiveRecord::Base.establish_connection(config.merge('username' => 'SYSTEM', 'password' => system_password))
-    ActiveRecord::Base.connection.execute "DROP USER #{config['username']} CASCADE"
-  else
-    drop_database_without_oracle_enhanced(config)
+if defined?(drop_database) == 'method'
+  def drop_database_with_oracle_enhanced(config)
+    if config['adapter'] == 'oracle_enhanced'
+      ActiveRecord::Base.establish_connection(config)
+      ActiveRecord::Base.connection.execute_structure_dump(ActiveRecord::Base.connection.full_drop)
+    else
+      drop_database_without_oracle_enhanced(config)
+    end
   end
+  alias :drop_database_without_oracle_enhanced :drop_database
+  alias :drop_database :drop_database_with_oracle_enhanced
 end
-alias :drop_database_without_oracle_enhanced :drop_database
-alias :drop_database :drop_database_with_oracle_enhanced
 
 namespace :db do
 

data/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -7,7 +7,7 @@
 #
 #########################################################################
 #
-# See History.txt for changes added to original oracle_adapter.rb
+# See History.md for changes added to original oracle_adapter.rb
 #
 #########################################################################
 #
@@ -235,11 +235,43 @@ module ActiveRecord
       cattr_accessor :string_to_time_format
       self.string_to_time_format = nil
 
-      def initialize(connection, logger = nil) #:nodoc:
-        super
+      class StatementPool
+        include Enumerable
+
+        def initialize(connection, max = 300)
+          @connection = connection
+          @max        = max
+          @cache      = {}
+        end
+
+        def each(&block); @cache.each(&block); end
+        def key?(key);    @cache.key?(key); end
+        def [](key);      @cache[key]; end
+        def length;       @cache.length; end
+        def delete(key);  @cache.delete(key); end
+
+        def []=(sql, key)
+          while @max <= @cache.size
+            @cache.shift.last.close
+          end
+          @cache[sql] = key
+        end
+
+        def clear
+          @cache.values.each do |cursor|
+            cursor.close
+          end
+          @cache.clear
+        end
+      end
+
+      def initialize(connection, logger, config) #:nodoc:
+        super(connection, logger)
         @quoted_column_names, @quoted_table_names = {}, {}
-        @statements = {}
+        @config = config
+        @statements = StatementPool.new(connection, config.fetch(:statement_limit) { 250 })
         @enable_dbms_output = false
+        @visitor = Arel::Visitors::Oracle.new self if defined?(Arel::Visitors::Oracle)
       end
 
       def self.visitor_for(pool) # :nodoc:
@@ -337,6 +369,11 @@ module ActiveRecord
         IDENTIFIER_MAX_LENGTH
       end
 
+      # the maximum length of a sequence name
+      def sequence_name_length
+        IDENTIFIER_MAX_LENGTH
+      end
+
       # To avoid ORA-01795: maximum number of expressions in a list is 1000
       # tell ActiveRecord to limit us to 1000 ids at a time
       def in_clause_length
@@ -563,9 +600,6 @@ module ActiveRecord
       end
 
       def clear_cache!
-        @statements.each_value do |cursor|
-          cursor.close
-        end
         @statements.clear
       end
 
@@ -591,15 +625,21 @@ module ActiveRecord
           end
 
           cursor.exec
-          columns = cursor.get_col_names.map do |col_name|
-            @connection.oracle_downcase(col_name)
-          end
-          rows = []
-          fetch_options = {:get_lob_value => (name != 'Writable Large Object')}
-          while row = cursor.fetch(fetch_options)
-            rows << row
+
+          if name == 'EXPLAIN'
+            res = true
+          else
+            columns = cursor.get_col_names.map do |col_name|
+              @connection.oracle_downcase(col_name)
+            end
+            rows = []
+            fetch_options = {:get_lob_value => (name != 'Writable Large Object')}
+            while row = cursor.fetch(fetch_options)
+              rows << row
+            end
+            res = ActiveRecord::Result.new(columns, rows)
           end
-          res = ActiveRecord::Result.new(columns, rows)
+
           cursor.close unless cached
           res
         end
@@ -609,6 +649,17 @@ module ActiveRecord
         true
       end
 
+      def supports_explain?
+        true
+      end
+
+      def explain(arel, binds = [])
+        sql = "EXPLAIN PLAN FOR #{to_sql(arel)}"
+        return if sql =~ /FROM all_/
+        exec_query(sql, 'EXPLAIN', binds)
+        select_values("SELECT * FROM TABLE(DBMS_XPLAN.DISPLAY)", 'EXPLAIN').join("\n")
+      end
+
       # Returns an array of arrays containing the field values.
       # Order is the same as that returned by #columns.
       def select_rows(sql, name = nil)
@@ -639,7 +690,7 @@ 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.nil?
+        unless id_value || pk.nil? || (defined?(CompositePrimaryKeys) && pk.kind_of?(CompositePrimaryKeys::CompositeKeys))
           sql = "#{sql} RETURNING #{quote_column_name(pk)} INTO :returning_id"
           (binds = binds.dup) << [:returning_id, nil]
         end
@@ -682,18 +733,26 @@ module ActiveRecord
       # New method in ActiveRecord 3.1
       def exec_update(sql, name, binds)
         log(sql, name, binds) do
-          cursor = if @statements.key?(sql)
-            @statements[sql]
+          cached = false
+          if binds.empty?
+            cursor = @connection.prepare(sql)
           else
-            @statements[sql] = @connection.prepare(sql)
-          end
+            cursor = if @statements.key?(sql)
+              @statements[sql]
+            else
+              @statements[sql] = @connection.prepare(sql)
+            end
 
-          binds.each_with_index do |bind, i|
-            col, val = bind
-            cursor.bind_param(i + 1, type_cast(val, col), col && col.type)
+            binds.each_with_index do |bind, i|
+              col, val = bind
+              cursor.bind_param(i + 1, type_cast(val, col), col && col.type)
+            end
+            cached = true
           end
 
-          cursor.exec_update
+          res = cursor.exec_update
+          cursor.close unless cached
+          res
         end
       end
 
@@ -1078,7 +1137,11 @@ module ActiveRecord
       def pk_and_sequence_for(table_name, owner=nil, desc_table_name=nil, db_link=nil) #:nodoc:
         if @@cache_columns
           @@pk_and_sequence_for_cache ||= {}
-          @@pk_and_sequence_for_cache[table_name] ||= pk_and_sequence_for_without_cache(table_name, owner, desc_table_name, db_link)
+          if @@pk_and_sequence_for_cache.key?(table_name)
+            @@pk_and_sequence_for_cache[table_name]
+          else
+            @@pk_and_sequence_for_cache[table_name] = pk_and_sequence_for_without_cache(table_name, owner, desc_table_name, db_link)
+          end
         else
           pk_and_sequence_for_without_cache(table_name, owner, desc_table_name, db_link)
         end
@@ -1160,6 +1223,23 @@ module ActiveRecord
         sql << " ORDER BY #{order}"
       end
 
+      # construct additional wrapper subquery if select.offset is used to avoid generation of invalid subquery
+      # ... IN ( SELECT * FROM ( SELECT raw_sql_.*, rownum raw_rnum_ FROM ( ... ) raw_sql_ ) WHERE raw_rnum_ > ... )
+      def join_to_update(update, select) #:nodoc:
+        if select.offset
+          subsubselect = select.clone
+          subsubselect.projections = [update.key]
+
+          subselect = Arel::SelectManager.new(select.engine)
+          subselect.project Arel.sql(quote_column_name update.key.name)
+          subselect.from subsubselect.as('alias_join_to_update')
+
+          update.where update.key.in(subselect)
+        else
+          super
+        end
+      end
+
       protected
 
       def translate_exception(exception, message) #:nodoc: