activerecord-oracle_enhanced-adapter 1.7.11 → 1.8.0.beta1

data/spec/active_record/connection_adapters/oracle_enhanced_structure_dump_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe "OracleEnhancedAdapter structure dump" do
   include LoggerSpecHelper
 
@@ -11,7 +9,7 @@ describe "OracleEnhancedAdapter structure dump" do
   end
   describe "structure dump" do
     before(:each) do
-      @conn.create_table :test_posts, :force => true do |t|
+      @conn.create_table :test_posts, force: true do |t|
         t.string      :title
         t.string      :foo
         t.integer     :foo_id
@@ -94,7 +92,7 @@ describe "OracleEnhancedAdapter structure dump" do
     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('')
+      expect(dump).to eq("")
     end
 
     it "should dump triggers" do
@@ -107,7 +105,7 @@ describe "OracleEnhancedAdapter structure dump" do
           SELECT 'bar' INTO :new.FOO FROM DUAL;
         END;
       SQL
-      dump = ActiveRecord::Base.connection.structure_dump_db_stored_code.gsub(/\n|\s+/,' ')
+      dump = ActiveRecord::Base.connection.structure_dump_db_stored_code.gsub(/\n|\s+/, " ")
       expect(dump).to match(/CREATE OR REPLACE TRIGGER TEST_POST_TRIGGER/)
     end
 
@@ -115,14 +113,14 @@ describe "OracleEnhancedAdapter structure dump" do
       @conn.execute <<-SQL
         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 = ActiveRecord::Base.connection.structure_dump_db_stored_code.gsub(/\n|\s+/, " ")
       expect(dump).to match(/CREATE OR REPLACE TYPE TEST_TYPE/)
     end
 
     it "should dump views" do
       @conn.execute "create or replace VIEW test_posts_view_z as select * from test_posts"
       @conn.execute "create or replace VIEW test_posts_view_a as select * from test_posts_view_z"
-      dump = ActiveRecord::Base.connection.structure_dump_db_stored_code.gsub(/\n|\s+/,' ')
+      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
 
@@ -165,8 +163,8 @@ describe "OracleEnhancedAdapter structure dump" do
     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)
+      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
@@ -180,7 +178,7 @@ describe "OracleEnhancedAdapter structure dump" do
     end
 
     it "should dump multi-value and function value indexes" do
-      ActiveRecord::Base.connection.add_index(:test_posts, [:foo, :foo_id], :name => :ix_test_posts_foo_foo_id)
+      ActiveRecord::Base.connection.add_index(:test_posts, [:foo, :foo_id], name: :ix_test_posts_foo_foo_id)
 
       @conn.execute <<-SQL
         CREATE INDEX "IX_TEST_POSTS_FUNCTION" ON "TEST_POSTS" (TO_CHAR(LENGTH("FOO"))||"FOO")
@@ -207,28 +205,28 @@ describe "OracleEnhancedAdapter structure dump" do
       comment_sql = %Q(COMMENT ON TABLE "TEST_POSTS" IS 'Test posts with ''some'' "quotes"')
       @conn.execute comment_sql
       dump = ActiveRecord::Base.connection.structure_dump
-      dump.should =~ /#{comment_sql}/
+      expect(dump).to match(/#{comment_sql}/)
     end
 
     it "should dump column comments" do
       comment_sql = %Q(COMMENT ON COLUMN "TEST_POSTS"."TITLE" IS 'The title of the post with ''some'' "quotes"')
       @conn.execute comment_sql
       dump = ActiveRecord::Base.connection.structure_dump
-      dump.should =~ /#{comment_sql}/
+      expect(dump).to match(/#{comment_sql}/)
     end
 
     it "should dump table comments" do
       comment_sql = %Q(COMMENT ON TABLE "TEST_POSTS" IS 'Test posts with ''some'' "quotes"')
       @conn.execute comment_sql
       dump = ActiveRecord::Base.connection.structure_dump
-      dump.should =~ /#{comment_sql}/
+      expect(dump).to match(/#{comment_sql}/)
     end
 
     it "should dump column comments" do
       comment_sql = %Q(COMMENT ON COLUMN "TEST_POSTS"."TITLE" IS 'The title of the post with ''some'' "quotes"')
       @conn.execute comment_sql
       dump = ActiveRecord::Base.connection.structure_dump
-      dump.should =~ /#{comment_sql}/
+      expect(dump).to match(/#{comment_sql}/)
     end
 
   end
@@ -237,7 +235,7 @@ describe "OracleEnhancedAdapter structure dump" do
       @conn.drop_table :test_comments rescue nil
     end
     it "should dump correctly" do
-      @conn.create_table :test_comments, :temporary => true, :id => false do |t|
+      @conn.create_table :test_comments, temporary: true, id: false do |t|
         t.integer :post_id
       end
       dump = ActiveRecord::Base.connection.structure_dump
@@ -267,7 +265,7 @@ describe "OracleEnhancedAdapter structure dump" do
 
   describe "temp_table_drop" do
     before(:each) do
-      @conn.create_table :temp_tbl, :temporary => true do |t|
+      @conn.create_table :temp_tbl, temporary: true do |t|
         t.string :foo
       end
       @conn.create_table :not_temp_tbl do |t|
@@ -298,7 +296,7 @@ describe "OracleEnhancedAdapter structure dump" do
       ActiveRecord::SchemaMigration.reset_table_name
       ActiveRecord::SchemaMigration.create_table
       versions.each do |i|
-        ActiveRecord::SchemaMigration.create!(:version => i)
+        ActiveRecord::SchemaMigration.create!(version: i)
       end
     end
 
@@ -347,7 +345,7 @@ describe "OracleEnhancedAdapter structure dump" do
       @conn.create_table :full_drop_test do |t|
         t.string :foo
       end
-      @conn.create_table :full_drop_test_temp, :temporary => true do |t|
+      @conn.create_table :full_drop_test_temp, temporary: true do |t|
         t.string :foo
       end
       #view

data/spec/spec_helper.rb

@@ -1,41 +1,43 @@
+require "simplecov"
+SimpleCov.start
 require "rubygems"
 require "bundler"
 require "yaml"
 Bundler.setup(:default, :development)
 
-$:.unshift(File.expand_path('../../lib', __FILE__))
-config_path = File.expand_path('../spec_config.yaml', __FILE__)
+$:.unshift(File.expand_path("../../lib", __FILE__))
+config_path = File.expand_path("../spec_config.yaml", __FILE__)
 if File.exist?(config_path)
   puts "==> Loading config from #{config_path}"
   config = YAML.load_file(config_path)
 else
   puts "==> Loading config from ENV or use default"
-  config = {"rails" => {}, "database" => {}}
+  config = { "rails" => {}, "database" => {} }
 end
 
-require 'rspec'
+require "rspec"
 
-if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby'
+if !defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby"
   puts "==> Running specs with MRI version #{RUBY_VERSION}"
-  require 'oci8'
-elsif RUBY_ENGINE == 'jruby'
+  require "oci8"
+elsif RUBY_ENGINE == "jruby"
   puts "==> Running specs with JRuby version #{JRUBY_VERSION}"
 end
 
 NO_COMPOSITE_PRIMARY_KEYS = true
 
-require 'active_record'
+require "active_record"
 
-require 'active_support/core_ext/module/attribute_accessors'
-require 'active_support/core_ext/class/attribute_accessors'
+require "active_support/core_ext/module/attribute_accessors"
+require "active_support/core_ext/class/attribute_accessors"
 
 require "active_support/log_subscriber"
-require 'active_record/log_subscriber'
+require "active_record/log_subscriber"
 
-require 'logger'
+require "logger"
 
-require 'active_record/connection_adapters/oracle_enhanced_adapter'
-require 'ruby-plsql'
+require "active_record/connection_adapters/oracle_enhanced_adapter"
+require "ruby-plsql"
 
 puts "==> Effective ActiveRecord version #{ActiveRecord::VERSION::STRING}"
 
@@ -61,7 +63,7 @@ module LoggerSpecHelper
 
     def initialize
       @flush_count = 0
-      @logged = Hash.new { |h,k| h[k] = [] }
+      @logged = Hash.new { |h, k| h[k] = [] }
     end
 
     # used in AtiveRecord 2.x
@@ -115,66 +117,66 @@ module SchemaSpecHelper
   end
 end
 
-DATABASE_NAME         = config["database"]["name"]         || ENV['DATABASE_NAME']         || 'orcl'
-DATABASE_HOST         = config["database"]["host"]         || ENV['DATABASE_HOST']         || "127.0.0.1"
-DATABASE_PORT         = config["database"]["port"]         || ENV['DATABASE_PORT']         || 1521
-DATABASE_USER         = config["database"]["user"]         || ENV['DATABASE_USER']         || 'oracle_enhanced'
-DATABASE_PASSWORD     = config["database"]["password"]     || ENV['DATABASE_PASSWORD']     || 'oracle_enhanced'
-DATABASE_SCHEMA       = config["database"]["schema"]       || ENV['DATABASE_SCHEMA']       || 'oracle_enhanced_schema'
-DATABASE_SYS_PASSWORD = config["database"]["sys_password"] || ENV['DATABASE_SYS_PASSWORD'] || 'admin'
+DATABASE_NAME         = config["database"]["name"]         || ENV["DATABASE_NAME"]         || "orcl"
+DATABASE_HOST         = config["database"]["host"]         || ENV["DATABASE_HOST"]         || "127.0.0.1"
+DATABASE_PORT         = config["database"]["port"]         || ENV["DATABASE_PORT"]         || 1521
+DATABASE_USER         = config["database"]["user"]         || ENV["DATABASE_USER"]         || "oracle_enhanced"
+DATABASE_PASSWORD     = config["database"]["password"]     || ENV["DATABASE_PASSWORD"]     || "oracle_enhanced"
+DATABASE_SCHEMA       = config["database"]["schema"]       || ENV["DATABASE_SCHEMA"]       || "oracle_enhanced_schema"
+DATABASE_SYS_PASSWORD = config["database"]["sys_password"] || ENV["DATABASE_SYS_PASSWORD"] || "admin"
 
 CONNECTION_PARAMS = {
-  :adapter => "oracle_enhanced",
-  :database => DATABASE_NAME,
-  :host => DATABASE_HOST,
-  :port => DATABASE_PORT,
-  :username => DATABASE_USER,
-  :password => DATABASE_PASSWORD
+  adapter: "oracle_enhanced",
+  database: DATABASE_NAME,
+  host: DATABASE_HOST,
+  port: DATABASE_PORT,
+  username: DATABASE_USER,
+  password: DATABASE_PASSWORD
 }
 
 CONNECTION_WITH_SCHEMA_PARAMS = {
-  :adapter => "oracle_enhanced",
-  :database => DATABASE_NAME,
-  :host => DATABASE_HOST,
-  :port => DATABASE_PORT,
-  :username => DATABASE_USER,
-  :password => DATABASE_PASSWORD,
-  :schema => DATABASE_SCHEMA
+  adapter: "oracle_enhanced",
+  database: DATABASE_NAME,
+  host: DATABASE_HOST,
+  port: DATABASE_PORT,
+  username: DATABASE_USER,
+  password: DATABASE_PASSWORD,
+  schema: DATABASE_SCHEMA
 }
 
 CONNECTION_WITH_TIMEZONE_PARAMS = {
-  :adapter => "oracle_enhanced",
-  :database => DATABASE_NAME,
-  :host => DATABASE_HOST,
-  :port => DATABASE_PORT,
-  :username => DATABASE_USER,
-  :password => DATABASE_PASSWORD,
-  :time_zone => "Europe/Riga"
+  adapter: "oracle_enhanced",
+  database: DATABASE_NAME,
+  host: DATABASE_HOST,
+  port: DATABASE_PORT,
+  username: DATABASE_USER,
+  password: DATABASE_PASSWORD,
+  time_zone: "Europe/Riga"
 }
 
 SYS_CONNECTION_PARAMS = {
-  :adapter => "oracle_enhanced",
-  :database => DATABASE_NAME,
-  :host => DATABASE_HOST,
-  :port => DATABASE_PORT,
-  :username => "sys",
-  :password => DATABASE_SYS_PASSWORD,
-  :privilege => "SYSDBA"
+  adapter: "oracle_enhanced",
+  database: DATABASE_NAME,
+  host: DATABASE_HOST,
+  port: DATABASE_PORT,
+  username: "sys",
+  password: DATABASE_SYS_PASSWORD,
+  privilege: "SYSDBA"
 }
 
 SYSTEM_CONNECTION_PARAMS = {
-  :adapter => "oracle_enhanced",
-  :database => DATABASE_NAME,
-  :host => DATABASE_HOST,
-  :port => DATABASE_PORT,
-  :username => "system",
-  :password => DATABASE_SYS_PASSWORD
+  adapter: "oracle_enhanced",
+  database: DATABASE_NAME,
+  host: DATABASE_HOST,
+  port: DATABASE_PORT,
+  username: "system",
+  password: DATABASE_SYS_PASSWORD
 }
 
-DATABASE_NON_DEFAULT_TABLESPACE = config["database"]["non_default_tablespace"] || ENV['DATABASE_NON_DEFAULT_TABLESPACE'] || "SYSTEM"
+DATABASE_NON_DEFAULT_TABLESPACE = config["database"]["non_default_tablespace"] || ENV["DATABASE_NON_DEFAULT_TABLESPACE"] || "SYSTEM"
 
 # set default time zone in TZ environment variable
 # which will be used to set session time zone
-ENV['TZ'] ||= config["timezone"] || 'Europe/Riga'
+ENV["TZ"] ||= config["timezone"] || "Europe/Riga"
 
 # ActiveRecord::Base.logger = Logger.new(STDOUT)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version
-  version: 1.7.11
+  version: 1.8.0.beta1
 platform: ruby
 authors:
 - Raimonds Simanovskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2016-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.1.0.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.1.0.beta
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: ruby-plsql
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0'
 description: |
   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.
@@ -130,10 +130,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Oracle enhanced adapter for ActiveRecord