activerecord-oracle_enhanced-adapter 1.1.7 → 1.1.8

data/History.txt

@@ -1,3 +1,17 @@
+== 1.1.8 2008-10-10
+
+* Bug fixes:
+  * Fixed storing of serialized LOB columns
+  * Prevent from SQL injection in :limit and :offset
+  * Order by LOB columns (by replacing column with function which returns first 100 characters of LOB)
+  * Sequence creation for tables with non-default primary key in create_table block
+  * Do count distinct workaround only when composite_primary_keys gem is used
+    (otherwise count distinct did not work with ActiveRecord 2.1.1)
+  * Fixed rake db:test:clone_structure task
+    (see http://rsim.lighthouseapp.com/projects/11468/tickets/11-rake-dbtestclone_structure-fails-in-117)
+  * Fixed bug when ActiveRecord::Base.allow_concurrency = true
+    (see http://dev.rubyonrails.org/ticket/11134)
+
 == 1.1.7 2008-08-20
 
 * Bug fixes:

data/lib/active_record/connection_adapters/oracle_enhanced.rake

@@ -27,16 +27,16 @@ namespace :db do
     redefine_task :clone_structure => [ "db:structure:dump", "db:test:purge" ] do
       abcs = ActiveRecord::Base.configurations
       ActiveRecord::Base.establish_connection(:test)
-      IO.readlines("db/#{RAILS_ENV}_structure.sql").join.split(";\n\n").each do |ddl|
-        ActiveRecord::Base.connection.execute(ddl)
+      IO.readlines("db/#{RAILS_ENV}_structure.sql").join.split("\n\n").each do |ddl|
+        ActiveRecord::Base.connection.execute(ddl.chop)
       end
     end
 
     redefine_task :purge => :environment do
       abcs = ActiveRecord::Base.configurations
       ActiveRecord::Base.establish_connection(:test)
-      ActiveRecord::Base.connection.structure_drop.split(";\n\n").each do |ddl|
-        ActiveRecord::Base.connection.execute(ddl)
+      ActiveRecord::Base.connection.structure_drop.split("\n\n").each do |ddl|
+        ActiveRecord::Base.connection.execute(ddl.chop)
       end
     end
 

data/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -81,8 +81,32 @@ begin
           connection.write_lobs(self.class.table_name, self.class, attributes)
         end
       end
-
       private :enhanced_write_lobs
+      
+      class << self
+        # RSI: patch ORDER BY to work with LOBs
+        def add_order_with_lobs!(sql, order, scope = :auto)
+          if connection.is_a?(ConnectionAdapters::OracleEnhancedAdapter)
+            order = connection.lob_order_by_expression(self, order) if order
+            
+            orig_scope = scope
+            scope = scope(:find) if :auto == scope
+            if scope
+              new_scope_order = connection.lob_order_by_expression(self, scope[:order])
+              if new_scope_order != scope[:order]
+                scope = scope.merge(:order => new_scope_order)
+              else
+                scope = orig_scope
+              end
+            end
+          end
+          add_order_without_lobs!(sql, order, scope = :auto)
+        end
+        private :add_order_with_lobs!
+        alias_method :add_order_without_lobs!, :add_order!
+        alias_method :add_order!, :add_order_with_lobs!
+      end
+      
     end
 
 
@@ -425,9 +449,11 @@ begin
         end
 
         def add_limit_offset!(sql, options) #:nodoc:
-          offset = options[:offset] || 0
+          # RSI: added to_i for limit and offset to protect from SQL injection
+          offset = (options[:offset] || 0).to_i
 
           if limit = options[:limit]
+            limit = limit.to_i
             sql.replace "select * from (select raw_sql_.*, rownum raw_rnum_ from (#{sql}) raw_sql_ where rownum <= #{offset+limit}) where raw_rnum_ > #{offset}"
           elsif offset > 0
             sql.replace "select * from (select raw_sql_.*, rownum raw_rnum_ from (#{sql}) raw_sql_) where raw_rnum_ > #{offset}"
@@ -460,8 +486,9 @@ begin
           id = quote(attributes[klass.primary_key])
           klass.columns.select { |col| col.sql_type =~ /LOB$/i }.each do |col|
             value = attributes[col.name]
-            value = value.to_yaml if col.text? && klass.serialized_attributes[col.name]
+            # RSI: changed sequence of next two lines - should check if value is nil before converting to yaml
             next if value.nil?  || (value == '')
+            value = value.to_yaml if col.text? && klass.serialized_attributes[col.name]
             uncached do
               lob = select_one("SELECT #{col.name} FROM #{table_name} WHERE #{klass.primary_key} = #{id} FOR UPDATE",
                                'Writable Large Object')[col.name]
@@ -470,6 +497,22 @@ begin
           end
         end
 
+        # RSI: change LOB column for ORDER BY clause
+        # just first 100 characters are taken for ordering
+        def lob_order_by_expression(klass, order)
+          return order if order.nil?
+          changed = false
+          new_order = order.to_s.strip.split(/, */).map do |order_by_col|
+            column_name, asc_desc = order_by_col.split(/ +/)
+            if column = klass.columns.detect { |col| col.name == column_name && col.sql_type =~ /LOB$/i}
+              changed = true
+              "DBMS_LOB.SUBSTR(#{column_name},100,1) #{asc_desc}"
+            else
+              order_by_col
+            end
+          end.join(', ')
+          changed ? new_order : order
+        end
 
         # SCHEMA STATEMENTS ========================================
         #
@@ -590,10 +633,25 @@ begin
           end
         end
 
-        def create_table(name, options = {}) #:nodoc:
-          super(name, options)
+        def create_table(name, options = {}, &block) #:nodoc:
+          create_sequence = options[:id] != false
+          if create_sequence
+            super(name, options, &block)
+          else
+            super(name, options) do |t|
+              class <<t
+                attr_accessor :create_sequence
+                def primary_key(*args)
+                  self.create_sequence = true
+                  super(*args)
+                end
+              end
+              result = block.call(t)
+              create_sequence = t.create_sequence
+            end
+          end
           seq_name = options[:sequence_name] || "#{name}_seq"
-          execute "CREATE SEQUENCE #{seq_name} START WITH 10000" unless options[:id] == false
+          execute "CREATE SEQUENCE #{seq_name} START WITH 10000" if create_sequence
         end
 
         def rename_table(name, new_name) #:nodoc:
@@ -836,7 +894,7 @@ begin
     def describe(name)
       @desc ||= @@env.alloc(OCIDescribe)
       @desc.attrSet(OCI_ATTR_DESC_PUBLIC, -1) if VERSION >= '0.1.14'
-      @desc.describeAny(@svc, name.to_s, OCI_PTYPE_UNK) rescue raise %Q{"DESC #{name}" failed; does it exist?}
+      do_ocicall(@ctx) { @desc.describeAny(@svc, name.to_s, OCI_PTYPE_UNK) } rescue raise %Q{"DESC #{name}" failed; does it exist?}
       info = @desc.attrGet(OCI_ATTR_PARAM)
 
       case info.attrGet(OCI_ATTR_PTYPE)

data/lib/active_record/connection_adapters/oracle_enhanced_cpk.rb

@@ -3,8 +3,9 @@ module ActiveRecord #:nodoc:
     module OracleEnhancedCpk #:nodoc:
 
       # This mightn't be in Core, but count(distinct x,y) doesn't work for me
+      # RSI: return that not supported if composite_primary_keys gem is required
       def supports_count_distinct? #:nodoc:
-        false
+        @supports_count_distinct ||= ! defined?(CompositePrimaryKeys)
       end
       
       def concat(*columns)

data/lib/active_record/connection_adapters/oracle_enhanced_version.rb

@@ -3,7 +3,7 @@ module ActiveRecord #:nodoc:
     module OracleEnhancedVersion #:nodoc:
       MAJOR = 1
       MINOR = 1
-      TINY  = 7
+      TINY  = 8
 
       STRING = [MAJOR, MINOR, TINY].join('.')
     end

data/spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb

@@ -976,3 +976,124 @@ describe "OracleEnhancedAdapter assign string to :date and :datetime columns" do
   end
   
 end
+
+describe "OracleEnhancedAdapter handling of CLOB columns" do
+  before(:all) do
+    ActiveRecord::Base.establish_connection(:adapter => "oracle_enhanced",
+                                            :database => "xe",
+                                            :username => "hr",
+                                            :password => "hr")
+    @conn = ActiveRecord::Base.connection
+    @conn.execute <<-SQL
+      CREATE TABLE test_employees (
+        employee_id   NUMBER(6,0),
+        first_name    VARCHAR2(20),
+        last_name     VARCHAR2(25),
+        comments      CLOB
+      )
+    SQL
+    @conn.execute <<-SQL
+      CREATE SEQUENCE test_employees_seq  MINVALUE 1
+        INCREMENT BY 1 CACHE 20 NOORDER NOCYCLE
+    SQL
+    class TestEmployee < ActiveRecord::Base
+      set_primary_key :employee_id
+    end
+  end
+  
+  after(:all) do
+    Object.send(:remove_const, "TestEmployee")
+    @conn.execute "DROP TABLE test_employees"
+    @conn.execute "DROP SEQUENCE test_employees_seq"
+  end
+
+  before(:each) do
+  end
+  
+  it "should create record without CLOB data when attribute is serialized" do
+    TestEmployee.serialize :comments
+    @employee = TestEmployee.create!(
+      :first_name => "First",
+      :last_name => "Last"
+    )
+    @employee.should be_valid
+  end
+
+  it "should order by CLOB column" do
+    @employee = TestEmployee.create!(
+      :first_name => "First",
+      :last_name => "Last",
+      :comments => "comments"
+    )
+    TestEmployee.find(:all, :order => "comments ASC").should_not be_empty
+    TestEmployee.find(:all, :order => " comments ASC ").should_not be_empty
+    TestEmployee.find(:all, :order => "comments").should_not be_empty
+    TestEmployee.find(:all, :order => " comments ").should_not be_empty
+    TestEmployee.find(:all, :order => :comments).should_not be_empty
+    TestEmployee.find(:all, :order => "  first_name DESC,  last_name   ASC   ").should_not be_empty
+  end
+  
+end
+
+describe "OracleEnhancedAdapter table and sequence creation with non-default primary key" do
+  before(:all) do
+    ActiveRecord::Base.establish_connection(:adapter => "oracle_enhanced",
+                                            :database => "xe",
+                                            :username => "hr",
+                                            :password => "hr")
+    ActiveRecord::Schema.define do
+      create_table :keyboards, :force => true, :id  => false do |t|
+        t.primary_key :key_number
+        t.string      :name
+      end
+      create_table :id_keyboards, :force => true do |t|
+        t.string      :name
+      end
+    end
+    class Keyboard < ActiveRecord::Base
+      set_primary_key :key_number
+    end
+    class IdKeyboard < ActiveRecord::Base
+    end
+  end
+  
+  after(:all) do
+    ActiveRecord::Schema.define do
+      drop_table :keyboards
+      drop_table :id_keyboards
+    end
+    Object.send(:remove_const, "Keyboard")
+    Object.send(:remove_const, "IdKeyboard")
+  end
+  
+  it "should create sequence for non-default primary key" do
+    ActiveRecord::Base.connection.next_sequence_value(Keyboard.sequence_name).should_not be_nil
+  end
+
+  it "should create sequence for default primary key" do
+    ActiveRecord::Base.connection.next_sequence_value(IdKeyboard.sequence_name).should_not be_nil
+  end
+end
+
+describe "OracleEnhancedAdapter without composite_primary_keys" do
+
+  before(:all) do
+    ActiveRecord::Base.establish_connection(:adapter => "oracle_enhanced",
+                                            :database => "xe",
+                                            :username => "hr",
+                                            :password => "hr")
+    Object.send(:remove_const, 'CompositePrimaryKeys') if defined?(CompositePrimaryKeys)
+    class Employee < ActiveRecord::Base
+      set_primary_key :employee_id
+    end
+  end
+
+  it "should tell ActiveRecord that count distinct is supported" do
+    ActiveRecord::Base.connection.supports_count_distinct?.should be_true
+  end
+
+  it "should execute correct SQL COUNT DISTINCT statement" do
+    lambda { Employee.count(:employee_id, :distinct => true) }.should_not raise_error
+  end
+
+end

data/spec/active_record/connection_adapters/oracle_enhanced_cpk_spec.rb

@@ -3,6 +3,30 @@ require "composite_primary_keys"
 
 describe "OracleEnhancedAdapter composite_primary_keys support" do
 
-  # Currently testing was done based on composite_primary_keys tests
+  before(:all) do
+    ActiveRecord::Base.establish_connection(:adapter => "oracle_enhanced",
+                                            :database => "xe",
+                                            :username => "hr",
+                                            :password => "hr")
+    class JobHistory < ActiveRecord::Base
+      set_table_name "job_history"
+      set_primary_keys :employee_id, :start_date
+    end
+  end
+
+  after(:all) do
+    Object.send(:remove_const, 'CompositePrimaryKeys') if defined?(CompositePrimaryKeys)
+    Object.send(:remove_const, 'JobHistory') if defined?(JobHistory)
+  end
+
+  it "should tell ActiveRecord that count distinct is not supported" do
+    ActiveRecord::Base.connection.supports_count_distinct?.should be_false
+  end
+  
+  it "should execute correct SQL COUNT DISTINCT statement on table with composite primary keys" do
+    lambda { JobHistory.count(:distinct => true) }.should_not raise_error
+  end
+
+  # Other testing was done based on composite_primary_keys tests
 
 end

data/spec/spec_helper.rb

@@ -6,9 +6,9 @@ $:.unshift(File.dirname(__FILE__) + '/../lib')
 # gem 'activerecord', '=2.0.2'
 # gem 'actionpack', '=2.0.2'
 # gem 'activesupport', '=2.0.2'
-gem 'activerecord', '=2.1.0'
-gem 'actionpack', '=2.1.0'
-gem 'activesupport', '=2.1.0'
+gem 'activerecord', '=2.1.1'
+gem 'actionpack', '=2.1.1'
+gem 'activesupport', '=2.1.1'
 require 'activerecord'
 require 'actionpack'
 require 'action_controller/session/active_record_store'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version 
-  version: 1.1.7
+  version: 1.1.8
 platform: ruby
 authors: 
 - Raimonds Simanovskis
@@ -9,10 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-21 00:00:00 +03:00
+date: 2008-10-10 00:00:00 +03:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.7.0
+    version: 
 description: Oracle enhaced adapter for Active Record
 email: 
 - raymonds72@gmail.com