activerecord-oracle_enhanced-adapter 5.2.8 → 7.0.3

data/spec/active_record/connection_adapters/oracle_enhanced/context_index_spec.rb

@@ -131,10 +131,10 @@ describe "OracleEnhancedAdapter context index" do
       @post = Post.create(title: "abc", body: "def")
       expect(Post.contains(:all_text, "abc").to_a).to eq([@post])
       expect(Post.contains(:all_text, "def").to_a).to eq([@post])
-      @post.update_attributes!(title: "ghi")
+      @post.update!(title: "ghi")
       # index will not be updated as all_text column is not changed
       expect(Post.contains(:all_text, "ghi").to_a).to be_empty
-      @post.update_attributes!(all_text: "1")
+      @post.update!(all_text: "1")
       # index will be updated when all_text column is changed
       expect(Post.contains(:all_text, "ghi").to_a).to eq([@post])
       @conn.remove_context_index :posts, index_column: :all_text
@@ -147,7 +147,7 @@ describe "OracleEnhancedAdapter context index" do
       @post = Post.create(title: "abc", body: "def")
       expect(Post.contains(:all_text, "abc").to_a).to eq([@post])
       expect(Post.contains(:all_text, "def").to_a).to eq([@post])
-      @post.update_attributes!(title: "ghi")
+      @post.update!(title: "ghi")
       # index should be updated as created_at column is changed
       expect(Post.contains(:all_text, "ghi").to_a).to eq([@post])
       @conn.remove_context_index :posts, index_column: :all_text
@@ -168,7 +168,7 @@ describe "OracleEnhancedAdapter context index" do
       Post.transaction do
         @post = Post.create(title: "abc")
         expect(Post.contains(:title, "abc").to_a).to eq([@post])
-        @post.update_attributes!(title: "ghi")
+        @post.update!(title: "ghi")
         expect(Post.contains(:title, "ghi").to_a).to eq([@post])
       end
       @conn.remove_context_index :posts, :title
@@ -265,7 +265,6 @@ describe "OracleEnhancedAdapter context index" do
       expect(Post.contains(:all_text, "ddd within comment_body").to_a).to eq([@post])
       expect(Post.contains(:all_text, "ddd within comment_author").to_a).to be_empty
     end
-
   end
 
   describe "with specified tablespace" do
@@ -311,13 +310,10 @@ describe "OracleEnhancedAdapter context index" do
       expect(Post.contains(:title, "aaa AND bbb").to_a).to eq([@post])
       @conn.remove_context_index :posts, name: "index_posts_text"
     end
-
   end
 
   describe "schema dump" do
-
     describe "without table prefixe and suffix" do
-
       before(:all) do
         @conn = ActiveRecord::Base.connection
         create_tables
@@ -330,7 +326,7 @@ describe "OracleEnhancedAdapter context index" do
       it "should dump definition of single column index" do
         @conn.add_context_index :posts, :title
         output = dump_table_schema "posts"
-        expect(output).to match(/add_context_index "posts", \["title"\], name: \"index_posts_on_title\"$/)
+        expect(output).to match(/add_context_index "posts", \["title"\], name: "index_posts_on_title"$/)
         @conn.remove_context_index :posts, :title
       end
 
@@ -379,10 +375,9 @@ describe "OracleEnhancedAdapter context index" do
         sub_query = "SELECT comments.author AS comment_author, comments.body AS comment_body\nFROM comments\nWHERE comments.post_id = :id"
         @conn.add_context_index :posts, [:title, :body, sub_query], options
         output = dump_table_schema "posts"
-        expect(output).to match(/add_context_index "posts", \[:title, :body, "#{sub_query.gsub(/\n/, ' ')}"\], #{options.inspect[1..-2]}$/)
+        expect(output).to match(/add_context_index "posts", \[:title, :body, "#{sub_query.tr("\n", ' ')}"\], #{options.inspect[1..-2]}$/)
         @conn.remove_context_index :posts, name: "post_and_comments_index"
       end
-
     end
 
     describe "with table prefix and suffix" do
@@ -428,12 +423,9 @@ describe "OracleEnhancedAdapter context index" do
         end
         output = dump_table_schema "posts"
         expect(output).to match(/add_context_index "posts", \[:title, :body, "SELECT comments.author AS comment_author, comments.body AS comment_body FROM comments WHERE comments.post_id = :id"\], #{
-          options.inspect[1..-2].gsub(/[{}]/) { |s| '\\'.dup << s }}$/)
+          options.inspect[1..-2].gsub(/[{}]/) { |s| +'\\' << s }}$/)
         schema_define { remove_context_index :posts, name: "xxx_post_and_comments_i" }
       end
-
     end
-
   end
-
 end

data/spec/active_record/connection_adapters/oracle_enhanced/database_tasks_spec.rb

@@ -20,6 +20,11 @@ describe "Oracle Enhanced adapter database tasks" do
       query = "SELECT COUNT(*) FROM dba_users WHERE UPPER(username) = '#{new_user_config[:username].upcase}'"
       expect(ActiveRecord::Base.connection.select_value(query)).to eq(1)
     end
+    it "grants permissions defined by OracleEnhancedAdapter.persmissions" do
+      query = "SELECT COUNT(*) FROM DBA_SYS_PRIVS WHERE GRANTEE = '#{new_user_config[:username].upcase}'"
+      permissions_count = ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.permissions.size
+      expect(ActiveRecord::Base.connection.select_value(query)).to eq(permissions_count)
+    end
     after do
       ActiveRecord::Base.connection.execute("DROP USER #{new_user_config[:username]}")
     end

data/spec/active_record/connection_adapters/oracle_enhanced/dbms_output_spec.rb

@@ -5,23 +5,23 @@ describe "OracleEnhancedAdapter logging dbms_output from plsql" do
 
   before(:all) do
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
-    ActiveRecord::Base.connection.execute <<-SQL
-    CREATE or REPLACE
-    FUNCTION MORE_THAN_FIVE_CHARACTERS_LONG (some_text VARCHAR2) RETURN INTEGER
-    AS
-      longer_than_five INTEGER;
-    BEGIN
-      dbms_output.put_line('before the if -' || some_text || '-');
-      IF length(some_text) > 5 THEN
-        dbms_output.put_line('it is longer than 5');
-        longer_than_five := 1;
-      ELSE
-        dbms_output.put_line('it is 5 or shorter');
-        longer_than_five := 0;
-      END IF;
-      dbms_output.put_line('about to return: ' || longer_than_five);
-      RETURN longer_than_five;
-    END;
+    ActiveRecord::Base.connection.execute <<~SQL
+      CREATE or REPLACE
+      FUNCTION MORE_THAN_FIVE_CHARACTERS_LONG (some_text VARCHAR2) RETURN INTEGER
+      AS
+        longer_than_five INTEGER;
+      BEGIN
+        dbms_output.put_line('before the if -' || some_text || '-');
+        IF length(some_text) > 5 THEN
+          dbms_output.put_line('it is longer than 5');
+          longer_than_five := 1;
+        ELSE
+          dbms_output.put_line('it is 5 or shorter');
+          longer_than_five := 0;
+        END IF;
+        dbms_output.put_line('about to return: ' || longer_than_five);
+        RETURN longer_than_five;
+      END;
     SQL
   end
 

data/spec/active_record/connection_adapters/oracle_enhanced/procedures_spec.rb

@@ -23,7 +23,7 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
         t.timestamps null: true
       end
     end
-    @conn.execute <<-SQL
+    @conn.execute <<~SQL
       CREATE OR REPLACE PACKAGE test_employees_pkg IS
         PROCEDURE create_employee(
             p_first_name    VARCHAR2,
@@ -43,7 +43,7 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
             p_employee_id   NUMBER);
       END;
     SQL
-    @conn.execute <<-SQL
+    @conn.execute <<~SQL
       CREATE OR REPLACE PACKAGE BODY test_employees_pkg IS
         PROCEDURE create_employee(
             p_first_name    VARCHAR2,
@@ -87,7 +87,6 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
         END delete_employee;
       END;
     SQL
-
   end
 
   after(:all) do
@@ -134,7 +133,6 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
       end
 
       private
-
         def raise_make_transaction_rollback
           raise "Make the transaction rollback"
         end
@@ -212,8 +210,8 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
     expect(@employee.first_name).to eq("First")
   end
 
-  it "should not update record if nothing is changed and partial writes are enabled" do
-    TestEmployee.partial_writes = true
+  it "should not update record if nothing is changed and partial updates are enabled" do
+    TestEmployee.partial_updates = true
     @employee = TestEmployee.create(
       first_name: "First",
       last_name: "Last",
@@ -225,8 +223,8 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
     expect(@employee.version).to eq(1)
   end
 
-  it "should update record if nothing is changed and partial writes are disabled" do
-    TestEmployee.partial_writes = false
+  it "should update record if nothing is changed and partial updates are disabled" do
+    TestEmployee.partial_updates = false
     @employee = TestEmployee.create(
       first_name: "First",
       last_name: "Last",
@@ -318,7 +316,7 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
   end
 
   it "should log update record" do
-    (TestEmployee.partial_writes = false) rescue nil
+    (TestEmployee.partial_updates = false) rescue nil
     @employee = TestEmployee.create(
       first_name: "First",
       last_name: "Last",
@@ -361,5 +359,4 @@ 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/quoting_spec.rb

@@ -9,7 +9,6 @@ describe "OracleEnhancedAdapter quoting" do
   end
 
   describe "reserved words column quoting" do
-
     before(:all) do
       schema_define do
         create_table :test_reserved_words do |t|
@@ -60,7 +59,6 @@ describe "OracleEnhancedAdapter quoting" do
     it "should remove double quotes in column quoting" do
       expect(ActiveRecord::Base.connection.quote_column_name('aaa "bbb" ccc')).to eq('"aaa bbb ccc"')
     end
-
   end
 
   describe "valid table names" do
@@ -88,10 +86,6 @@ describe "OracleEnhancedAdapter quoting" do
       expect(@adapter.valid_table_name?("ABC_123.DEF_456")).to be_truthy
     end
 
-    it "should be valid with irregular schema name and database links" do
-      expect(@adapter.valid_table_name?('abc$#_123.abc$#_123@abc$#@._123')).to be_truthy
-    end
-
     it "should not be valid with two dots in name" do
       expect(@adapter.valid_table_name?("abc_123.def_456.ghi_789")).to be_falsey
     end
@@ -114,10 +108,6 @@ describe "OracleEnhancedAdapter quoting" do
       expect(@adapter.valid_table_name?(("a" * 31) + ".validname")).to be_falsey
     end
 
-    it "should not be valid for database links > 128 characters" do
-      expect(@adapter.valid_table_name?("name@" + "a" * 129)).to be_falsey
-    end
-
     it "should not be valid for names that do not begin with alphabetic characters" do
       expect(@adapter.valid_table_name?("1abc")).to be_falsey
       expect(@adapter.valid_table_name?("_abc")).to be_falsey
@@ -127,7 +117,6 @@ describe "OracleEnhancedAdapter quoting" do
   end
 
   describe "table quoting" do
-
     def create_warehouse_things_table
       ActiveRecord::Schema.define do
         suppress_messages do
@@ -188,9 +177,5 @@ describe "OracleEnhancedAdapter quoting" do
 
       expect(@conn.tables).to include("CamelCase")
     end
-
-    it "properly quotes database links" do
-      expect(@conn.quote_table_name("asdf@some.link")).to eq('"ASDF"@"SOME.LINK"')
-    end
   end
 end

data/spec/active_record/connection_adapters/oracle_enhanced/schema_dumper_spec.rb

@@ -19,9 +19,9 @@ describe "OracleEnhancedAdapter schema dump" do
   end
 
   def create_test_posts_table(options = {})
-    options.merge! force: true
+    options[:force] = true
     schema_define do
-      create_table :test_posts, options do |t|
+      create_table :test_posts, **options do |t|
         t.string :title
         t.timestamps null: true
       end
@@ -51,7 +51,6 @@ describe "OracleEnhancedAdapter schema dump" do
       create_test_posts_table
       expect(standard_dump(ignore_tables: [ /test_posts/i ])).not_to match(/create_table "test_posts"/)
     end
-
   end
 
   describe "dumping default values" do
@@ -72,7 +71,7 @@ describe "OracleEnhancedAdapter schema dump" do
 
     it "should be able to dump default values using special characters" do
       output = dump_table_schema "test_defaults"
-      expect(output).to match(/t.string \"special_c\", default: "\\n"/)
+      expect(output).to match(/t.string "special_c", default: "\\n"/)
     end
   end
 
@@ -86,7 +85,6 @@ describe "OracleEnhancedAdapter schema dump" do
       output = dump_table_schema "test_posts"
       expect(output).to match(/create_table "test_posts", primary_key: "post_id"/)
     end
-
   end
 
   describe "table with ntext columns" do
@@ -106,28 +104,10 @@ describe "OracleEnhancedAdapter schema dump" do
 
     it "should be able to dump ntext columns" do
       output = dump_table_schema "test_ntexts"
-      expect(output).to match(/t.ntext \"ntext_column\"/)
+      expect(output).to match(/t.ntext "ntext_column"/)
     end
   end
 
-  describe "table with primary key trigger" do
-
-    after(:each) do
-      drop_test_posts_table
-    end
-
-    it "should include primary key trigger in schema dump" do
-      create_test_posts_table(primary_key_trigger: true)
-      expect(standard_dump).to match(/create_table "test_posts".*add_primary_key_trigger "test_posts"/m)
-    end
-
-    it "should include primary key trigger with non-default primary key in schema dump" do
-      create_test_posts_table(primary_key_trigger: true, primary_key: "post_id")
-      expect(standard_dump).to match(/create_table "test_posts", primary_key: "post_id".*add_primary_key_trigger "test_posts", primary_key: "post_id"/m)
-    end
-
-  end
-
   describe "foreign key constraints" do
     before(:all) do
       schema_define do
@@ -227,7 +207,7 @@ describe "OracleEnhancedAdapter schema dump" do
         end
       end
 
-      @conn.execute <<-SQL
+      @conn.execute <<~SQL
         ALTER TABLE TEST_COMMENTS
         ADD CONSTRAINT TEST_COMMENTS_BAZ_ID_FK FOREIGN KEY (baz_id) REFERENCES test_posts(baz_id)
       SQL
@@ -235,7 +215,6 @@ describe "OracleEnhancedAdapter schema dump" do
       output = dump_table_schema "test_comments"
       expect(output).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
@@ -252,13 +231,6 @@ describe "OracleEnhancedAdapter schema dump" do
       expect(standard_dump).to match(/add_synonym "test_synonym", "schema_name.table_name", force: true/)
     end
 
-    it "should include synonym to other database table in schema dump" do
-      schema_define do
-        add_synonym :test_synonym, "table_name@link_name", force: true
-      end
-      expect(standard_dump).to match(/add_synonym "test_synonym", "table_name@link_name(\.[-A-Za-z0-9_]+)*", force: true/)
-    end
-
     it "should not include ignored table names in schema dump" do
       schema_define do
         add_synonym :test_synonym, "schema_name.table_name", force: true
@@ -279,7 +251,6 @@ describe "OracleEnhancedAdapter schema dump" do
       end
       expect(standard_dump(ignore_tables: [ /table_name/i ])).to match(/add_synonym "test_synonym"/)
     end
-
   end
 
   describe "temporary tables" do
@@ -319,7 +290,6 @@ describe "OracleEnhancedAdapter schema dump" do
       output = dump_table_schema "test_posts"
       expect(output).to match(/t\.index \["NVL\(\\"CREATED_AT\\",\\"UPDATED_AT\\"\)"\], name: "index_test_posts_cr_upd_at"$/)
     end
-
   end
 
   describe "materialized views" do
@@ -335,6 +305,33 @@ describe "OracleEnhancedAdapter schema dump" do
     end
   end
 
+  describe "context indexes" do
+    before(:each) do
+      schema_define do
+        create_table :test_context_indexed_posts, force: true do |t|
+          t.string :title
+          t.string :body
+          t.index :title
+        end
+        add_context_index :test_context_indexed_posts, :body, sync: "ON COMMIT"
+      end
+    end
+
+    after(:each) do
+      schema_define do
+        drop_table :test_context_indexed_posts
+      end
+    end
+
+    it "should dump the context index" do
+      expect(standard_dump).to include(%(add_context_index "test_context_indexed_posts", ["body"]))
+    end
+
+    it "dumps the sync option" do
+      expect(standard_dump).to include(%(sync: "ON COMMIT"))
+    end
+  end
+
   describe "virtual columns" do
     before(:all) do
       skip "Not supported in this database version" unless @oracle11g_or_higher
@@ -373,7 +370,7 @@ describe "OracleEnhancedAdapter schema dump" do
       expect(output).to match(/t\.virtual "full_name",(\s*)type: :string,(\s*)limit: 512,(\s*)as: "\\"FIRST_NAME\\"\|\|', '\|\|\\"LAST_NAME\\""/)
       expect(output).to match(/t\.virtual "short_name",(\s*)type: :string,(\s*)limit: 300,(\s*)as:(.*)/)
       expect(output).to match(/t\.virtual "full_name_length",(\s*)type: :integer,(\s*)precision: 38,(\s*)as:(.*)/)
-      expect(output).to match(/t\.virtual "name_ratio",(\s*)as:(.*)\"$/) # no :type
+      expect(output).to match(/t\.virtual "name_ratio",(\s*)as:(.*)"$/) # no :type
       expect(output).to match(/t\.virtual "abbrev_name",(\s*)type: :string,(\s*)limit: 100,(\s*)as:(.*)/)
       expect(output).to match(/t\.virtual "field_with_leading_space",(\s*)type: :string,(\s*)limit: 300,(\s*)as: "' '\|\|\\"FIRST_NAME\\"\|\|' '"/)
     end