oracle_enhanced 1.3.0.pre → 1.3.0.pre2

data/lib/active_record/connection_adapters/oracle_enhanced_context_index.rb

@@ -0,0 +1,227 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module OracleEnhancedContextIndex
+
+      # Define full text index with CONTEXT index type
+      def add_context_index(table_name, column_name, options = {})
+        self.all_schema_indexes = nil
+        column_names = Array(column_name)
+        index_name = options[:name] || index_name(table_name, :column => options[:index_column] || column_names,
+          # CONEXT index name max length is 25
+          :identifier_max_length => 25)
+
+        quoted_column_name = quote_column_name(options[:index_column] || column_names.first)
+        if options[:index_column_trigger_on]
+          raise ArgumentError, "Option :index_column should be specified together with :index_column_cource option" \
+            unless options[:index_column]
+          create_index_column_trigger(table_name, index_name, options[:index_column], options[:index_column_trigger_on])
+        end
+
+        sql = "CREATE INDEX #{quote_column_name(index_name)} ON #{quote_table_name(table_name)}"
+        sql << " (#{quoted_column_name})"
+        sql << " INDEXTYPE IS CTXSYS.CONTEXT"
+        parameters = []
+        if column_names.size > 1
+          procedure_name = default_datastore_procedure(index_name)
+          datastore_name = default_datastore_name(index_name)
+          create_datastore_procedure(table_name, procedure_name, column_names, options)
+          create_datastore_preference(datastore_name, procedure_name)
+          parameters << "DATASTORE #{datastore_name} SECTION GROUP CTXSYS.AUTO_SECTION_GROUP"
+        end
+        if options[:tablespace]
+          storage_name = default_storage_name(index_name)
+          create_storage_preference(storage_name, options[:tablespace])
+          parameters << "STORAGE #{storage_name}"
+        end
+        if options[:sync]
+          parameters << "SYNC(#{options[:sync]})"
+        end
+        unless parameters.empty?
+          sql << " PARAMETERS ('#{parameters.join(' ')}')"
+        end
+        execute sql
+      end
+
+      # Drop full text index with CONTEXT index type
+      def remove_context_index(table_name, options = {})
+        self.all_schema_indexes = nil
+        unless Hash === options # if column names passed as argument
+          options = {:column => Array(options)}
+        end
+        index_name = options[:name] || index_name(table_name,
+          :column => options[:index_column] || options[:column], :identifier_max_length => 25)
+        execute "DROP INDEX #{index_name}"
+        drop_ctx_preference(default_datastore_name(index_name))
+        drop_ctx_preference(default_storage_name(index_name))
+        procedure_name = default_datastore_procedure(index_name)
+        execute "DROP PROCEDURE #{quote_table_name(procedure_name)}" rescue nil
+        drop_index_column_trigger(index_name)
+      end
+
+      private
+
+      def create_datastore_procedure(table_name, procedure_name, column_names, options)
+        quoted_table_name = quote_table_name(table_name)
+        select_queries = column_names.select{|c| c.to_s =~ /^SELECT /i}
+        column_names = column_names - select_queries
+        keys, selected_columns = parse_select_queries(select_queries)
+        quoted_column_names = (column_names+keys).map{|col| quote_column_name(col)}
+        execute compress_lines(<<-SQL)
+          CREATE OR REPLACE PROCEDURE #{quote_table_name(procedure_name)}
+            (p_rowid IN	      ROWID,
+            p_clob	IN OUT NOCOPY CLOB) IS
+            -- add_context_index_parameters #{(column_names+select_queries).inspect}#{!options.empty? ? ', ' << options.inspect[1..-2] : ''}
+            #{
+            selected_columns.map do |cols|
+              cols.map do |col|
+                raise ArgumentError, "Alias #{col} too large, should be 28 or less characters long" unless col.length <= 28
+                "l_#{col} VARCHAR2(32767);\n"
+              end.join
+            end.join
+            } BEGIN
+            FOR r1 IN (
+              SELECT #{quoted_column_names.join(', ')}
+              FROM	 #{quoted_table_name}
+              WHERE  #{quoted_table_name}.ROWID = p_rowid
+            ) LOOP
+              #{
+              (column_names.map do |col|
+                col = col.to_s
+                "DBMS_LOB.WRITEAPPEND(p_clob, #{col.length+2}, '<#{col}>');\n" <<
+                "DBMS_LOB.WRITEAPPEND(p_clob, LENGTH(r1.#{col}), r1.#{col});\n" <<
+                "DBMS_LOB.WRITEAPPEND(p_clob, #{col.length+3}, '</#{col}>');\n"
+              end.join) <<
+              (selected_columns.zip(select_queries).map do |cols, query|
+                (cols.map do |col|
+                  "l_#{col} := '';\n"
+                end.join) <<
+                "FOR r2 IN (\n" <<
+                query.gsub(/:(\w+)/,"r1.\\1") << "\n) LOOP\n" <<
+                (cols.map do |col|
+                  "l_#{col} := l_#{col} || r2.#{col} || CHR(10);\n"
+                end.join) <<
+                "END LOOP;\n" <<
+                (cols.map do |col|
+                  col = col.to_s
+                  "DBMS_LOB.WRITEAPPEND(p_clob, #{col.length+2}, '<#{col}>');\n" <<
+                  "IF LENGTH(l_#{col}) > 0 THEN\n" <<
+                  "DBMS_LOB.WRITEAPPEND(p_clob, LENGTH(l_#{col}), l_#{col});\n" <<
+                  "END IF;\n" <<
+                  "DBMS_LOB.WRITEAPPEND(p_clob, #{col.length+3}, '</#{col}>');\n"
+                end.join)
+              end.join)
+              }
+            END LOOP;
+          END;
+        SQL
+      end
+
+      def parse_select_queries(select_queries)
+        keys = []
+        selected_columns = []
+        select_queries.each do |query|
+          # get primary or foreign keys like :id or :something_id
+          keys << (query.scan(/:\w+/).map{|k| k[1..-1].downcase.to_sym})
+          select_part = query.scan(/^select\s.*\sfrom/i).first
+          selected_columns << select_part.scan(/\sas\s+(\w+)/i).map{|c| c.first}
+        end
+        [keys.flatten.uniq, selected_columns]
+      end
+
+      def create_datastore_preference(datastore_name, procedure_name)
+        drop_ctx_preference(datastore_name)
+        execute <<-SQL
+          BEGIN
+            CTX_DDL.CREATE_PREFERENCE('#{datastore_name}', 'USER_DATASTORE');
+            CTX_DDL.SET_ATTRIBUTE('#{datastore_name}', 'PROCEDURE', '#{procedure_name}');
+          END;
+        SQL
+      end
+
+      def create_storage_preference(storage_name, tablespace)
+        drop_ctx_preference(storage_name)
+        sql = "BEGIN\nCTX_DDL.CREATE_PREFERENCE('#{storage_name}', 'BASIC_STORAGE');\n"
+        ['I_TABLE_CLAUSE', 'K_TABLE_CLAUSE', 'R_TABLE_CLAUSE',
+        'N_TABLE_CLAUSE', 'I_INDEX_CLAUSE', 'P_TABLE_CLAUSE'].each do |clause|
+          sql << "CTX_DDL.SET_ATTRIBUTE('#{storage_name}', '#{clause}', 'TABLESPACE #{tablespace}');\n"
+        end
+        sql << "END;\n"
+        execute sql
+      end
+
+      def drop_ctx_preference(preference_name)
+        execute "BEGIN CTX_DDL.DROP_PREFERENCE('#{preference_name}'); END;" rescue nil
+      end
+
+      def create_index_column_trigger(table_name, index_name, index_column, index_column_source)
+        trigger_name = default_index_column_trigger_name(index_name)
+        columns = Array(index_column_source)
+        quoted_column_names = columns.map{|col| quote_column_name(col)}.join(', ')
+        execute compress_lines(<<-SQL)
+          CREATE OR REPLACE TRIGGER #{quote_table_name(trigger_name)}
+          BEFORE UPDATE OF #{quoted_column_names} ON #{quote_table_name(table_name)} FOR EACH ROW
+          BEGIN
+            :new.#{quote_column_name(index_column)} := '1';
+          END;
+        SQL
+      end
+
+      def drop_index_column_trigger(index_name)
+        trigger_name = default_index_column_trigger_name(index_name)
+        execute "DROP TRIGGER #{quote_table_name(trigger_name)}" rescue nil
+      end
+
+      def default_datastore_procedure(index_name)
+        "#{index_name}_prc"
+      end
+
+      def default_datastore_name(index_name)
+        "#{index_name}_dst"
+      end
+
+      def default_storage_name(index_name)
+        "#{index_name}_sto"
+      end
+
+      def default_index_column_trigger_name(index_name)
+        "#{index_name}_trg"
+      end
+
+      module BaseClassMethods
+        # Declare that model table has context index defined.
+        # As a result <tt>contains</tt> class scope method is defined.
+        def has_context_index
+          extend ContextIndexClassMethods
+        end
+      end
+
+      module ContextIndexClassMethods
+        # Add context index condition.
+        case ::ActiveRecord::VERSION::MAJOR
+        when 3
+          def contains(column, query, options ={})
+            score_label = options[:label].to_i || 1
+            where("CONTAINS(#{connection.quote_column_name(column)}, ?, #{score_label}) > 0", query).
+              order("SCORE(#{score_label}) DESC")
+          end
+        when 2
+          def contains(column, query, options ={})
+            score_label = options[:label].to_i || 1
+            scoped(:conditions => ["CONTAINS(#{connection.quote_column_name(column)}, ?, #{score_label}) > 0", query],
+              :order => "SCORE(#{score_label}) DESC")
+          end
+        end
+      end
+
+    end
+    
+  end
+end
+
+ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.class_eval do
+  include ActiveRecord::ConnectionAdapters::OracleEnhancedContextIndex
+end
+
+ActiveRecord::Base.class_eval do
+  extend ActiveRecord::ConnectionAdapters::OracleEnhancedContextIndex::BaseClassMethods
+end

data/lib/active_record/connection_adapters/oracle_enhanced_core_ext.rb

@@ -53,7 +53,7 @@ if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'ruby' && RUBY_VERSION >= '1.9'
 
   rescue LoadError
     warning_message = "WARNING: Please install unicode_utils gem to support Unicode aware upcase and downcase for String#mb_chars"
-    if !(Rails.logger.nil?)
+    if !Rails.logger.nil?
       Rails.logger.warn warning_message
     else
       STDERR.puts warning_message

data/lib/active_record/connection_adapters/oracle_enhanced_dirty.rb

@@ -32,7 +32,7 @@ module ActiveRecord #:nodoc:
   end
 end
 
-if ActiveRecord::Base.instance_methods.include?('changed?')
+if ActiveRecord::Base.method_defined?(:changed?)
   ActiveRecord::Base.class_eval do
     include ActiveRecord::ConnectionAdapters::OracleEnhancedDirty::InstanceMethods
   end

data/lib/active_record/connection_adapters/oracle_enhanced_jdbc_connection.rb

@@ -154,7 +154,7 @@ module ActiveRecord
         @active = true
       rescue NativeException => e
         @active = false
-        if e.message =~ /^java\.sql\.SQLException/
+        if e.message =~ /^java\.sql\.SQL(Recoverable)?Exception/
           raise OracleEnhancedConnectionException, e.message
         else
           raise
@@ -169,7 +169,7 @@ module ActiveRecord
           @active = true
         rescue NativeException => e
           @active = false
-          if e.message =~ /^java\.sql\.SQLException/
+          if e.message =~ /^java\.sql\.SQL(Recoverable)?Exception/
             raise OracleEnhancedConnectionException, e.message
           else
             raise
@@ -183,7 +183,7 @@ module ActiveRecord
         begin
           yield if block_given?
         rescue NativeException => e
-          raise unless e.message =~ /^java\.sql\.SQLException: (Closed Connection|Io exception:|No more data to read from socket)/
+          raise unless e.message =~ /^java\.sql\.SQL(Recoverable)?Exception: (Closed Connection|Io exception:|No more data to read from socket)/
           @active = false
           raise unless should_retry
           should_retry = false

data/lib/active_record/connection_adapters/oracle_enhanced_oci_connection.rb

@@ -138,7 +138,12 @@ module ActiveRecord
 
       # Return OCIError error code
       def error_code(exception)
-        exception.code
+        case exception
+        when OCIError
+          exception.code
+        else
+          nil
+        end
       end
 
       private

data/lib/active_record/connection_adapters/oracle_enhanced_procedures.rb

@@ -112,7 +112,7 @@ module ActiveRecord #:nodoc:
           # check if class has custom create method
           return create_without_custom_method unless self.class.custom_create_method
           self.class.connection.log_custom_method("custom create method", "#{self.class.name} Create") do
-            self.id = self.class.custom_create_method.bind(self).call
+            self.id = instance_eval &self.class.custom_create_method
           end
           @new_record = false
           id
@@ -125,7 +125,7 @@ module ActiveRecord #:nodoc:
           return update_without_custom_method unless self.class.custom_update_method
           return 0 if attribute_names.empty?
           self.class.connection.log_custom_method("custom update method with #{self.class.primary_key}=#{self.id}", "#{self.class.name} Update") do
-            self.class.custom_update_method.bind(self).call
+            instance_eval &self.class.custom_update_method
           end
           1
         end
@@ -138,7 +138,7 @@ module ActiveRecord #:nodoc:
           return destroy_without_custom_method unless self.class.custom_delete_method
           unless new_record?
             self.class.connection.log_custom_method("custom delete method with #{self.class.primary_key}=#{self.id}", "#{self.class.name} Destroy") do
-              self.class.custom_delete_method.bind(self).call
+              instance_eval &self.class.custom_delete_method
             end
           end
 

data/lib/active_record/connection_adapters/oracle_enhanced_schema_definitions.rb

@@ -6,7 +6,8 @@ module ActiveRecord
     class OracleEnhancedSynonymDefinition < Struct.new(:name, :table_owner, :table_name, :db_link) #:nodoc:
     end
 
-    class OracleEnhancedIndexDefinition < Struct.new(:table, :name, :unique, :tablespace, :columns) #:nodoc:
+    class OracleEnhancedIndexDefinition < Struct.new(:table, :name, :unique, :type, :parameters, :statement_parameters,
+      :tablespace, :columns) #:nodoc:
     end
 
     module OracleEnhancedSchemaDefinitions #:nodoc:

data/lib/active_record/connection_adapters/oracle_enhanced_schema_dumper.rb

@@ -13,7 +13,8 @@ module ActiveRecord #:nodoc:
       private
       
       def tables_with_oracle_enhanced(stream)
-        sorted_tables = @connection.tables.sort
+        # do not include materialized views in schema dump - they should be created separately after schema creation
+        sorted_tables = (@connection.tables - @connection.materialized_views).sort
         sorted_tables.each do |tbl|
           # add table prefix or suffix for schema_migrations
           next if [ActiveRecord::Migrator.proper_table_name('schema_migrations'), ignore_tables].flatten.any? do |ignored|
@@ -89,14 +90,28 @@ module ActiveRecord #:nodoc:
       def indexes_with_oracle_enhanced(table, stream)
         if (indexes = @connection.indexes(table)).any?
           add_index_statements = indexes.map do |index|
-            # use table.inspect as it will remove prefix and suffix
-            statment_parts = [ ('add_index ' + table.inspect) ]
-            statment_parts << index.columns.inspect
-            statment_parts << (':name => ' + index.name.inspect)
-            statment_parts << ':unique => true' if index.unique
-            statment_parts << ':tablespace => ' + index.tablespace.inspect if index.tablespace
-
-            '  ' + statment_parts.join(', ')
+            case index.type
+            when nil
+              # use table.inspect as it will remove prefix and suffix
+              statement_parts = [ ('add_index ' + table.inspect) ]
+              statement_parts << index.columns.inspect
+              statement_parts << (':name => ' + index.name.inspect)
+              statement_parts << ':unique => true' if index.unique
+              statement_parts << ':tablespace => ' + index.tablespace.inspect if index.tablespace
+            when 'CTXSYS.CONTEXT'
+              if index.statement_parameters
+                statement_parts = [ ('add_context_index ' + table.inspect) ]
+                statement_parts << index.statement_parameters
+              else
+                statement_parts = [ ('add_context_index ' + table.inspect) ]
+                statement_parts << index.columns.inspect
+                statement_parts << (':name => ' + index.name.inspect)
+              end
+            else
+              # unrecognized index type
+              statement_parts = ["# unrecognized index #{index.name.inspect} with type #{index.type.inspect}"]
+            end
+            '  ' + statement_parts.join(', ')
           end
 
           stream.puts add_index_statements.sort.join("\n")

data/lib/active_record/connection_adapters/oracle_enhanced_version.rb

@@ -1 +1 @@
-ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter::VERSION = '1.2.3'
+ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter::VERSION = File.read(File.dirname(__FILE__)+'/../../../VERSION').chomp

data/lib/{oracle_enhanced.rb → active_record/oracle_enhanced.rb}

@@ -1,3 +1 @@
-#dummy for easier require
-
 require 'active_record/connection_adapters/oracle_enhanced_adapter'

data/oracle_enhanced.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{oracle_enhanced}
-  s.version = "1.3.0.pre"
+  s.version = "1.3.0.pre2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Raimonds Simanovskis"]
-  s.date = %q{2010-03-03}
+  s.date = %q{2010-03-18}
   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.
 }
@@ -29,6 +29,7 @@ This adapter is superset of original ActiveRecord Oracle adapter.
      "lib/active_record/connection_adapters/oracle_enhanced.rake",
      "lib/active_record/connection_adapters/oracle_enhanced_adapter.rb",
      "lib/active_record/connection_adapters/oracle_enhanced_connection.rb",
+     "lib/active_record/connection_adapters/oracle_enhanced_context_index.rb",
      "lib/active_record/connection_adapters/oracle_enhanced_core_ext.rb",
      "lib/active_record/connection_adapters/oracle_enhanced_cpk.rb",
      "lib/active_record/connection_adapters/oracle_enhanced_dirty.rb",
@@ -41,11 +42,12 @@ This adapter is superset of original ActiveRecord Oracle adapter.
      "lib/active_record/connection_adapters/oracle_enhanced_schema_statements_ext.rb",
      "lib/active_record/connection_adapters/oracle_enhanced_tasks.rb",
      "lib/active_record/connection_adapters/oracle_enhanced_version.rb",
-     "lib/oracle_enhanced.rb",
+     "lib/active_record/oracle_enhanced.rb",
      "oracle_enhanced.gemspec",
      "spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb",
      "spec/active_record/connection_adapters/oracle_enhanced_adapter_structure_dumper_spec.rb",
      "spec/active_record/connection_adapters/oracle_enhanced_connection_spec.rb",
+     "spec/active_record/connection_adapters/oracle_enhanced_context_index_spec.rb",
      "spec/active_record/connection_adapters/oracle_enhanced_core_ext_spec.rb",
      "spec/active_record/connection_adapters/oracle_enhanced_cpk_spec.rb",
      "spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb",
@@ -58,7 +60,7 @@ This adapter is superset of original ActiveRecord Oracle adapter.
      "spec/spec.opts",
      "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/rsim/oracle-enhanced}
+  s.homepage = %q{http://github.com/plukevdh/oracle-enhanced}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.6}
@@ -67,6 +69,7 @@ This adapter is superset of original ActiveRecord Oracle adapter.
     "spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb",
      "spec/active_record/connection_adapters/oracle_enhanced_adapter_structure_dumper_spec.rb",
      "spec/active_record/connection_adapters/oracle_enhanced_connection_spec.rb",
+     "spec/active_record/connection_adapters/oracle_enhanced_context_index_spec.rb",
      "spec/active_record/connection_adapters/oracle_enhanced_core_ext_spec.rb",
      "spec/active_record/connection_adapters/oracle_enhanced_cpk_spec.rb",
      "spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb",

data/spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb

@@ -112,7 +112,7 @@ describe "OracleEnhancedAdapter" do
     before(:all) do
       @conn.execute <<-SQL
         CREATE TABLE test_employees (
-          id            NUMBER,
+          id            NUMBER PRIMARY KEY,
           first_name    VARCHAR2(20),
           last_name     VARCHAR2(25),
           email         VARCHAR2(25),
@@ -180,7 +180,7 @@ describe "OracleEnhancedAdapter" do
       @conn.execute "DROP TABLE test_employees" rescue nil
       @conn.execute <<-SQL
         CREATE TABLE test_employees (
-          id            NUMBER,
+          id            NUMBER PRIMARY KEY,
           first_name    VARCHAR2(20),
           last_name     VARCHAR2(25),
           hire_date     DATE
@@ -198,12 +198,15 @@ describe "OracleEnhancedAdapter" do
     end
 
     before(:each) do
-      @buffer = StringIO.new
-      log_to @buffer
+      set_logger
       @conn = ActiveRecord::Base.connection
       @conn.clear_columns_cache
     end
 
+    after(:each) do
+      clear_logger
+    end
+
     describe "without column caching" do
 
       before(:each) do
@@ -212,14 +215,26 @@ describe "OracleEnhancedAdapter" do
 
       it "should get columns from database at first time" do
         TestEmployee.connection.columns('test_employees').map(&:name).should == @column_names
-        @buffer.string.should =~ /select .* from all_tab_columns/im
+        @logger.logged(:debug).last.should =~ /select .* from all_tab_columns/im
       end
 
       it "should get columns from database at second time" do
         TestEmployee.connection.columns('test_employees')
-        @buffer.truncate(0)
+        @logger.clear(:debug)
         TestEmployee.connection.columns('test_employees').map(&:name).should == @column_names
-        @buffer.string.should =~ /select .* from all_tab_columns/im
+        @logger.logged(:debug).last.should =~ /select .* from all_tab_columns/im
+      end
+
+      it "should get primary key from database at first time" do
+        TestEmployee.connection.pk_and_sequence_for('test_employees').should == ['id', nil]
+        @logger.logged(:debug).last.should =~ /select .* from all_constraints/im
+      end
+
+      it "should get primary key from database at first time" do
+        TestEmployee.connection.pk_and_sequence_for('test_employees').should == ['id', nil]
+        @logger.clear(:debug)
+        TestEmployee.connection.pk_and_sequence_for('test_employees').should == ['id', nil]
+        @logger.logged(:debug).last.should =~ /select .* from all_constraints/im
       end
 
     end
@@ -232,14 +247,26 @@ describe "OracleEnhancedAdapter" do
 
       it "should get columns from database at first time" do
         TestEmployee.connection.columns('test_employees').map(&:name).should == @column_names
-        @buffer.string.should =~ /select .* from all_tab_columns/im
+        @logger.logged(:debug).last.should =~ /select .* from all_tab_columns/im
       end
 
       it "should get columns from cache at second time" do
         TestEmployee.connection.columns('test_employees')
-        @buffer.truncate(0)
+        @logger.clear(:debug)
         TestEmployee.connection.columns('test_employees').map(&:name).should == @column_names
-        @buffer.string.should be_blank
+        @logger.logged(:debug).last.should be_blank
+      end
+
+      it "should get primary key from database at first time" do
+        TestEmployee.connection.pk_and_sequence_for('test_employees').should == ['id', nil]
+        @logger.logged(:debug).last.should =~ /select .* from all_constraints/im
+      end
+
+      it "should get primary key from cache at first time" do
+        TestEmployee.connection.pk_and_sequence_for('test_employees').should == ['id', nil]
+        @logger.clear(:debug)
+        TestEmployee.connection.pk_and_sequence_for('test_employees').should == ['id', nil]
+        @logger.logged(:debug).last.should be_blank
       end
 
     end

data/spec/active_record/connection_adapters/oracle_enhanced_adapter_structure_dumper_spec.rb

@@ -58,7 +58,7 @@ describe "OracleEnhancedAdapter structure dump" do
       SQL
       dump = ActiveRecord::Base.connection.structure_dump_fk_constraints
       dump.split('\n').length.should == 1
-      dump.should =~ /ALTER TABLE TEST_POSTS ADD CONSTRAINT fk_test_post_foo FOREIGN KEY \(foo_id\) REFERENCES foos\(id\)/
+      dump.should =~ /ALTER TABLE \"?TEST_POSTS\"? ADD CONSTRAINT \"?FK_TEST_POST_FOO\"? FOREIGN KEY \(\"?FOO_ID\"?\) REFERENCES \"?FOOS\"?\(\"?ID\"?\)/i
     end
   
     it "should not error when no foreign keys are present" do
@@ -78,7 +78,7 @@ describe "OracleEnhancedAdapter structure dump" do
         END;
       SQL
       dump = ActiveRecord::Base.connection.structure_dump_db_stored_code.gsub(/\n|\s+/,' ')
-      dump.should =~ /create or replace TRIGGER TEST_POST_TRIGGER/
+      dump.should =~ /CREATE OR REPLACE TRIGGER TEST_POST_TRIGGER/
     end
   
     it "should dump types" do
@@ -86,7 +86,7 @@ describe "OracleEnhancedAdapter structure dump" do
         create or replace TYPE TEST_TYPE AS TABLE OF VARCHAR2(10);
       SQL
       dump = ActiveRecord::Base.connection.structure_dump_db_stored_code.gsub(/\n|\s+/,' ')
-      dump.should =~ /create or replace TYPE TEST_TYPE/
+      dump.should =~ /CREATE OR REPLACE TYPE TEST_TYPE/
     end
   
     it "should dump virtual columns" do
@@ -99,7 +99,7 @@ describe "OracleEnhancedAdapter structure dump" do
         )
       SQL
       dump = ActiveRecord::Base.connection.structure_dump
-      dump.should =~ /id_plus number GENERATED ALWAYS AS \(ID\+2\) VIRTUAL/
+      dump.should =~ /ID_PLUS NUMBER GENERATED ALWAYS AS \(ID\+2\) VIRTUAL/
     end
   
     it "should dump unique keys" do
@@ -124,9 +124,9 @@ describe "OracleEnhancedAdapter structure dump" do
       SQL
       
       dump = ActiveRecord::Base.connection.structure_dump
-      dump.should =~ /create unique index ix_test_posts_foo_id on test_posts \(foo_id\)/i
-      dump.should =~ /create  index ix_test_posts_foo on test_posts \(foo\)/i
-      dump.should_not =~ /create unique index uk_test_posts_/i
+      dump.should =~ /CREATE UNIQUE INDEX "?IX_TEST_POSTS_FOO_ID"? ON "?TEST_POSTS"? \("?FOO_ID"?\)/i
+      dump.should =~ /CREATE  INDEX "?IX_TEST_POSTS_FOO\"? ON "?TEST_POSTS"? \("?FOO"?\)/i
+      dump.should_not =~ /CREATE UNIQUE INDEX "?UK_TEST_POSTS_/i
     end
   end
   describe "temporary tables" do
@@ -138,7 +138,7 @@ describe "OracleEnhancedAdapter structure dump" do
         t.integer :post_id
       end
       dump = ActiveRecord::Base.connection.structure_dump
-      dump.should =~ /create global temporary table test_comments/i
+      dump.should =~ /CREATE GLOBAL TEMPORARY TABLE "?TEST_COMMENTS"?/i
     end
   end
 
@@ -173,8 +173,8 @@ describe "OracleEnhancedAdapter structure dump" do
     end
     it "should dump drop sql for just temp tables" do
       dump = @conn.temp_table_drop
-      dump.should =~ /drop table temp_tbl/i
-      dump.should_not =~ /drop table not_temp_tbl/i
+      dump.should =~ /DROP TABLE "TEMP_TBL"/
+      dump.should_not =~ /DROP TABLE "?NOT_TEMP_TBL"?/i
     end
     after(:each) do
       @conn.drop_table :temp_tbl 
@@ -194,6 +194,10 @@ describe "OracleEnhancedAdapter structure dump" do
       @conn.execute <<-SQL
         create or replace view full_drop_test_view (foo) as select id as "foo" from full_drop_test
       SQL
+      #materialized view
+      @conn.execute <<-SQL
+        create materialized view full_drop_test_mview (foo) as select id as "foo" from full_drop_test
+      SQL
       #package
       @conn.execute <<-SQL
         create or replace package full_drop_test_package as
@@ -241,6 +245,7 @@ describe "OracleEnhancedAdapter structure dump" do
       @conn.drop_table :full_drop_test
       @conn.drop_table :full_drop_test_temp
       @conn.execute "DROP VIEW FULL_DROP_TEST_VIEW" rescue nil
+      @conn.execute "DROP MATERIALIZED VIEW FULL_DROP_TEST_MVIEW" rescue nil
       @conn.execute "DROP SYNONYM FULL_DROP_TEST_SYNONYM" rescue nil
       @conn.execute "DROP PACKAGE FULL_DROP_TEST_PACKAGE" rescue nil
       @conn.execute "DROP FUNCTION FULL_DROP_TEST_FUNCTION" rescue nil
@@ -249,19 +254,21 @@ describe "OracleEnhancedAdapter structure dump" do
     end
     it "should contain correct sql" do
       drop = @conn.full_drop
-      drop.should =~ /drop table full_drop_test cascade constraints/i
-      drop.should =~ /drop sequence full_drop_test_seq/i
-      drop.should =~ /drop view "full_drop_test_view"/i
-      drop.should =~ /drop package full_drop_test_package/i
-      drop.should =~ /drop function full_drop_test_function/i
-      drop.should =~ /drop procedure full_drop_test_procedure/i
-      drop.should =~ /drop synonym "full_drop_test_synonym"/i
-      drop.should =~ /drop type "full_drop_test_type"/i
+      drop.should =~ /DROP TABLE "FULL_DROP_TEST" CASCADE CONSTRAINTS/
+      drop.should =~ /DROP SEQUENCE "FULL_DROP_TEST_SEQ"/
+      drop.should =~ /DROP VIEW "FULL_DROP_TEST_VIEW"/
+      drop.should_not =~ /DROP TABLE "?FULL_DROP_TEST_MVIEW"?/i
+      drop.should =~ /DROP MATERIALIZED VIEW "FULL_DROP_TEST_MVIEW"/
+      drop.should =~ /DROP PACKAGE "FULL_DROP_TEST_PACKAGE"/
+      drop.should =~ /DROP FUNCTION "FULL_DROP_TEST_FUNCTION"/
+      drop.should =~ /DROP PROCEDURE "FULL_DROP_TEST_PROCEDURE"/
+      drop.should =~ /DROP SYNONYM "FULL_DROP_TEST_SYNONYM"/
+      drop.should =~ /DROP TYPE "FULL_DROP_TEST_TYPE"/
     end
     it "should not drop tables when preserve_tables is true" do
       drop = @conn.full_drop(true)
-      drop.should =~ /drop table full_drop_test_temp/i
-      drop.should_not =~ /drop table full_drop_test cascade constraints/i
+      drop.should =~ /DROP TABLE "FULL_DROP_TEST_TEMP"/
+      drop.should_not =~ /DROP TABLE "?FULL_DROP_TEST"? CASCADE CONSTRAINTS/i
     end
   end
 end