activerecord-oracle_enhanced-adapter 1.7.7 → 1.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa268d433a58212089a08ecef9e43c163abde038
-  data.tar.gz: 4c57883d8eaa819b01c58342cd1d1ef679228f46
+  metadata.gz: e288f3252430d1ed219947281862797ff87b59ba
+  data.tar.gz: 83dc958f35386c22c8c1d7a68c1f817e4cd884cc
 SHA512:
-  metadata.gz: e5f806719336de611f0b0665c16ed334c35c544f2e6b9462e2e6788f41417f33e43b524769c47bc6b1b6bb67c47316c2ac84b69132f6e3253f1d32d6d5f72441
-  data.tar.gz: 03f58f1cbdec17d82868588f78f1dd26cf6532ec819410f7c0d0cdd17a4611dee283bb55f2496befba03b9e37fe13ede1cff77b5792e9fd1ef87c49bf6110caf
+  metadata.gz: 8ef95f27bd4dbaf561c5ef0f36a70903f0ed3652ca7096cfc32f7396ced16ab829717be7e79e0858ef9c7adaf79de74a805b5bad73909ea35a9f8cebb340f442
+  data.tar.gz: 866f47befdc34a4489b8b3da4bd35c37dfea56393a1e38e2686ccb9fe73e088f66bc7d7f26ff9ef69050d68f3b72050afd561d85f39d73f469724f4ae129cf71

data/History.md

@@ -1,3 +1,17 @@
+## 1.7.8 / 2016-12-06
+
+* Changes and bug fixes
+  * Separate schema migration insert statements correctly [#1074]
+  * Add `use_old_oracle_visitor` example [#1068]
+  * `supports_fetch_first_n_rows_and_offset?` returns `false` when `use_old_oracle_visitor` is true {1070, #1075]
+  * Suppress `create_table(:posts, {:force=>true})` message [#1067, #1072]
+  * Enable rubocop and Code Climate [#1056, #1057, #1060, #1062, #1071]
+  * Bump MRI version for travis [#1054, #1059]
+  * Drop `ActiveRecord::InternalMetadata.table_name` after each spec [#1073]
+
+* Known issues
+ * No changes since 1.7.7
+
 ## 1.7.7 / 2016-11-15
 
 * Changes and bug fixes

data/README.md

@@ -240,6 +240,9 @@ ActiveSupport.on_load(:active_record) do
     # start primary key sequences from 1 (and not 10000) and take just one next value in each session
     self.default_sequence_start_value = "1 NOCACHE INCREMENT BY 1"
 
+    # Use old visitor for Oracle 12c database
+    self.use_old_oracle_visitor = true
+
     # other settings ...
   end
 end

data/VERSION

@@ -1 +1 @@
-1.7.7
+1.7.8

data/activerecord-oracle_enhanced-adapter.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name = %q{activerecord-oracle_enhanced-adapter}
-  s.version = "1.7.7"
+  s.version = "1.7.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.required_ruby_version     = '>= 2.2.2'
   s.license = 'MIT'
   s.authors = [%q{Raimonds Simanovskis}]
-  s.date = %q{2016-11-15}
+  s.date = %q{2016-12-06}
   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.
 }
@@ -92,4 +92,3 @@ This adapter is superset of original ActiveRecord Oracle adapter.
   s.add_runtime_dependency(%q<ruby-plsql>, [">= 0.5.0"])
   s.license = 'MIT'
 end
-

data/lib/active_record/connection_adapters/oracle_enhanced/column.rb

@@ -1,7 +1,6 @@
 module ActiveRecord
   module ConnectionAdapters #:nodoc:
     class OracleEnhancedColumn < Column
-
       attr_reader :table_name, :nchar, :virtual_column_data_default, :returning_id #:nodoc:
 
       def initialize(name, default, sql_type_metadata = nil, null = true, table_name = nil, virtual = false, returning_id = nil, comment = nil) #:nodoc:
@@ -69,7 +68,7 @@ module ActiveRecord
 #        #TODO: may be deprecated due to conflict with variable
 #        ActiveRecord::Base.connection.column_comment(@table_name, name)
 #      end
-      
+
       private
 
       def self.extract_value_from_default(default)
@@ -85,7 +84,7 @@ module ActiveRecord
         value.respond_to?(:hour) && (value.hour == 0 and value.min == 0 and value.sec == 0) ?
           Date.new(value.year, value.month, value.day) : value
       end
-      
+
       class << self
         protected
 
@@ -128,10 +127,7 @@ module ActiveRecord
           end
           DateTime.strptime(string, OracleEnhancedAdapter.string_to_date_format).to_date
         end
-        
       end
     end
-
   end
-
 end

data/lib/active_record/connection_adapters/oracle_enhanced/column_dumper.rb

@@ -2,7 +2,6 @@ module ActiveRecord #:nodoc:
   module ConnectionAdapters #:nodoc:
     module OracleEnhanced #:nodoc:
       module ColumnDumper #:nodoc:
-
         def column_spec(column)
           spec = Hash[prepare_column_options(column).map { |k, v| [k, "#{k}: #{v}"] }]
           spec[:name] = column.name.inspect
@@ -63,7 +62,6 @@ module ActiveRecord #:nodoc:
             column.type.inspect if column.virtual?
           end
         end
-
       end
     end
   end

data/lib/active_record/connection_adapters/oracle_enhanced/connection.rb

@@ -2,7 +2,6 @@ module ActiveRecord
   module ConnectionAdapters
     # interface independent methods
     class OracleEnhancedConnection #:nodoc:
-
       def self.create(config)
         case ORACLE_ENHANCED_CONNECTION
         when :oci
@@ -97,17 +96,15 @@ module ActiveRecord
         result = select(sql, name = nil)
         result.map { |r| r.values.first }
       end
-
     end
 
     # Returns array with major and minor version of database (e.g. [12, 1])
     def database_version
       raise NoMethodError, "Not implemented for this raw driver"
-    end 
-    
-    class OracleEnhancedConnectionException < StandardError #:nodoc:
     end
 
+    class OracleEnhancedConnectionException < StandardError #:nodoc:
+    end
   end
 end
 

data/lib/active_record/connection_adapters/oracle_enhanced/context_index.rb

@@ -2,7 +2,6 @@ module ActiveRecord
   module ConnectionAdapters
     module OracleEnhanced
       module ContextIndex
-
         # Define full text index with Oracle specific CONTEXT index type
         #
         # Oracle CONTEXT index by default supports full text indexing of one column.
@@ -336,7 +335,6 @@ module ActiveRecord
               order("SCORE(#{score_label}) DESC")
           end
         end
-
       end
     end
   end

data/lib/active_record/connection_adapters/oracle_enhanced/cpk.rb

@@ -1,17 +1,15 @@
 module ActiveRecord #:nodoc:
   module ConnectionAdapters #:nodoc:
     module OracleEnhancedCpk #:nodoc:
-
       # This mightn't be in Core, but count(distinct x,y) doesn't work for me.
       # Return that not supported if composite_primary_keys gem is required.
       def supports_count_distinct? #:nodoc:
         @supports_count_distinct ||= ! defined?(CompositePrimaryKeys)
       end
-      
+
       def concat(*columns) #:nodoc:
         "(#{columns.join('||')})"
       end
-      
     end
   end
 end

data/lib/active_record/connection_adapters/oracle_enhanced/database_statements.rb

@@ -220,7 +220,6 @@ module ActiveRecord
             write_lobs(table_name, klass, fixture, klass.lob_columns)
           end
         end
-
       end
     end
   end

data/lib/active_record/connection_adapters/oracle_enhanced/jdbc_connection.rb

@@ -46,13 +46,10 @@ rescue LoadError, NameError
   raise LoadError, "ERROR: ActiveRecord oracle_enhanced adapter could not load Oracle JDBC driver. Please install #{ojdbc_jars ? ojdbc_jars.join(' or ') : "Oracle JDBC"} library."
 end
 
-
 module ActiveRecord
   module ConnectionAdapters
-
     # JDBC database interface for JRuby
     class OracleEnhancedJDBCConnection < OracleEnhancedConnection #:nodoc:
-
       attr_accessor :active
       alias :active? :active
 
@@ -452,7 +449,6 @@ module ActiveRecord
         def close
           @raw_statement.close
         end
-
       end
 
       def select(sql, name = nil, return_column_names = false)
@@ -573,8 +569,6 @@ module ActiveRecord
           end
         end
       end
-
     end
-
   end
 end

data/lib/active_record/connection_adapters/oracle_enhanced/oci_connection.rb

@@ -18,10 +18,8 @@ end
 
 module ActiveRecord
   module ConnectionAdapters
-
     # OCI database interface for MRI
     class OracleEnhancedOCIConnection < OracleEnhancedConnection #:nodoc:
-
       def initialize(config)
         @raw_connection = OCI8EnhancedAutoRecover.new(config, OracleEnhancedOCIFactory)
         # default schema owner
@@ -188,7 +186,6 @@ module ActiveRecord
         def close
           @raw_cursor.close
         end
-
       end
 
       def select(sql, name = nil, return_column_names = false)
@@ -312,7 +309,6 @@ module ActiveRecord
           ::DateTime.civil(year, month, day, hour, min, sec, offset)
         end
       end
-
     end
 
     # The OracleEnhancedOCIFactory factors out the code necessary to connect and
@@ -369,15 +365,10 @@ module ActiveRecord
         conn
       end
     end
-
-
   end
 end
 
-
-
 class OCI8 #:nodoc:
-
   def describe(name)
     info = describe_table(name.to_s)
     raise %Q{"DESC #{name}" failed} if info.nil?
@@ -463,6 +454,5 @@ class OCI8EnhancedAutoRecover < DelegateClass(OCI8) #:nodoc:
       retry
     end
   end
-
 end
 #:startdoc:

data/lib/active_record/connection_adapters/oracle_enhanced/procedures.rb

@@ -2,7 +2,7 @@ require 'active_support'
 
 module ActiveRecord #:nodoc:
   # Custom create, update, delete methods functionality.
-  # 
+  #
   # Example:
   #
   #   class Employee < ActiveRecord::Base

data/lib/active_record/connection_adapters/oracle_enhanced/schema_creation.rb

@@ -44,7 +44,7 @@ module ActiveRecord
         end
 
         def default_tablespace_for(type)
-          (ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[type] || 
+          (ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[type] ||
            ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[native_database_types[type][:name]]) rescue nil
         end
 
@@ -90,7 +90,6 @@ module ActiveRecord
             MSG
           end
         end
-
       end
     end
   end

data/lib/active_record/connection_adapters/oracle_enhanced/schema_definitions.rb

@@ -1,7 +1,6 @@
 module ActiveRecord
   module ConnectionAdapters
     module OracleEnhanced
-
       class ForeignKeyDefinition < ActiveRecord::ConnectionAdapters::ForeignKeyDefinition
         def name
           if options[:name].length > OracleEnhancedAdapter::IDENTIFIER_MAX_LENGTH
@@ -18,7 +17,7 @@ module ActiveRecord
 
       class IndexDefinition < ActiveRecord::ConnectionAdapters::IndexDefinition
         attr_accessor :parameters, :statement_parameters, :tablespace
- 
+
         def initialize(table, name, unique, columns, lengths, orders, where, type, using, parameters, statement_parameters, tablespace)
           @parameters = parameters
           @statement_parameters = statement_parameters
@@ -28,7 +27,6 @@ module ActiveRecord
       end
 
       class ColumnDefinition < ActiveRecord::ConnectionAdapters::ColumnDefinition
-
       end
 
       class TableDefinition < ActiveRecord::ConnectionAdapters::TableDefinition
@@ -65,7 +63,6 @@ module ActiveRecord
         def create_column_definition(name, type)
           OracleEnhanced::ColumnDefinition.new name, type
         end
-
       end
 
       class AlterTable < ActiveRecord::ConnectionAdapters::AlterTable
@@ -86,7 +83,6 @@ module ActiveRecord
           @base.remove_foreign_key(@name, options)
         end
       end
-
     end
   end
 end

data/lib/active_record/connection_adapters/oracle_enhanced/schema_dumper.rb

@@ -2,7 +2,6 @@ module ActiveRecord #:nodoc:
   module ConnectionAdapters #:nodoc:
     module OracleEnhanced #:nodoc:
       module SchemaDumper #:nodoc:
-
         private
 
         def tables(stream)
@@ -198,7 +197,6 @@ module ActiveRecord #:nodoc:
             end
           end
         end
-
       end
     end
   end

data/lib/active_record/connection_adapters/oracle_enhanced/schema_statements.rb

@@ -117,6 +117,14 @@ module ActiveRecord
           super
         end
 
+        def insert_versions_sql(versions) # :nodoc:
+          sm_table = ActiveRecord::Migrator.schema_migrations_table_name
+
+          versions.map { |version|
+            "INSERT INTO #{sm_table} (version) VALUES ('#{version}')"
+          }.join "\n\n/\n\n"
+        end
+
         def initialize_schema_migrations_table
           super
         end
@@ -366,7 +374,7 @@ module ActiveRecord
           if options[:dependent]
             ActiveSupport::Deprecation.warn "`:dependent` option will be deprecated. Please use `:on_delete` option"
           end
-          case options[:dependent]  
+          case options[:dependent]
           when :delete then options[:on_delete] = :cascade
           when :nullify then options[:on_delete] = :nullify
           else
@@ -449,7 +457,7 @@ module ActiveRecord
 
         def create_alter_table(name)
           OracleEnhanced::AlterTable.new create_table_definition(name, false, {})
-        end 
+        end
 
         def tablespace_for(obj_type, tablespace_option, table_name=nil, column_name=nil)
           tablespace_sql = ''
@@ -467,7 +475,6 @@ module ActiveRecord
           (default_tablespaces[type] || default_tablespaces[native_database_types[type][:name]]) rescue nil
         end
 
-
         def column_for(table_name, column_name)
           unless column = columns(table_name).find { |c| c.name == column_name.to_s }
             raise "No such column: #{table_name}.#{column_name}"
@@ -520,7 +527,6 @@ module ActiveRecord
 
           execute("ALTER INDEX #{quote_column_name(index_name)} REBUILD TABLESPACE #{tablespace}")
         end
-
       end
     end
   end

data/lib/active_record/connection_adapters/oracle_enhanced/schema_statements_ext.rb

@@ -54,7 +54,6 @@ module ActiveRecord
               oracle_downcase(row['table_owner']), oracle_downcase(row['table_name']), oracle_downcase(row['db_link']))
           end
         end
-
       end
     end
   end

data/lib/active_record/connection_adapters/oracle_enhanced/structure_dump.rb

@@ -1,7 +1,6 @@
 module ActiveRecord #:nodoc:
   module ConnectionAdapters #:nodoc:
     module OracleEnhancedStructureDump #:nodoc:
-
       # Statements separator used in structure dump to allow loading of structure dump also with SQL*Plus
       STATEMENT_TOKEN = "\n\n/\n\n"
 
@@ -73,7 +72,7 @@ module ActiveRecord #:nodoc:
 
       def structure_dump_primary_key(table) #:nodoc:
         opts = {:name => '', :cols => []}
-        pks = select_all(<<-SQL, "Primary Keys") 
+        pks = select_all(<<-SQL, "Primary Keys")
           SELECT a.constraint_name, a.column_name, a.position
             FROM all_cons_columns a
             JOIN all_constraints c
@@ -92,7 +91,7 @@ module ActiveRecord #:nodoc:
 
       def structure_dump_unique_keys(table) #:nodoc:
         keys = {}
-        uks = select_all(<<-SQL, "Primary Keys") 
+        uks = select_all(<<-SQL, "Primary Keys")
           SELECT a.constraint_name, a.column_name, a.position
             FROM all_cons_columns a
             JOIN all_constraints c
@@ -191,7 +190,6 @@ module ActiveRecord #:nodoc:
         sql
       end
 
-
       # Extract all stored procedures, packages, synonyms and views.
       def structure_dump_db_stored_code #:nodoc:
         structure = []
@@ -215,7 +213,7 @@ module ActiveRecord #:nodoc:
           structure << ddl
         end
 
-        # export views 
+        # export views
         select_all("SELECT view_name, text FROM all_views WHERE owner = SYS_CONTEXT('userenv', 'session_user') ORDER BY view_name ASC").each do |view|
           structure << "CREATE OR REPLACE FORCE VIEW #{view['view_name']} AS\n #{view['text']}"
         end
@@ -298,7 +296,7 @@ module ActiveRecord #:nodoc:
 
       private
 
-      # virtual columns are an 11g feature.  This returns [] if feature is not 
+      # virtual columns are an 11g feature.  This returns [] if feature is not
       # present or none are found.
       # return [{'column_name' => 'FOOS', 'data_default' => '...'}, ...]
       def virtual_columns_for(table)
@@ -336,7 +334,6 @@ module ActiveRecord #:nodoc:
         string << STATEMENT_TOKEN unless string.blank?
         string
       end
-
     end
   end
 end

data/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -46,7 +46,6 @@ end
 
 module ActiveRecord
   class Base
-
     # Specify table columns which should be ignored by ActiveRecord, e.g.:
     #
     #   ignore_table_columns :attribute1, :attribute2
@@ -173,7 +172,6 @@ module ActiveRecord
   end
 
   module ConnectionAdapters #:nodoc:
-
     # Oracle enhanced adapter will work with both
     # Ruby 1.8/1.9 ruby-oci8 gem (which provides interface to Oracle OCI client)
     # or with JRuby and Oracle JDBC driver.
@@ -445,7 +443,7 @@ module ActiveRecord
       end
 
       def arel_visitor # :nodoc:
-        if supports_fetch_first_n_rows_and_offset? && !use_old_oracle_visitor
+        if supports_fetch_first_n_rows_and_offset?
           Arel::Visitors::Oracle12.new(self)
         else
           Arel::Visitors::Oracle.new(self)
@@ -477,7 +475,7 @@ module ActiveRecord
       end
 
       def supports_fetch_first_n_rows_and_offset?
-        if @connection.database_version == [12,1]
+        if !use_old_oracle_visitor && @connection.database_version == [12,1]
           true
         else
           false
@@ -767,7 +765,6 @@ module ActiveRecord
         data_sources
       end
 
-
       def data_sources
         select_values(
         "SELECT DECODE(table_name, UPPER(table_name), LOWER(table_name), table_name) FROM all_tables WHERE owner = SYS_CONTEXT('userenv', 'current_schema') AND secondary = 'N'",
@@ -1306,7 +1303,6 @@ module ActiveRecord
           @logger.debug "DBMS_OUTPUT: #{result[:line]}" if @logger
         end
       end
-
     end
   end
 end

data/lib/active_record/oracle_enhanced/type/boolean.rb

@@ -15,7 +15,6 @@ module ActiveRecord
             !FALSE_VALUES.include?(value)
           end
         end
-
       end
     end
   end

data/lib/active_record/oracle_enhanced/type/integer.rb

@@ -1,5 +1,5 @@
 #TODO Need to consider namespace change since paremt class moved to ActiveModel
-module ActiveRecord 
+module ActiveRecord
   module OracleEnhanced
     module Type
       class Integer < ActiveModel::Type::Integer # :nodoc:

data/lib/active_record/oracle_enhanced/type/national_character_string.rb

@@ -4,7 +4,6 @@ module ActiveRecord
   module OracleEnhanced
     module Type
       class NationalCharacterString < ActiveRecord::OracleEnhanced::Type::String # :nodoc:
-
         def serialize(value)
           return unless value
           Data.new(super)

data/lib/active_record/oracle_enhanced/type/raw.rb

@@ -18,7 +18,6 @@ module ActiveRecord
             value.map { |x| "%02X" % x }.join
           end
         end
-
       end
     end
   end

data/lib/active_record/oracle_enhanced/type/string.rb

@@ -21,7 +21,6 @@ module ActiveRecord
             super
           end
         end
-
       end
     end
   end

data/lib/active_record/oracle_enhanced/type/text.rb

@@ -4,7 +4,6 @@ module ActiveRecord
   module OracleEnhanced
     module Type
       class Text < ActiveModel::Type::Text # :nodoc:
-
         def changed_in_place?(raw_old_value, new_value)
           #TODO: Needs to find a way not to cast here.
           raw_old_value = cast(raw_old_value)
@@ -25,7 +24,6 @@ module ActiveRecord
             @value
           end
         end
-
       end
     end
   end

data/lib/activerecord-oracle_enhanced-adapter.rb

@@ -15,7 +15,6 @@ if defined?(Rails)
           end
 
         end
-
       end
     end
   end

data/spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb

@@ -283,7 +283,6 @@ describe "OracleEnhancedAdapter" do
 
   end
 
-
   describe "reserved words column quoting" do
 
     before(:all) do

data/spec/active_record/connection_adapters/oracle_enhanced_connection_spec.rb

@@ -111,9 +111,11 @@ describe "OracleEnhancedConnection" do
   end
 
   describe "default_timezone" do
+    include SchemaSpecHelper
+
     before(:all) do
       ActiveRecord::Base.establish_connection(CONNECTION_WITH_TIMEZONE_PARAMS)
-      ActiveRecord::Schema.define do
+      schema_define do
         create_table :posts, :force => true do |t|
           t.timestamps null: false
         end

data/spec/active_record/connection_adapters/oracle_enhanced_cpk_spec.rb

@@ -64,7 +64,7 @@ describe "OracleEnhancedAdapter composite_primary_keys support" do
     before(:all) do
       schema_define do
         create_table  :cpk_write_lobs_test, :primary_key => [:type_category, :date_value], :force => true do |t|
-          t.string  :type_category, :limit => 15, :null => false  
+          t.string  :type_category, :limit => 15, :null => false
           t.date    :date_value, :null => false
           t.text    :results, :null => false
           t.timestamps null: true
@@ -83,7 +83,7 @@ describe "OracleEnhancedAdapter composite_primary_keys support" do
         set_table_name 'non_cpk_write_lobs_test'
       end
     end
-    
+
     after(:all) do
       schema_define do
         drop_table :cpk_write_lobs_test
@@ -98,14 +98,14 @@ describe "OracleEnhancedAdapter composite_primary_keys support" do
         CpkWriteLobsTest.create(:type_category => 'AAA', :date_value => Date.today, :results => 'DATA '*10)
       }.not_to raise_error
     end
-    
+
     it "should create new record in table without CPK and with LOB" do
       expect {
         NonCpkWriteLobsTest.create(:date_value => Date.today, :results => 'DATA '*10)
       }.not_to raise_error
     end
   end
-  
+
   # Other testing was done based on composite_primary_keys tests
 
 end

data/spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb

@@ -171,7 +171,7 @@ describe "OracleEnhancedAdapter integer type detection based on column names" do
         INCREMENT BY 1 START WITH 10040 CACHE 20 NOORDER NOCYCLE
     SQL
   end
-  
+
   after(:all) do
     @conn.execute "DROP TABLE test2_employees"
     @conn.execute "DROP SEQUENCE test2_employees_seq"
@@ -182,7 +182,7 @@ describe "OracleEnhancedAdapter integer type detection based on column names" do
       class ::Test2Employee < ActiveRecord::Base
       end
     end
-    
+
     after(:each) do
       Object.send(:remove_const, "Test2Employee")
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_booleans = true
@@ -440,10 +440,12 @@ describe "OracleEnhancedAdapter boolean type detection based on string column ty
 end
 
 describe "OracleEnhancedAdapter boolean support when emulate_booleans_from_strings = true" do
+  include SchemaSpecHelper
+
   before(:all) do
     ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_booleans_from_strings = true
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
-    ActiveRecord::Schema.define do
+    schema_define do
       create_table :posts, :force => true do |t|
         t.string  :name,        null: false
         t.boolean :is_default, default: false
@@ -559,7 +561,6 @@ describe "OracleEnhancedAdapter timestamp with timezone support" do
 
 end
 
-
 describe "OracleEnhancedAdapter date and timestamp with different NLS date formats" do
   before(:all) do
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
@@ -818,7 +819,7 @@ describe "OracleEnhancedAdapter assign string to :date and :datetime columns" do
     @employee.reload
     expect(@employee.last_login_at).to eq(@today.to_time)
   end
-  
+
 end
 
 describe "OracleEnhancedAdapter handling of CLOB columns" do
@@ -941,7 +942,6 @@ describe "OracleEnhancedAdapter handling of CLOB columns" do
     expect(@employee.comments).to be_nil
   end
 
-
   it "should create record with CLOB data" do
     @employee = TestEmployee.create!(
       :first_name => "First",
@@ -1321,7 +1321,6 @@ describe "OracleEnhancedAdapter handling of RAW columns" do
   end
 end
 
-
 describe "OracleEnhancedAdapter quoting of NCHAR and NVARCHAR2 columns" do
   before(:all) do
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
@@ -1403,7 +1402,7 @@ describe "OracleEnhancedAdapter handling of BINARY_FLOAT columns" do
         INCREMENT BY 1 START WITH 10040 CACHE 20 NOORDER NOCYCLE
     SQL
   end
-  
+
   after(:all) do
     @conn.execute "DROP TABLE test2_employees"
     @conn.execute "DROP SEQUENCE test2_employees_seq"

data/spec/active_record/connection_adapters/oracle_enhanced_database_tasks_spec.rb

@@ -90,4 +90,3 @@ describe "Oracle Enhanced adapter database tasks" do
     after { ActiveRecord::Base.connection.execute "DROP TABLE test_posts" rescue nil }
   end
 end
-

data/spec/active_record/connection_adapters/oracle_enhanced_dbms_output_spec.rb

@@ -51,7 +51,7 @@ describe "OracleEnhancedAdapter logging dbms_output from plsql" do
     @conn.enable_dbms_output
 
     expect(@conn.select_all("select more_than_five_characters_long('hi there') is_it_long from dual").to_a).to eq([{'is_it_long'=>1}])
-    
+
     expect(@logger.output(:debug)).to match(/^DBMS_OUTPUT: before the if -hi there-$/)
     expect(@logger.output(:debug)).to match(/^DBMS_OUTPUT: it is longer than 5$/)
     expect(@logger.output(:debug)).to match(/^DBMS_OUTPUT: about to return: 1$/)
@@ -61,7 +61,7 @@ describe "OracleEnhancedAdapter logging dbms_output from plsql" do
     @conn.enable_dbms_output
 
     expect(@conn.select_all("select more_than_five_characters_long('short') is_it_long from dual").to_a).to eq([{'is_it_long'=>0}])
-    
+
     expect(@logger.output(:debug)).to match(/^DBMS_OUTPUT: before the if -short-$/)
     expect(@logger.output(:debug)).to match(/^DBMS_OUTPUT: it is 5 or shorter$/)
     expect(@logger.output(:debug)).to match(/^DBMS_OUTPUT: about to return: 0$/)

data/spec/active_record/connection_adapters/oracle_enhanced_dirty_spec.rb

@@ -27,13 +27,13 @@ if ActiveRecord::Base.method_defined?(:changed?)
       class TestEmployee < ActiveRecord::Base
       end
     end
-  
+
     after(:all) do
       Object.send(:remove_const, "TestEmployee")
       @conn.execute "DROP TABLE test_employees"
       @conn.execute "DROP SEQUENCE test_employees_seq"
       ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
-    end  
+    end
 
     it "should not mark empty string (stored as NULL) as changed when reassigning it" do
       @employee = TestEmployee.create!(:first_name => '')
@@ -111,7 +111,7 @@ if ActiveRecord::Base.method_defined?(:changed?)
       @employee = TestEmployee.new
       @employee.job_id = 0
       expect(@employee.save!).to be_truthy
-      
+
       expect(@employee).not_to be_changed
 
       @employee.job_id = '0'

data/spec/active_record/connection_adapters/oracle_enhanced_procedures_spec.rb

@@ -4,7 +4,7 @@ require 'ruby-plsql'
 
 describe "OracleEnhancedAdapter custom methods for create, update and destroy" do
   include LoggerSpecHelper
-  
+
   before(:all) do
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
     @conn = ActiveRecord::Base.connection
@@ -67,7 +67,7 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
           VALUES (p_employee_id, p_first_name, p_last_name, p_hire_date, p_salary, p_description,
                                       1, SYSDATE, SYSDATE);
         END create_employee;
-        
+
         PROCEDURE update_employee(
             p_employee_id   NUMBER,
             p_first_name    VARCHAR2,
@@ -85,7 +85,7 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
               version = v_version + 1, update_time = SYSDATE
           WHERE employee_id = p_employee_id;
         END update_employee;
-        
+
         PROCEDURE delete_employee(
             p_employee_id   NUMBER)
         IS
@@ -111,7 +111,7 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
       self.primary_key = :employee_id
 
       validates_presence_of :first_name, :last_name, :hire_date
-      
+
       # should return ID of new record
       set_create_method do
         plsql.test_employees_pkg.create_employee(
@@ -372,5 +372,5 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
     expect(@employee.save).to be_falsey
     expect(@employee.errors[:first_name]).not_to be_blank
   end
-  
+
 end

data/spec/active_record/connection_adapters/oracle_enhanced_schema_dump_spec.rb

@@ -77,6 +77,7 @@ describe "OracleEnhancedAdapter schema dump" do
     after(:each) do
       drop_test_posts_table
       @conn.drop_table(ActiveRecord::Migrator.schema_migrations_table_name) if @conn.table_exists?(ActiveRecord::Migrator.schema_migrations_table_name)
+      @conn.drop_table(ActiveRecord::InternalMetadata.table_name) if @conn.table_exists?(ActiveRecord::InternalMetadata.table_name)
       ActiveRecord::Base.table_name_prefix = ''
       ActiveRecord::Base.table_name_suffix = ''
     end
@@ -234,7 +235,7 @@ describe "OracleEnhancedAdapter schema dump" do
       dump = standard_dump
       expect(dump.rindex("create_table")).to be < dump.index("add_foreign_key")
     end
- 
+
     it "should include primary_key when reference column name is not 'id'" do
       schema_define do
         create_table :test_posts, force: true, :primary_key => 'baz_id' do |t|
@@ -253,7 +254,7 @@ describe "OracleEnhancedAdapter schema dump" do
 
       expect(standard_dump).to match(/add_foreign_key "test_comments", "test_posts", column: "baz_id", primary_key: "baz_id", name: "test_comments_baz_id_fk"/)
     end
-    
+
   end
 
   describe "synonyms" do
@@ -415,7 +416,7 @@ describe "OracleEnhancedAdapter schema dump" do
     context "with index on virtual column" do
       before(:all) do
         if @oracle11g_or_higher
-          schema_define do 
+          schema_define do
             add_index 'test_names', 'field_with_leading_space', :name => "index_on_virtual_col"
           end
         end

data/spec/active_record/connection_adapters/oracle_enhanced_structure_dump_spec.rb

@@ -22,9 +22,9 @@ describe "OracleEnhancedAdapter structure dump" do
       end
       TestPost.table_name = "test_posts"
     end
-  
+
     after(:each) do
-      @conn.drop_table :test_posts 
+      @conn.drop_table :test_posts
       @conn.drop_table :foos
       @conn.execute "DROP SEQUENCE test_posts_seq" rescue nil
       @conn.execute "ALTER TABLE test_posts drop CONSTRAINT fk_test_post_foo" rescue nil
@@ -40,12 +40,12 @@ describe "OracleEnhancedAdapter structure dump" do
       @conn.execute "DROP VIEW test_posts_view_z" rescue nil
       @conn.execute "DROP VIEW test_posts_view_a" rescue nil
     end
-  
+
     it "should dump single primary key" do
       dump = ActiveRecord::Base.connection.structure_dump
       expect(dump).to match(/CONSTRAINT (.+) PRIMARY KEY \(ID\)\n/)
     end
-  
+
     it "should dump composite primary keys" do
       pk = @conn.send(:select_one, <<-SQL)
         select constraint_name from user_constraints where table_name = 'TEST_POSTS' and constraint_type='P'
@@ -60,43 +60,43 @@ describe "OracleEnhancedAdapter structure dump" do
       dump = ActiveRecord::Base.connection.structure_dump
       expect(dump).to match(/CONSTRAINT (.+) PRIMARY KEY \(ID,TITLE\)\n/)
     end
-  
+
     it "should dump foreign keys" do
       @conn.execute <<-SQL
-        ALTER TABLE TEST_POSTS 
+        ALTER TABLE TEST_POSTS
         ADD CONSTRAINT fk_test_post_foo FOREIGN KEY (foo_id) REFERENCES foos(id)
       SQL
       dump = ActiveRecord::Base.connection.structure_dump_fk_constraints
       expect(dump.split('\n').length).to eq(1)
       expect(dump).to match(/ALTER TABLE \"?TEST_POSTS\"? ADD CONSTRAINT \"?FK_TEST_POST_FOO\"? FOREIGN KEY \(\"?FOO_ID\"?\) REFERENCES \"?FOOS\"?\(\"?ID\"?\)/i)
     end
-    
+
     it "should dump foreign keys when reference column name is not 'id'" do
       @conn.add_column :foos, :baz_id, :integer
-      
+
       @conn.execute <<-SQL
-        ALTER TABLE FOOS 
+        ALTER TABLE FOOS
         ADD CONSTRAINT UK_BAZ UNIQUE (BAZ_ID)
       SQL
-      
+
       @conn.add_column :test_posts, :baz_id, :integer
-      
+
       @conn.execute <<-SQL
-        ALTER TABLE TEST_POSTS 
+        ALTER TABLE TEST_POSTS
         ADD CONSTRAINT fk_test_post_baz FOREIGN KEY (baz_id) REFERENCES foos(baz_id)
       SQL
-      
+
       dump = ActiveRecord::Base.connection.structure_dump_fk_constraints
       expect(dump.split('\n').length).to eq(1)
       expect(dump).to match(/ALTER TABLE \"?TEST_POSTS\"? ADD CONSTRAINT \"?FK_TEST_POST_BAZ\"? FOREIGN KEY \(\"?BAZ_ID\"?\) REFERENCES \"?FOOS\"?\(\"?BAZ_ID\"?\)/i)
     end
-    
+
     it "should not error when no foreign keys are present" do
       dump = ActiveRecord::Base.connection.structure_dump_fk_constraints
       expect(dump.split('\n').length).to eq(0)
       expect(dump).to eq('')
     end
-  
+
     it "should dump triggers" do
       @conn.execute <<-SQL
         create or replace TRIGGER TEST_POST_TRIGGER
@@ -110,7 +110,7 @@ describe "OracleEnhancedAdapter structure dump" do
       dump = ActiveRecord::Base.connection.structure_dump_db_stored_code.gsub(/\n|\s+/,' ')
       expect(dump).to match(/CREATE OR REPLACE TRIGGER TEST_POST_TRIGGER/)
     end
-  
+
     it "should dump types" do
       @conn.execute <<-SQL
         create or replace TYPE TEST_TYPE AS TABLE OF VARCHAR2(10);
@@ -125,7 +125,7 @@ describe "OracleEnhancedAdapter structure dump" do
       dump = ActiveRecord::Base.connection.structure_dump_db_stored_code.gsub(/\n|\s+/,' ')
       expect(dump).to match(/CREATE OR REPLACE FORCE VIEW TEST_POSTS_VIEW_A.*CREATE OR REPLACE FORCE VIEW TEST_POSTS_VIEW_Z/)
     end
-  
+
     it "should dump virtual columns" do
       skip "Not supported in this database version" unless @oracle11g_or_higher
       @conn.execute <<-SQL
@@ -159,20 +159,20 @@ describe "OracleEnhancedAdapter structure dump" do
       SQL
       dump = ActiveRecord::Base.connection.structure_dump_unique_keys("test_posts")
       expect(dump).to eq(["ALTER TABLE TEST_POSTS ADD CONSTRAINT UK_FOO_FOO_ID UNIQUE (FOO,FOO_ID)"])
-    
+
       dump = ActiveRecord::Base.connection.structure_dump
       expect(dump).to match(/CONSTRAINT UK_FOO_FOO_ID UNIQUE \(FOO,FOO_ID\)/)
     end
-  
+
     it "should dump indexes" do
       ActiveRecord::Base.connection.add_index(:test_posts, :foo, :name => :ix_test_posts_foo)
       ActiveRecord::Base.connection.add_index(:test_posts, :foo_id, :name => :ix_test_posts_foo_id, :unique => true)
-      
+
       @conn.execute <<-SQL
         ALTER TABLE test_posts
           add CONSTRAINT uk_foo_foo_id UNIQUE (foo, foo_id)
       SQL
-      
+
       dump = ActiveRecord::Base.connection.structure_dump
       expect(dump).to match(/CREATE UNIQUE INDEX "?IX_TEST_POSTS_FOO_ID"? ON "?TEST_POSTS"? \("?FOO_ID"?\)/i)
       expect(dump).to match(/CREATE  INDEX "?IX_TEST_POSTS_FOO\"? ON "?TEST_POSTS"? \("?FOO"?\)/i)
@@ -260,11 +260,11 @@ describe "OracleEnhancedAdapter structure dump" do
 
     it "should return the character size of nvarchar fields" do
       if /.*unq_nvarchar nvarchar2\((\d+)\).*/ =~ @conn.structure_dump
-         expect("#$1").to eq("255")
+        expect("#$1").to eq("255")
       end
     end
   end
-  
+
   describe "temp_table_drop" do
     before(:each) do
       @conn.create_table :temp_tbl, :temporary => true do |t|
@@ -280,13 +280,43 @@ describe "OracleEnhancedAdapter structure dump" do
       expect(dump).not_to match(/DROP TABLE "?NOT_TEMP_TBL"?/i)
     end
     after(:each) do
-      @conn.drop_table :temp_tbl 
+      @conn.drop_table :temp_tbl
       @conn.drop_table :not_temp_tbl
     end
   end
-  
+
+  describe "schema migrations" do
+    let(:versions) do
+      (1..10).map do |i|
+        Time.parse("2016.01.#{i}").strftime("%Y%m%d%H%M%S")
+      end
+    end
+    before do
+      ActiveRecord::SchemaMigration.reset_table_name
+      ActiveRecord::SchemaMigration.create_table
+      versions.each do |i|
+        ActiveRecord::SchemaMigration.create!(:version => i)
+      end
+    end
+    let(:dump) { ActiveRecord::Base.connection.dump_schema_information }
+    it "should dump schema migrations one version per insert" do
+      versions[0...-1].each do |i|
+        expect(dump).to include "INSERT INTO schema_migrations (version) VALUES ('#{i}')\n\n/\n"
+      end
+    end
+    it "should not add own separator or newline" do
+      expect(dump).to match(/INSERT INTO schema_migrations \(version\) VALUES \('#{versions.last}'\)\z/)
+    end
+    it "should contain expected amount of lines" do
+      expect(dump.lines.length).to eq(4 * (versions.length - 1) + 1)
+    end
+    after do
+      ActiveRecord::SchemaMigration.drop_table
+    end
+  end
+
   describe "full drop" do
-    before(:each) do 
+    before(:each) do
       @conn.create_table :full_drop_test do |t|
         t.string :foo
       end
@@ -308,7 +338,7 @@ describe "OracleEnhancedAdapter structure dump" do
         end test_package;
       SQL
       @conn.execute <<-SQL
-        create or replace package body full_drop_test_package as 
+        create or replace package body full_drop_test_package as
           function test_func return varchar2 is
             begin
               return ('foo');
@@ -318,10 +348,10 @@ describe "OracleEnhancedAdapter structure dump" do
       #function
       @conn.execute <<-SQL
         create or replace function full_drop_test_function
-          return varchar2 
+          return varchar2
         is
           foo varchar2(3);
-        begin 
+        begin
           return('foo');
         end;
       SQL

data/spec/spec_helper.rb

@@ -103,7 +103,6 @@ module LoggerSpecHelper
   def wait
     @notifier.wait if @notifier
   end
-
 end
 
 module SchemaSpecHelper

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version
-  version: 1.7.7
+  version: 1.7.8
 platform: ruby
 authors:
 - Raimonds Simanovskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-15 00:00:00.000000000 Z
+date: 2016-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Oracle enhanced adapter for ActiveRecord