activerecord-oracle_enhanced-adapter 1.4.1 → 1.4.2.rc1

data/lib/active_record/connection_adapters/oracle_enhanced_jdbc_connection.rb

@@ -23,7 +23,8 @@ begin
     end
   end
 
-  java.sql.DriverManager.registerDriver Java::oracle.jdbc.OracleDriver.new
+  ORACLE_DRIVER = Java::oracle.jdbc.OracleDriver.new
+  java.sql.DriverManager.registerDriver ORACLE_DRIVER
 
   # set tns_admin property from TNS_ADMIN environment variable
   if !java.lang.System.get_property("oracle.net.tns_admin") && ENV["TNS_ADMIN"]
@@ -94,15 +95,19 @@ module ActiveRecord
           # to_s needed if username, password or database is specified as number in database.yml file
           username = config[:username] && config[:username].to_s
           password = config[:password] && config[:password].to_s
-          database = config[:database] && config[:database].to_s
+          database = config[:database] && config[:database].to_s || 'XE'
           host, port = config[:host], config[:port]
           privilege = config[:privilege] && config[:privilege].to_s
 
           # connection using TNS alias
           if database && !host && !config[:url] && ENV['TNS_ADMIN']
-            url = "jdbc:oracle:thin:@#{database || 'XE'}"
+            url = "jdbc:oracle:thin:@#{database}"
           else
-            url = config[:url] || "jdbc:oracle:thin:@#{host || 'localhost'}:#{port || 1521}:#{database || 'XE'}"
+            unless database.match(/^(\:|\/)/)
+              # assume database is a SID if no colon or slash are supplied (backward-compatibility)
+              database = ":#{database}"
+            end
+            url = config[:url] || "jdbc:oracle:thin:@#{host || 'localhost'}:#{port || 1521}#{database}"
           end
 
           prefetch_rows = config[:prefetch_rows] || 100
@@ -115,7 +120,14 @@ module ActiveRecord
           properties.put("defaultRowPrefetch", "#{prefetch_rows}") if prefetch_rows
           properties.put("internal_logon", privilege) if privilege
 
-          @raw_connection = java.sql.DriverManager.getConnection(url, properties)
+          begin
+            @raw_connection = java.sql.DriverManager.getConnection(url, properties)
+          rescue
+            # bypass DriverManager to work in cases where ojdbc*.jar
+            # is added to the load path at runtime and not on the
+            # system classpath
+            @raw_connection = ORACLE_DRIVER.connect(url, properties)
+          end
 
           # Set session time zone to current time zone
           @raw_connection.setSessionTimeZone(time_zone)

data/lib/active_record/connection_adapters/oracle_enhanced_oci_connection.rb

@@ -309,7 +309,8 @@ module ActiveRecord
           host ||= 'localhost'
           host = "[#{host}]" if host =~ /^[^\[].*:/  # IPv6
           port ||= 1521
-          "//#{host}:#{port}/#{database}"
+          database = "/#{database}" unless database.match(/^\//)
+          "//#{host}:#{port}#{database}"
         # if no host is specified then assume that
         # database parameter is TNS alias or TNS connection string
         else

data/lib/active_record/connection_adapters/oracle_enhanced_schema_definitions.rb

@@ -19,8 +19,9 @@ module ActiveRecord
        end
 
       def to_sql_with_virtual_columns
-        if type==:virtual
-          "#{base.quote_column_name(name)} AS (#{default})"
+        if type == :virtual
+          sql_type = base.type_to_sql(default[:type], limit, precision, scale) if default[:type]
+          "#{base.quote_column_name(name)} #{sql_type} AS (#{default[:as]})"
         else
           to_sql_without_virtual_columns
         end
@@ -56,22 +57,39 @@ module ActiveRecord
         alias to_s :to_sql
       end
 
-      def raw(name, options={})
-        column(name, :raw, options)
-      end
-
       def self.included(base) #:nodoc:
         base.class_eval do
           alias_method_chain :references, :foreign_keys
           alias_method_chain :to_sql, :foreign_keys
 
-          def virtual(* args)
-            options = args.extract_options!
-            column_names = args
-            column_names.each { |name| column(name, :virtual, options) }
-          end
+          alias_method_chain :column, :virtual_columns
+        end
+      end
 
+      def raw(name, options={})
+        column(name, :raw, options)
+      end
+
+      def virtual(* args)
+        options = args.extract_options!
+        column_names = args
+        column_names.each { |name| column(name, :virtual, options) }
+      end
+
+      def column_with_virtual_columns(name, type, options = {})
+        if type == :virtual
+          default = {:type => options[:type]}
+          if options[:as]
+            default[:as] = options[:as]
+          elsif options[:default]
+            warn "[DEPRECATION] virtual column `:default` option is deprecated.  Please use `:as` instead."
+            default[:as] = options[:default]
+          else
+            raise "No virtual column definition found."
+          end
+          options[:default] = default
         end
+        column_without_virtual_columns(name, type, options)
       end
     
       # Adds a :foreign_key option to TableDefinition.references.

data/lib/active_record/connection_adapters/oracle_enhanced_schema_dumper.rb

@@ -176,18 +176,23 @@ module ActiveRecord #:nodoc:
             spec = {}
             spec[:name]      = column.name.inspect
             spec[:type]      = column.virtual? ? 'virtual' : column.type.to_s
+            spec[:type]      = column.virtual? ? 'virtual' : column.type.to_s
+            spec[:virtual_type] = column.type.inspect if column.virtual?
             spec[:limit]     = column.limit.inspect if column.limit != @types[column.type][:limit] && column.type != :decimal
             spec[:precision] = column.precision.inspect if !column.precision.nil?
             spec[:scale]     = column.scale.inspect if !column.scale.nil?
             spec[:null]      = 'false' if !column.null
-            spec[:default]   = column.virtual_column_data_default if column.virtual?
-            spec[:default] ||= default_string(column.default) if column.has_default?
-            (spec.keys - [:name, :type]).each{ |k| spec[k].insert(0, "#{k.inspect} => ")}
+            spec[:as]        = column.virtual_column_data_default if column.virtual?
+            spec[:default]   = default_string(column.default) if column.has_default? && !column.virtual?
+            (spec.keys - [:name, :type]).each do |k|
+              key_s = (k == :virtual_type ? ":type => " : "#{k.inspect} => ")
+              spec[k] = key_s + spec[k]
+            end
             spec
           end.compact
 
           # find all migration keys used in this table
-          keys = [:name, :limit, :precision, :scale, :default, :null] & column_specs.map(&:keys).flatten
+          keys = [:name, :limit, :precision, :scale, :default, :null, :as, :virtual_type] & column_specs.map(&:keys).flatten
 
           # figure out the lengths for each column based on above keys
           lengths = keys.map{ |key| column_specs.map{ |spec| spec[key] ? spec[key].length + 2 : 0 }.max }

data/lib/active_record/connection_adapters/oracle_enhanced_schema_statements.rb

@@ -210,9 +210,16 @@ module ActiveRecord
       end
 
       def add_column(table_name, column_name, type, options = {}) #:nodoc:
-        add_column_sql = "ALTER TABLE #{quote_table_name(table_name)} ADD #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
+        if type.to_sym == :virtual
+          type = options[:type]
+        end
+        add_column_sql = "ALTER TABLE #{quote_table_name(table_name)} ADD #{quote_column_name(column_name)} "
+        add_column_sql << type_to_sql(type, options[:limit], options[:precision], options[:scale]) if type
+
         add_column_options!(add_column_sql, options.merge(:type=>type, :column_name=>column_name, :table_name=>table_name))
-        add_column_sql << tablespace_for((type_to_sql(type).downcase.to_sym), nil, table_name, column_name)
+
+        add_column_sql << tablespace_for((type_to_sql(type).downcase.to_sym), nil, table_name, column_name) if type
+
         execute(add_column_sql)
       ensure
         clear_table_columns_cache(table_name)
@@ -242,10 +249,16 @@ module ActiveRecord
         if options.has_key?(:null) && options[:null] == column.null
           options[:null] = nil
         end
+        if type.to_sym == :virtual
+          type = options[:type]
+        end
+        change_column_sql = "ALTER TABLE #{quote_table_name(table_name)} MODIFY #{quote_column_name(column_name)} "
+        change_column_sql << "#{type_to_sql(type, options[:limit], options[:precision], options[:scale])}" if type
 
-        change_column_sql = "ALTER TABLE #{quote_table_name(table_name)} MODIFY #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
         add_column_options!(change_column_sql, options.merge(:type=>type, :column_name=>column_name, :table_name=>table_name))
-        change_column_sql << tablespace_for((type_to_sql(type).downcase.to_sym), nil, options[:table_name], options[:column_name])
+
+        change_column_sql << tablespace_for((type_to_sql(type).downcase.to_sym), nil, options[:table_name], options[:column_name]) if type
+
         execute(change_column_sql)
       ensure
         clear_table_columns_cache(table_name)
@@ -257,8 +270,19 @@ module ActiveRecord
         clear_table_columns_cache(table_name)
       end
 
-      def remove_column(table_name, column_name) #:nodoc:
-        execute "ALTER TABLE #{quote_table_name(table_name)} DROP COLUMN #{quote_column_name(column_name)}"
+      def remove_column(table_name, *column_names) #:nodoc:
+        major, minor = ActiveRecord::VERSION::MAJOR, ActiveRecord::VERSION::MINOR
+        is_deprecated = (major == 3 and minor >= 2) or major > 3
+
+        if column_names.flatten! and is_deprecated
+          message = 'Passing array to remove_columns is deprecated, please use ' +
+            'multiple arguments, like: `remove_columns(:posts, :foo, :bar)`'
+          ActiveSupport::Deprecation.warn message, caller
+        end
+
+        column_names.each do |column_name|
+          execute "ALTER TABLE #{quote_table_name(table_name)} DROP COLUMN #{quote_column_name(column_name)}"
+        end
       ensure
         clear_table_columns_cache(table_name)
       end
@@ -341,7 +365,7 @@ module ActiveRecord
 
         create_primary_key_trigger(table_name, options) if options[:primary_key_trigger]
       end
-      
+
       def create_primary_key_trigger(table_name, options)
         seq_name = options[:sequence_name] || default_sequence_name(table_name)
         trigger_name = options[:trigger_name] || default_trigger_name(table_name)

data/lib/active_record/connection_adapters/oracle_enhanced_structure_dump.rb

@@ -117,7 +117,7 @@ module ActiveRecord #:nodoc:
           else
             index_type = options
           end
-          quoted_column_names = column_names.map { |e| quote_column_name(e) }.join(", ")
+          quoted_column_names = column_names.map { |e| quote_column_name_or_expression(e) }.join(", ")
           "CREATE #{index_type} INDEX #{quote_column_name(index_name)} ON #{quote_table_name(table_name)} (#{quoted_column_names})"
         end
       end
@@ -232,6 +232,10 @@ module ActiveRecord #:nodoc:
         elsif options[:null] == true
           sql << " NULL" unless type == :primary_key
         end
+        # add AS expression for virtual columns
+        if options[:as].present?
+          sql << " AS (#{options[:as]})"
+        end
       end
 
       def execute_structure_dump(string)

data/spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb

@@ -209,7 +209,11 @@ describe "OracleEnhancedAdapter" do
       end
       # Another class using the same table
       class ::TestEmployee2 < ActiveRecord::Base
-        set_table_name "test_employees"
+        if self.respond_to?(:table_name=)
+          self.table_name = "test_employees"
+        else
+          set_table_name "test_employees"
+        end
       end
     end
 
@@ -332,7 +336,11 @@ describe "OracleEnhancedAdapter" do
       SQL
       Object.send(:remove_const, 'CompositePrimaryKeys') if defined?(CompositePrimaryKeys)
       class ::TestEmployee < ActiveRecord::Base
-        set_primary_key :employee_id
+        if self.respond_to?(:primary_key=)
+          self.primary_key = :employee_id
+        else
+          set_primary_key :employee_id
+        end
       end
     end
 
@@ -509,7 +517,11 @@ describe "OracleEnhancedAdapter" do
     it "should allow creation of a table with non alphanumeric characters" do
       create_warehouse_things_table
       class ::WarehouseThing < ActiveRecord::Base
-        set_table_name "warehouse-things"
+        if self.respond_to?(:table_name=)
+          self.table_name = "warehouse-things"
+        else
+          set_table_name "warehouse-things"
+        end
       end
 
       wh = WarehouseThing.create!(:name => "Foo", :foo => 2)
@@ -521,7 +533,11 @@ describe "OracleEnhancedAdapter" do
     it "should allow creation of a table with CamelCase name" do
       create_camel_case_table
       class ::CamelCase < ActiveRecord::Base
-        set_table_name "CamelCase"
+        if self.respond_to?(:table_name=)
+          self.table_name = "CamelCase"
+        else
+          set_table_name "CamelCase"
+        end
       end
 
       cc = CamelCase.create!(:name => "Foo", :foo => 2)
@@ -553,7 +569,11 @@ describe "OracleEnhancedAdapter" do
       @conn.execute "CREATE OR REPLACE SYNONYM test_posts_seq FOR test_posts_seq@#{@db_link}"
       class ::TestPost < ActiveRecord::Base
       end
-      TestPost.set_table_name "test_posts"
+      if TestPost.respond_to?(:table_name=)
+        TestPost.table_name = "test_posts"
+      else
+        TestPost.set_table_name "test_posts"
+      end
     end
 
     after(:all) do
@@ -724,6 +744,7 @@ describe "OracleEnhancedAdapter" do
 
   describe "explain" do
     before(:all) do
+      @conn = ActiveRecord::Base.connection
       schema_define do
         drop_table :test_posts rescue nil
         create_table :test_posts
@@ -745,5 +766,13 @@ describe "OracleEnhancedAdapter" do
       explain.should include("Cost")
       explain.should include("INDEX UNIQUE SCAN")
     end
+
+    it "should explain query with binds" do
+      pk = TestPost.columns.find { |c| c.primary }
+      sub = @conn.substitute_at(pk, 0)
+      explain = TestPost.where(TestPost.arel_table[pk.name].eq(sub)).bind([pk, 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

@@ -74,6 +74,18 @@ describe "OracleEnhancedConnection" do
     end
   end
 
+  describe "with slash-prefixed database name (service name)" do
+    before(:all) do
+      params = CONNECTION_PARAMS.dup
+      params[:database] = "/#{params[:database]}" unless params[:database].match(/^\//)
+      @conn = ActiveRecord::ConnectionAdapters::OracleEnhancedConnection.create(params)
+    end
+
+    it "should create new connection" do
+      @conn.should be_active
+    end
+  end
+
   if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
 
     describe "create JDBC connection" do
@@ -143,6 +155,16 @@ describe "OracleEnhancedConnection" do
 
     end
 
+    it "should fall back to directly instantiating OracleDriver" do
+      params = CONNECTION_PARAMS.dup
+      params[:url] = "jdbc:oracle:thin:@#{DATABASE_HOST && "#{DATABASE_HOST}:"}#{DATABASE_PORT && "#{DATABASE_PORT}:"}#{DATABASE_NAME}"
+      params[:host] = nil
+      params[:database] = nil
+      java.sql.DriverManager.stub!(:getConnection).and_raise('no suitable driver found')
+      @conn = ActiveRecord::ConnectionAdapters::OracleEnhancedConnection.create(params)
+      @conn.should be_active
+    end
+
   end
 
   describe "SQL execution" do

data/spec/active_record/connection_adapters/oracle_enhanced_context_index_spec.rb

@@ -406,6 +406,7 @@ describe "OracleEnhancedAdapter context index" do
           :name => 'xxx_post_and_comments_i',
           :index_column => :all_text, :index_column_trigger_on => :updated_at,
           :lexer => { :type => "BASIC_LEXER", :base_letter_type => 'GENERIC', :base_letter => true },
+          :wordlist => { :type => "BASIC_WORDLIST", :prefix_index => true },
           :sync => 'ON COMMIT'
         }
         schema_define do

data/spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb

@@ -5,6 +5,8 @@ describe "OracleEnhancedAdapter date type detection based on column names" do
   before(:all) do
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
     @conn = ActiveRecord::Base.connection
+    @conn.execute "DROP TABLE test_employees" rescue nil
+    @conn.execute "DROP SEQUENCE test_employees_seq" rescue nil
     @conn.execute <<-SQL
       CREATE TABLE test_employees (
         employee_id   NUMBER(6,0) PRIMARY KEY,
@@ -87,7 +89,11 @@ describe "OracleEnhancedAdapter date type detection based on column names" do
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = false
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates = false
       class ::TestEmployee < ActiveRecord::Base
-        set_primary_key :employee_id
+        if self.respond_to?(:primary_key=)
+          self.primary_key = "employee_id"
+        else
+          set_primary_key "employee_id"
+        end
       end
     end
     
@@ -563,7 +569,11 @@ describe "OracleEnhancedAdapter timestamp with timezone support" do
   describe "/ TIMESTAMP WITH TIME ZONE values from ActiveRecord model" do
     before(:all) do
       class ::TestEmployee < ActiveRecord::Base
-        set_primary_key :employee_id
+        if self.respond_to?(:primary_key=)
+          self.primary_key = "employee_id"
+        else
+          set_primary_key "employee_id"
+        end
       end
     end
 
@@ -645,7 +655,11 @@ describe "OracleEnhancedAdapter date and timestamp with different NLS date forma
     ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates = false
     ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = false
     class ::TestEmployee < ActiveRecord::Base
-      set_primary_key :employee_id
+      if self.respond_to?(:primary_key=)
+        self.primary_key = "employee_id"
+      else
+        set_primary_key "employee_id"
+      end
     end
     @today = Date.new(2008,6,28)
     @now = Time.local(2008,6,28,13,34,33)
@@ -730,7 +744,11 @@ describe "OracleEnhancedAdapter assign string to :date and :datetime columns" do
         INCREMENT BY 1 CACHE 20 NOORDER NOCYCLE
     SQL
     class ::TestEmployee < ActiveRecord::Base
-      set_primary_key :employee_id
+      if self.respond_to?(:primary_key=)
+        self.primary_key = "employee_id"
+      else
+        set_primary_key "employee_id"
+      end
     end
     @today = Date.new(2008,6,28)
     @today_iso = "2008-06-28"
@@ -899,6 +917,10 @@ describe "OracleEnhancedAdapter handling of CLOB columns" do
     class ::Test2Employee < ActiveRecord::Base
       serialize :comments
     end
+    class ::TestEmployeeReadOnlyClob < ActiveRecord::Base
+      set_table_name :test_employees
+      attr_readonly :comments
+    end
   end
 
   after(:all) do
@@ -908,6 +930,7 @@ describe "OracleEnhancedAdapter handling of CLOB columns" do
     @conn.execute "DROP SEQUENCE test2_employees_seq"
     Object.send(:remove_const, "TestEmployee")
     Object.send(:remove_const, "Test2Employee")
+    Object.send(:remove_const, "TestEmployeeReadOnlyClob")
     ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
   end
 
@@ -926,6 +949,21 @@ describe "OracleEnhancedAdapter handling of CLOB columns" do
     @employee.should be_valid
   end
 
+  it "should respect attr_readonly setting for CLOB column" do
+    @employee = TestEmployeeReadOnlyClob.create!(
+      :first_name => "First",
+      :comments => "initial"
+    )
+    @employee.should be_valid
+    @employee.reload
+    @employee.comments.should == 'initial'
+    @employee.comments = "changed"
+    @employee.save.should == true
+    @employee.reload
+    @employee.comments.should == 'initial'
+  end
+
+
   it "should create record with CLOB data" do
     @employee = TestEmployee.create!(
       :first_name => "First",
@@ -1043,7 +1081,11 @@ describe "OracleEnhancedAdapter handling of BLOB columns" do
 
   before(:each) do
     class ::TestEmployee < ActiveRecord::Base
-      set_primary_key :employee_id
+      if self.respond_to?(:primary_key=)
+        self.primary_key = "employee_id"
+      else
+        set_primary_key "employee_id"
+      end
     end
   end
   
@@ -1169,7 +1211,11 @@ describe "OracleEnhancedAdapter handling of RAW columns" do
 
   before(:each) do
     class ::TestEmployee < ActiveRecord::Base
-      set_primary_key :employee_id
+      if self.respond_to?(:primary_key=)
+        self.primary_key = "employee_id"
+      else
+        set_primary_key "employee_id"
+      end
     end
   end