activerecord-oracle_enhanced-adapter 1.4.0 → 1.4.1

data/lib/active_record/connection_adapters/oracle_enhanced_base_ext.rb

@@ -7,10 +7,10 @@ module ActiveRecord
         # conditionals in the rails activerecord test suite
         require 'active_record/connection_adapters/emulation/oracle_adapter'
         ConnectionAdapters::OracleAdapter.new(
-          ConnectionAdapters::OracleEnhancedConnection.create(config), logger)
+          ConnectionAdapters::OracleEnhancedConnection.create(config), logger, config)
       else
         ConnectionAdapters::OracleEnhancedAdapter.new(
-          ConnectionAdapters::OracleEnhancedConnection.create(config), logger)
+          ConnectionAdapters::OracleEnhancedConnection.create(config), logger, config)
       end
     end
 
@@ -78,18 +78,24 @@ module ActiveRecord
     def self.table_comment
       connection.table_comment(self.table_name)
     end
-    
+
+    def self.virtual_columns
+      columns.select do |column|
+        column.respond_to?(:virtual?) && column.virtual?
+      end
+    end
+
     if ActiveRecord::VERSION::MAJOR < 3
       def attributes_with_quotes_with_virtual_columns(include_primary_key = true, include_readonly_attributes = true, attribute_names = @attributes.keys)
-        virtual_columns = self.class.columns.select(& :virtual?).map(&:name)
-        attributes_with_quotes_without_virtual_columns(include_primary_key, include_readonly_attributes, attribute_names - virtual_columns)
+        virtual_column_names = self.class.virtual_columns.map(&:name)
+        attributes_with_quotes_without_virtual_columns(include_primary_key, include_readonly_attributes, attribute_names - virtual_column_names)
       end
 
       alias_method_chain :attributes_with_quotes, :virtual_columns
     else
       def arel_attributes_values_with_virtual_columns(include_primary_key = true, include_readonly_attributes = true, attribute_names = @attributes.keys)
-        virtual_columns = self.class.columns.select(& :virtual?).map(&:name)
-        arel_attributes_values_without_virtual_columns(include_primary_key, include_readonly_attributes, attribute_names - virtual_columns)
+        virtual_column_names = self.class.virtual_columns.map(&:name)
+        arel_attributes_values_without_virtual_columns(include_primary_key, include_readonly_attributes, attribute_names - virtual_column_names)
       end
 
       alias_method_chain :arel_attributes_values, :virtual_columns

data/lib/active_record/connection_adapters/oracle_enhanced_connection.rb

@@ -93,8 +93,8 @@ module ActiveRecord
 
       # Returns an array of the values of the first column in a select:
       #   select_values("SELECT id FROM companies LIMIT 3") => [1,2,3]
-      def select_values(sql)
-        result = select(sql)
+      def select_values(sql, name = nil)
+        result = select(sql, name = nil)
         result.map { |r| r.values.first }
       end
 

data/lib/active_record/connection_adapters/oracle_enhanced_core_ext.rb

@@ -1,5 +1,6 @@
 require "bigdecimal"
-if (BigDecimal.instance_methods & ["to_d", :to_d]).empty?
+
+unless BigDecimal.method_defined?(:to_d)
   BigDecimal.class_eval do
     def to_d #:nodoc:
       self
@@ -7,7 +8,7 @@ if (BigDecimal.instance_methods & ["to_d", :to_d]).empty?
   end
 end
 
-if (Bignum.instance_methods & ["to_d", :to_d]).empty?
+unless Bignum.method_defined?(:to_d)
   Bignum.class_eval do
     def to_d #:nodoc:
       BigDecimal.new(self.to_s)
@@ -15,7 +16,7 @@ if (Bignum.instance_methods & ["to_d", :to_d]).empty?
   end
 end
 
-if (Fixnum.instance_methods & ["to_d", :to_d]).empty?
+unless Fixnum.method_defined?(:to_d)
   Fixnum.class_eval do
     def to_d #:nodoc:
       BigDecimal.new(self.to_s)

data/lib/active_record/connection_adapters/oracle_enhanced_jdbc_connection.rb

@@ -314,6 +314,8 @@ module ActiveRecord
               @raw_statement.setBlob(position, java_value)
             when :raw
               @raw_statement.setString(position, OracleEnhancedAdapter.encode_raw(java_value))
+            when :decimal
+              @raw_statement.setBigDecimal(position, java_value)
             else
               @raw_statement.setString(position, java_value)
             end
@@ -341,7 +343,6 @@ module ActiveRecord
 
         def exec
           @raw_result_set = @raw_statement.executeQuery
-          get_metadata
           true
         end
 
@@ -349,22 +350,24 @@ module ActiveRecord
           @raw_statement.executeUpdate
         end
 
-        def get_metadata
-          metadata = @raw_result_set.getMetaData
-          column_count = metadata.getColumnCount
-          @column_names = (1..column_count).map{|i| metadata.getColumnName(i)}
-          @column_types = (1..column_count).map{|i| metadata.getColumnTypeName(i).to_sym}
+        def metadata
+          @metadata ||= @raw_result_set.getMetaData
         end
 
-        def get_col_names
-          @column_names
+        def column_types
+          @column_types ||= (1..metadata.getColumnCount).map{|i| metadata.getColumnTypeName(i).to_sym}
         end
 
+        def column_names
+          @column_names ||= (1..metadata.getColumnCount).map{|i| metadata.getColumnName(i)}
+        end
+        alias :get_col_names :column_names
+
         def fetch(options={})
           if @raw_result_set.next
             get_lob_value = options[:get_lob_value]
             row_values = []
-            @column_types.each_with_index do |column_type, i|
+            column_types.each_with_index do |column_type, i|
               row_values <<
                 @connection.get_ruby_value_from_result_set(@raw_result_set, i+1, column_type, get_lob_value)
             end
@@ -407,6 +410,8 @@ module ActiveRecord
               blob = Java::OracleSql::BLOB.createTemporary(@connection.raw_connection, false, Java::OracleSql::BLOB::DURATION_SESSION)
               blob.setBytes(1, value.to_java_bytes)
               blob
+            when :decimal
+              java.math.BigDecimal.new(value.to_s)
             else
               value
             end

data/lib/active_record/connection_adapters/oracle_enhanced_oci_connection.rb

@@ -127,6 +127,8 @@ module ActiveRecord
               @raw_cursor.bind_param(position, ora_value)
             when :raw
               @raw_cursor.bind_param(position, OracleEnhancedAdapter.encode_raw(value))
+            when :decimal
+              @raw_cursor.bind_param(position, BigDecimal.new(value.to_s))
             else
               @raw_cursor.bind_param(position, value)
             end

data/lib/active_record/connection_adapters/oracle_enhanced_schema_statements.rb

@@ -98,8 +98,14 @@ module ActiveRecord
       end
 
       def rename_table(name, new_name) #:nodoc:
+        if new_name.to_s.length > table_name_length
+          raise ArgumentError, "New table name '#{new_name}' is too long; the limit is #{table_name_length} characters"
+        end
+        if "#{new_name}_seq".to_s.length > sequence_name_length
+          raise ArgumentError, "New sequence name '#{new_name}_seq' is too long; the limit is #{sequence_name_length} characters"
+        end
         execute "RENAME #{quote_table_name(name)} TO #{quote_table_name(new_name)}"
-        execute "RENAME #{quote_table_name("#{name}_seq")} TO #{quote_table_name("#{new_name}_seq")}" rescue nil
+        execute "RENAME #{quote_table_name("#{name}_seq")} TO #{quote_table_name("#{new_name}_seq")}"
       end
 
       def drop_table(name, options = {}) #:nodoc:
@@ -308,7 +314,7 @@ module ActiveRecord
         tablespace_sql = ''
         if tablespace = (tablespace_option || default_tablespace_for(obj_type))
           tablespace_sql << if [:blob, :clob].include?(obj_type.to_sym)
-           " LOB (#{column_name}) STORE AS #{column_name.to_s[0..10]}_#{table_name.to_s[0..14]}_ls (TABLESPACE #{tablespace})"
+           " LOB (#{quote_column_name(column_name)}) STORE AS #{column_name.to_s[0..10]}_#{table_name.to_s[0..14]}_ls (TABLESPACE #{tablespace})"
           else
            " TABLESPACE #{tablespace}"
           end

data/spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb

@@ -196,6 +196,13 @@ describe "OracleEnhancedAdapter" do
           hire_date     DATE
         )
       SQL
+      @conn.execute <<-SQL
+        CREATE TABLE test_employees_without_pk (
+          first_name    VARCHAR2(20),
+          last_name     VARCHAR2(25),
+          hire_date     DATE
+        )
+      SQL
       @column_names = ['id', 'first_name', 'last_name', 'full_name', 'hire_date']
       @column_sql_types = ["NUMBER", "VARCHAR2(20)", "VARCHAR2(25)", "VARCHAR2(46)", "DATE"]
       class ::TestEmployee < ActiveRecord::Base
@@ -211,6 +218,7 @@ describe "OracleEnhancedAdapter" do
       Object.send(:remove_const, "TestEmployee")
       Object.send(:remove_const, "TestEmployee2")
       @conn.execute "DROP TABLE test_employees"
+      @conn.execute "DROP TABLE test_employees_without_pk"
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.cache_columns = nil
       ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
     end
@@ -300,6 +308,13 @@ describe "OracleEnhancedAdapter" do
         @logger.logged(:debug).last.should be_blank
       end
 
+      it "should store primary key as nil in cache at first time for table without primary key" do
+        TestEmployee.connection.pk_and_sequence_for('test_employees_without_pk').should == nil
+        @logger.clear(:debug)
+        TestEmployee.connection.pk_and_sequence_for('test_employees_without_pk').should == nil
+        @logger.logged(:debug).last.should be_blank
+      end
+
     end
 
   end
@@ -653,4 +668,82 @@ describe "OracleEnhancedAdapter" do
 
   end if ENV['RAILS_GEM_VERSION'] >= '3.1'
 
+  describe "with statement pool" do
+    before(:all) do
+      ActiveRecord::Base.establish_connection(CONNECTION_PARAMS.merge(:statement_limit => 3))
+      @conn = ActiveRecord::Base.connection
+      schema_define do
+        drop_table :test_posts rescue nil
+        create_table :test_posts
+      end
+      class ::TestPost < ActiveRecord::Base
+      end
+      @statements = @conn.instance_variable_get(:@statements)
+    end
+
+    before(:each) do
+      @conn.clear_cache!
+    end
+
+    after(:all) do
+      schema_define do
+        drop_table :test_posts
+      end
+      Object.send(:remove_const, "TestPost")
+      ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
+    end
+
+    it "should clear older cursors when statement limit is reached" do
+      pk = TestPost.columns.find { |c| c.primary }
+      sub = @conn.substitute_at(pk, 0)
+      binds = [[pk, 1]]
+
+      lambda {
+        4.times do |i|
+          @conn.exec_query("SELECT * FROM test_posts WHERE #{i}=#{i} AND id = #{sub}", "SQL", binds)
+        end
+      }.should change(@statements, :length).by(+3)
+    end
+
+    it "should cache UPDATE statements with bind variables" do
+      lambda {
+        pk = TestPost.columns.find { |c| c.primary }
+        sub = @conn.substitute_at(pk, 0)
+        binds = [[pk, 1]]
+        @conn.exec_update("UPDATE test_posts SET id = #{sub}", "SQL", binds)
+      }.should change(@statements, :length).by(+1)
+    end
+
+    it "should not cache UPDATE statements without bind variables" do
+      lambda {
+        binds = []
+        @conn.exec_update("UPDATE test_posts SET id = 1", "SQL", binds)
+      }.should_not change(@statements, :length)
+    end
+  end if ENV['RAILS_GEM_VERSION'] >= '3.1'
+
+  describe "explain" do
+    before(:all) do
+      schema_define do
+        drop_table :test_posts rescue nil
+        create_table :test_posts
+      end
+      class ::TestPost < ActiveRecord::Base
+      end
+    end
+
+    after(:all) do
+      schema_define do
+        drop_table :test_posts
+      end
+      Object.send(:remove_const, "TestPost")
+      ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
+    end
+
+    it "should explain query" do
+      explain = TestPost.where(:id => 1).explain
+      explain.should include("Cost")
+      explain.should include("INDEX UNIQUE SCAN")
+    end
+  end if ENV['RAILS_GEM_VERSION'] >= '3.2'
 end

data/spec/active_record/connection_adapters/oracle_enhanced_connection_spec.rb

@@ -188,7 +188,30 @@ describe "OracleEnhancedConnection" do
       cursor.fetch.should be_nil
       cursor.close
     end
+  end
 
+  describe "SQL with bind parameters when NLS_NUMERIC_CHARACTERS is set to ', '" do
+    before(:all) do
+      ENV['NLS_NUMERIC_CHARACTERS'] = ", "
+      @conn = ActiveRecord::ConnectionAdapters::OracleEnhancedConnection.create(CONNECTION_PARAMS)
+      @conn.exec "CREATE TABLE test_employees (age NUMBER(10,2))"
+    end
+
+    after(:all) do
+      ENV['NLS_NUMERIC_CHARACTERS'] = nil
+      @conn.exec "DROP TABLE test_employees" rescue nil
+    end
+
+    it "should execute prepared statement with decimal bind parameter " do
+      cursor = @conn.prepare("INSERT INTO test_employees VALUES(:1)")
+      cursor.bind_param(1, "1.5", :decimal)
+      cursor.exec
+      cursor.close
+      cursor = @conn.prepare("SELECT age FROM test_employees")
+      cursor.exec
+      cursor.fetch.should == [1.5]
+      cursor.close
+    end
   end
 
   describe "auto reconnection" do

data/spec/active_record/connection_adapters/oracle_enhanced_core_ext_spec.rb

@@ -17,23 +17,3 @@ describe "OracleEnhancedAdapter to_d method" do
     n.to_d.should == BigDecimal.new(n.to_s)
   end
 end
-
-if ENV['RAILS_GEM_VERSION'] >= '2.3'
-
-  describe "OracleEnhancedAdapter Unicode aware upcase and downcase" do
-    before(:all) do
-      @down = "āčēģīķļņšūž"
-      @up = "ĀČĒĢĪĶĻŅŠŪŽ"
-    end
-
-    it "should translate Unicode string to upcase" do
-      @down.mb_chars.upcase.to_s.should == @up
-    end
-
-    it "should translate Unicode string to downcase" do
-      @up.mb_chars.downcase.to_s.should == @down
-    end
-  
-  end
-
-end

data/spec/active_record/connection_adapters/oracle_enhanced_dirty_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-if ActiveRecord::Base.instance_methods.include?('changed?')
+if ActiveRecord::Base.method_defined?(:changed?)
 
   describe "OracleEnhancedAdapter dirty object tracking" do
 

data/spec/active_record/connection_adapters/oracle_enhanced_schema_dump_spec.rb

@@ -347,11 +347,12 @@ describe "OracleEnhancedAdapter schema dump" do
 
   describe 'virtual columns' do
     before(:all) do
+      oracle11g = @oracle11g
       schema_define do
         create_table :test_names, :force => true do |t|
           t.string :first_name
           t.string :last_name
-          t.virtual :full_name, :default=>"first_name || ', ' || last_name" if @oracle11g
+          t.virtual :full_name, :default=>"first_name || ', ' || last_name" if oracle11g
         end
       end
     end

data/spec/active_record/connection_adapters/oracle_enhanced_schema_statements_spec.rb

@@ -346,6 +346,46 @@ describe "OracleEnhancedAdapter schema definition" do
 
   end
 
+  describe "rename tables and sequences" do
+    before(:each) do
+      @conn = ActiveRecord::Base.connection
+        schema_define do
+          drop_table :test_employees rescue nil
+          drop_table :new_test_employees rescue nil
+          create_table  :test_employees do |t|
+            t.string    :first_name
+            t.string    :last_name
+          end
+      end
+    end
+
+    after(:each) do
+      schema_define do
+        drop_table :test_employees rescue nil
+        drop_table :new_test_employees rescue nil
+      end
+    end
+
+    it "should rename table name with new one" do
+      lambda do
+        @conn.rename_table("test_employees","new_test_employees")
+      end.should_not raise_error
+    end
+
+    it "should raise error when new table name length is too long" do
+      lambda do
+        @conn.rename_table("test_employees","a"*31)
+      end.should raise_error
+    end
+
+    it "should raise error when new sequence name length is too long" do
+      lambda do
+        @conn.rename_table("test_employees","a"*27)
+      end.should raise_error
+    end
+
+  end
+
   describe "create triggers" do
 
     before(:all) do
@@ -864,10 +904,14 @@ end
 
     before(:all) do
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.cache_columns = true
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces.delete(:clob)
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces.delete(:blob)
     end
 
     after(:all) do
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.cache_columns = nil
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces.delete(:clob)
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces.delete(:blob)
     end
 
     before(:each) do
@@ -903,7 +947,6 @@ end
     end
 
     it "should add lob column with non_default tablespace" do
-      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces.delete(:clob)
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[:clob] = DATABASE_NON_DEFAULT_TABLESPACE
       schema_define do
         add_column :test_posts, :body, :text
@@ -912,7 +955,6 @@ end
     end
 
     it "should add blob column with non_default tablespace" do
-      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces.delete(:blob)
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[:blob] = DATABASE_NON_DEFAULT_TABLESPACE
       schema_define do
         add_column :test_posts, :attachment, :binary
@@ -941,12 +983,13 @@ end
 
   describe 'virtual columns' do
     before(:all) do
+      oracle11g = @oracle11g
       schema_define do
-        @expr = "( numerator/NULLIF(denominator,0) )*100"
+        expr = "( numerator/NULLIF(denominator,0) )*100"
         create_table :test_fractions, :force => true do |t|
           t.integer :numerator, :default=>0
           t.integer :denominator, :default=>0
-          t.virtual :percent, :default=>@expr if @oracle11g
+          t.virtual :percent, :default=>expr if oracle11g
         end
       end
     end