activerecord-oracle_enhanced-adapter 6.0.0.beta1 → 6.0.0.rc1

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

@@ -8,7 +8,7 @@ module ActiveRecord #:nodoc:
         STATEMENT_TOKEN = "\n\n/\n\n"
 
         def structure_dump #:nodoc:
-          sequences = select(<<-SQL.strip.gsub(/\s+/, " "), "sequences to dump at structure dump")
+          sequences = select(<<~SQL.squish, "sequences to dump at structure dump")
             SELECT sequence_name, min_value, max_value, increment_by, order_flag, cycle_flag
             FROM all_sequences
             where sequence_owner = SYS_CONTEXT('userenv', 'current_schema') ORDER BY 1
@@ -17,7 +17,7 @@ module ActiveRecord #:nodoc:
           structure = sequences.map do |result|
             "CREATE SEQUENCE #{quote_table_name(result["sequence_name"])} MINVALUE #{result["min_value"]} MAXVALUE #{result["max_value"]} INCREMENT BY #{result["increment_by"]} #{result["order_flag"] == 'Y' ? "ORDER" : "NOORDER"} #{result["cycle_flag"] == 'Y' ? "CYCLE" : "NOCYCLE"}"
           end
-          tables = select_values(<<-SQL.strip.gsub(/\s+/, " "), "tables at structure dump")
+          tables = select_values(<<~SQL.squish, "tables at structure dump")
             SELECT table_name FROM all_tables t
             WHERE owner = SYS_CONTEXT('userenv', 'current_schema') AND secondary = 'N'
             AND NOT EXISTS (SELECT mv.mview_name FROM all_mviews mv
@@ -29,7 +29,7 @@ module ActiveRecord #:nodoc:
           tables.each do |table_name|
             virtual_columns = virtual_columns_for(table_name) if supports_virtual_columns?
             ddl = +"CREATE#{ ' GLOBAL TEMPORARY' if temporary_table?(table_name)} TABLE \"#{table_name}\" (\n"
-            columns = select_all(<<-SQL.strip.gsub(/\s+/, " "), "columns at structure dump")
+            columns = select_all(<<~SQL.squish, "columns at structure dump")
               SELECT column_name, data_type, data_length, char_used, char_length,
               data_precision, data_scale, data_default, nullable
               FROM all_tab_columns
@@ -89,16 +89,16 @@ module ActiveRecord #:nodoc:
 
         def structure_dump_primary_key(table) #:nodoc:
           opts = { name: "", cols: [] }
-          pks = select_all(<<-SQL.strip.gsub(/\s+/, " "), "Primary Keys")
-          SELECT a.constraint_name, a.column_name, a.position
-            FROM all_cons_columns a
-            JOIN all_constraints c
-              ON a.constraint_name = c.constraint_name
-           WHERE c.table_name = '#{table.upcase}'
-             AND c.constraint_type = 'P'
-             AND a.owner = c.owner
-             AND c.owner = SYS_CONTEXT('userenv', 'current_schema')
-        SQL
+          pks = select_all(<<~SQL.squish, "Primary Keys")
+            SELECT a.constraint_name, a.column_name, a.position
+              FROM all_cons_columns a
+              JOIN all_constraints c
+                ON a.constraint_name = c.constraint_name
+             WHERE c.table_name = '#{table.upcase}'
+               AND c.constraint_type = 'P'
+               AND a.owner = c.owner
+               AND c.owner = SYS_CONTEXT('userenv', 'current_schema')
+          SQL
           pks.each do |row|
             opts[:name] = row["constraint_name"]
             opts[:cols][row["position"] - 1] = row["column_name"]
@@ -108,16 +108,16 @@ module ActiveRecord #:nodoc:
 
         def structure_dump_unique_keys(table) #:nodoc:
           keys = {}
-          uks = select_all(<<-SQL.strip.gsub(/\s+/, " "), "Primary Keys")
-          SELECT a.constraint_name, a.column_name, a.position
-            FROM all_cons_columns a
-            JOIN all_constraints c
-              ON a.constraint_name = c.constraint_name
-           WHERE c.table_name = '#{table.upcase}'
-             AND c.constraint_type = 'U'
-             AND a.owner = c.owner
-             AND c.owner = SYS_CONTEXT('userenv', 'current_schema')
-        SQL
+          uks = select_all(<<~SQL.squish, "Primary Keys")
+            SELECT a.constraint_name, a.column_name, a.position
+              FROM all_cons_columns a
+              JOIN all_constraints c
+                ON a.constraint_name = c.constraint_name
+             WHERE c.table_name = '#{table.upcase}'
+               AND c.constraint_type = 'U'
+               AND a.owner = c.owner
+               AND c.owner = SYS_CONTEXT('userenv', 'current_schema')
+          SQL
           uks.each do |uk|
             keys[uk["constraint_name"]] ||= []
             keys[uk["constraint_name"]][uk["position"] - 1] = uk["column_name"]
@@ -144,7 +144,7 @@ module ActiveRecord #:nodoc:
         end
 
         def structure_dump_fk_constraints #:nodoc:
-          foreign_keys = select_all(<<-SQL.strip.gsub(/\s+/, " "), "foreign keys at structure dump")
+          foreign_keys = select_all(<<~SQL.squish, "foreign keys at structure dump")
             SELECT table_name FROM all_tables
             WHERE owner = SYS_CONTEXT('userenv', 'current_schema') ORDER BY 1
           SQL
@@ -172,7 +172,7 @@ module ActiveRecord #:nodoc:
 
         def structure_dump_column_comments(table_name)
           comments = []
-          columns = select_values(<<-SQL.strip.gsub(/\s+/, " "), "column comments at structure dump")
+          columns = select_values(<<~SQL.squish, "column comments at structure dump")
             SELECT column_name FROM user_tab_columns
             WHERE table_name = '#{table_name}' ORDER BY column_id
           SQL
@@ -206,7 +206,7 @@ module ActiveRecord #:nodoc:
         # Extract all stored procedures, packages, synonyms.
         def structure_dump_db_stored_code #:nodoc:
           structure = []
-          all_source = select_all(<<-SQL.strip.gsub(/\s+/, " "), "stored program at structure dump")
+          all_source = select_all(<<~SQL.squish, "stored program at structure dump")
             SELECT DISTINCT name, type
             FROM all_source
             WHERE type IN ('PROCEDURE', 'PACKAGE', 'PACKAGE BODY', 'FUNCTION', 'TRIGGER', 'TYPE')
@@ -215,7 +215,7 @@ module ActiveRecord #:nodoc:
           SQL
           all_source.each do |source|
             ddl = +"CREATE OR REPLACE   \n"
-            texts = select_all(<<-SQL.strip.gsub(/\s+/, " "), "all source at structure dump")
+            texts = select_all(<<~SQL.squish, "all source at structure dump")
               SELECT text
               FROM all_source
               WHERE name = '#{source['name']}'
@@ -238,7 +238,7 @@ module ActiveRecord #:nodoc:
 
         def structure_dump_views #:nodoc:
           structure = []
-          views = select_all(<<-SQL.strip.gsub(/\s+/, " "), "views at structure dump")
+          views = select_all(<<~SQL.squish, "views at structure dump")
             SELECT view_name, text FROM all_views
             WHERE owner = SYS_CONTEXT('userenv', 'current_schema') ORDER BY view_name ASC
           SQL
@@ -250,7 +250,7 @@ module ActiveRecord #:nodoc:
 
         def structure_dump_synonyms #:nodoc:
           structure = []
-          synonyms = select_all(<<-SQL.strip.gsub(/\s+/, " "), "synonyms at structure dump")
+          synonyms = select_all(<<~SQL.squish, "synonyms at structure dump")
             SELECT owner, synonym_name, table_name, table_owner
             FROM all_synonyms
             WHERE owner = SYS_CONTEXT('userenv', 'current_schema')
@@ -263,13 +263,13 @@ module ActiveRecord #:nodoc:
         end
 
         def structure_drop #:nodoc:
-          sequences = select_values(<<-SQL.strip.gsub(/\s+/, " "), "sequences to drop at structure dump")
+          sequences = select_values(<<~SQL.squish, "sequences to drop at structure dump")
             SELECT sequence_name FROM all_sequences where sequence_owner = SYS_CONTEXT('userenv', 'current_schema') ORDER BY 1
           SQL
           statements = sequences.map do |seq|
             "DROP SEQUENCE \"#{seq}\""
           end
-          tables = select_values(<<-SQL.strip.gsub(/\s+/, " "), "tables to drop at structure dump")
+          tables = select_values(<<~SQL.squish, "tables to drop at structure dump")
             SELECT table_name from all_tables t
             WHERE owner = SYS_CONTEXT('userenv', 'current_schema') AND secondary = 'N'
             AND NOT EXISTS (SELECT mv.mview_name FROM all_mviews mv
@@ -285,7 +285,7 @@ module ActiveRecord #:nodoc:
         end
 
         def temp_table_drop #:nodoc:
-          temporary_tables = select_values(<<-SQL.strip.gsub(/\s+/, " "), "temporary tables to drop at structure dump")
+          temporary_tables = select_values(<<~SQL.squish, "temporary tables to drop at structure dump")
             SELECT table_name FROM all_tables
             WHERE owner = SYS_CONTEXT('userenv', 'current_schema')
             AND secondary = 'N' AND temporary = 'Y' ORDER BY 1
@@ -320,7 +320,7 @@ module ActiveRecord #:nodoc:
         # Called only if `supports_virtual_columns?` returns true
         # return [{'column_name' => 'FOOS', 'data_default' => '...'}, ...]
         def virtual_columns_for(table)
-          select_all(<<-SQL.strip.gsub(/\s+/, " "), "virtual columns for")
+          select_all(<<~SQL.squish, "virtual columns for")
             SELECT column_name, data_default
             FROM all_tab_cols
             WHERE virtual_column = 'YES'
@@ -331,7 +331,7 @@ module ActiveRecord #:nodoc:
 
         def drop_sql_for_feature(type)
           short_type = type == "materialized view" ? "mview" : type
-          features = select_values(<<-SQL.strip.gsub(/\s+/, " "), "features to drop")
+          features = select_values(<<~SQL.squish, "features to drop")
             SELECT #{short_type}_name FROM all_#{short_type.tableize}
             where owner = SYS_CONTEXT('userenv', 'current_schema')
           SQL
@@ -342,7 +342,7 @@ module ActiveRecord #:nodoc:
         end
 
         def drop_sql_for_object(type)
-          objects = select_values(<<-SQL.strip.gsub(/\s+/, " "), "objects to drop")
+          objects = select_values(<<~SQL.squish, "objects to drop")
             SELECT object_name FROM all_objects
             WHERE object_type = '#{type.upcase}' and owner = SYS_CONTEXT('userenv', 'current_schema')
           SQL

data/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -269,7 +269,7 @@ module ActiveRecord
       end
 
       def supports_fetch_first_n_rows_and_offset?
-        if !use_old_oracle_visitor && @connection.database_version.first >= 12
+        if !use_old_oracle_visitor && database_version.first >= 12
           true
         else
           false
@@ -285,11 +285,11 @@ module ActiveRecord
       end
 
       def supports_multi_insert?
-        @connection.database_version.to_s >= [11, 2].to_s
+        database_version.to_s >= [11, 2].to_s
       end
 
       def supports_virtual_columns?
-        @connection.database_version.first >= 11
+        database_version.first >= 11
       end
 
       def supports_json?
@@ -324,7 +324,7 @@ module ActiveRecord
       end
 
       def supports_longer_identifier?
-        if !use_shorter_identifier && @connection.database_version.to_s >= [12, 2].to_s
+        if !use_shorter_identifier && database_version.to_s >= [12, 2].to_s
           true
         else
           false
@@ -449,7 +449,7 @@ module ActiveRecord
         # if sequence_name is set to :autogenerated then it means that primary key will be populated by trigger
         raise ArgumentError "Trigger based primary key is not supported" if sequence_name == AUTOGENERATED_SEQUENCE_NAME
         # call directly connection method to avoid prepared statement which causes fetching of next sequence value twice
-        select_value(<<-SQL.strip.gsub(/\s+/, " "), "next sequence value")
+        select_value(<<~SQL.squish, "next sequence value")
           SELECT #{quote_table_name(sequence_name)}.NEXTVAL FROM dual
         SQL
       end
@@ -487,7 +487,7 @@ module ActiveRecord
         end
 
         if primary_key && sequence_name
-          new_start_value = select_value(<<-SQL.strip.gsub(/\s+/, " "), "new start value")
+          new_start_value = select_value(<<~SQL.squish, "new start value")
             select NVL(max(#{quote_column_name(primary_key)}),0) + 1 from #{quote_table_name(table_name)}
           SQL
 
@@ -498,32 +498,32 @@ module ActiveRecord
 
       # Current database name
       def current_database
-        select_value(<<-SQL.strip.gsub(/\s+/, " "), "current database on CDB ")
+        select_value(<<~SQL.squish, "current database on CDB ")
           SELECT SYS_CONTEXT('userenv', 'con_name') FROM dual
         SQL
       rescue ActiveRecord::StatementInvalid
-        select_value(<<-SQL.strip.gsub(/\s+/, " "), "current database")
+        select_value(<<~SQL.squish, "current database")
           SELECT SYS_CONTEXT('userenv', 'db_name') FROM dual
         SQL
       end
 
       # Current database session user
       def current_user
-        select_value(<<-SQL.strip.gsub(/\s+/, " "), "current user")
+        select_value(<<~SQL.squish, "current user")
           SELECT SYS_CONTEXT('userenv', 'session_user') FROM dual
         SQL
       end
 
       # Current database session schema
       def current_schema
-        select_value(<<-SQL.strip.gsub(/\s+/, " "), "current schema")
+        select_value(<<~SQL.squish, "current schema")
           SELECT SYS_CONTEXT('userenv', 'current_schema') FROM dual
         SQL
       end
 
       # Default tablespace name of current user
       def default_tablespace
-        select_value(<<-SQL.strip.gsub(/\s+/, " "), "default tablespace")
+        select_value(<<~SQL.squish, "default tablespace")
           SELECT LOWER(default_tablespace) FROM user_users
           WHERE username = SYS_CONTEXT('userenv', 'current_schema')
         SQL
@@ -532,7 +532,7 @@ module ActiveRecord
       def column_definitions(table_name)
         (owner, desc_table_name) = @connection.describe(table_name)
 
-        select_all(<<-SQL.strip.gsub(/\s+/, " "), "Column definitions")
+        select_all(<<~SQL.squish, "Column definitions")
           SELECT cols.column_name AS name, cols.data_type AS sql_type,
                  cols.data_default, cols.nullable, cols.virtual_column, cols.hidden_column,
                  cols.data_type_owner AS sql_type_owner,
@@ -564,7 +564,7 @@ module ActiveRecord
       def pk_and_sequence_for(table_name, owner = nil, desc_table_name = nil) #:nodoc:
         (owner, desc_table_name) = @connection.describe(table_name)
 
-        seqs = select_values(<<-SQL.strip.gsub(/\s+/, " "), "Sequence")
+        seqs = select_values(<<~SQL.squish, "Sequence")
           select us.sequence_name
           from all_sequences us
           where us.sequence_owner = '#{owner}'
@@ -572,7 +572,7 @@ module ActiveRecord
         SQL
 
         # changed back from user_constraints to all_constraints for consistency
-        pks = select_values(<<-SQL.strip.gsub(/\s+/, " "), "Primary Key")
+        pks = select_values(<<~SQL.squish, "Primary Key")
           SELECT cc.column_name
             FROM all_constraints c, all_cons_columns cc
            WHERE c.owner = '#{owner}'
@@ -606,7 +606,7 @@ module ActiveRecord
       def primary_keys(table_name) # :nodoc:
         (_owner, desc_table_name) = @connection.describe(table_name)
 
-        pks = select_values(<<-SQL.strip.gsub(/\s+/, " "), "Primary Keys", [bind_string("table_name", desc_table_name)])
+        pks = select_values(<<~SQL.squish, "Primary Keys", [bind_string("table_name", desc_table_name)])
           SELECT cc.column_name
             FROM all_constraints c, all_cons_columns cc
            WHERE c.owner = SYS_CONTEXT('userenv', 'current_schema')
@@ -636,7 +636,7 @@ module ActiveRecord
       end
 
       def temporary_table?(table_name) #:nodoc:
-        select_value(<<-SQL.strip.gsub(/\s+/, " "), "temporary table", [bind_string("table_name", table_name.upcase)]) == "Y"
+        select_value(<<~SQL.squish, "temporary table", [bind_string("table_name", table_name.upcase)]) == "Y"
           SELECT temporary FROM all_tables WHERE table_name = :table_name and owner = SYS_CONTEXT('userenv', 'current_schema')
         SQL
       end
@@ -647,15 +647,19 @@ module ActiveRecord
       alias table_alias_length max_identifier_length
       alias index_name_length max_identifier_length
 
-      private
-        def check_version
-          database_version = @connection.database_version.join(".").to_f
+      def get_database_version
+        @connection.database_version
+      end
 
-          if database_version < 10
-            raise "Your version of Oracle (#{database_version}) is too old. Active Record Oracle enhanced adapter supports Oracle >= 10g."
-          end
+      def check_version
+        version = get_database_version.join(".").to_f
+
+        if version < 10
+          raise "Your version of Oracle (#{version}) is too old. Active Record Oracle enhanced adapter supports Oracle >= 10g."
         end
+      end
 
+      private
         def initialize_type_map(m = type_map)
           super
           # oracle

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

@@ -344,7 +344,7 @@ describe "OracleEnhancedConnection" do
     it "should execute prepared statement with decimal bind parameter " do
       cursor = @conn.prepare("INSERT INTO test_employees VALUES(:1)")
       type_metadata = ActiveRecord::ConnectionAdapters::SqlTypeMetadata.new(sql_type: "NUMBER", type: :decimal, limit: 10, precision: nil, scale: 2)
-      column = ActiveRecord::ConnectionAdapters::OracleEnhanced::Column.new("age", nil, type_metadata, false, "test_employees", nil)
+      column = ActiveRecord::ConnectionAdapters::OracleEnhanced::Column.new("age", nil, type_metadata, false, comment: nil)
       expect(column.type).to eq(:decimal)
       # Here 1.5 expects that this value has been type casted already
       # it should use bind_params in the long term.

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,

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

@@ -207,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

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

@@ -47,13 +47,13 @@ describe "OracleEnhancedAdapter structure dump" do
     end
 
     it "should dump composite primary keys" do
-      pk = @conn.send(:select_one, <<-SQL)
+      pk = @conn.send(:select_one, <<~SQL)
         select constraint_name from user_constraints where table_name = 'TEST_POSTS' and constraint_type='P'
       SQL
-      @conn.execute <<-SQL
+      @conn.execute <<~SQL
         alter table test_posts drop constraint #{pk["constraint_name"]}
       SQL
-      @conn.execute <<-SQL
+      @conn.execute <<~SQL
         ALTER TABLE TEST_POSTS
         add CONSTRAINT pk_id_title PRIMARY KEY (id, title)
       SQL
@@ -62,7 +62,7 @@ describe "OracleEnhancedAdapter structure dump" do
     end
 
     it "should dump foreign keys" do
-      @conn.execute <<-SQL
+      @conn.execute <<~SQL
         ALTER TABLE TEST_POSTS
         ADD CONSTRAINT fk_test_post_foo FOREIGN KEY (foo_id) REFERENCES foos(id)
       SQL
@@ -74,14 +74,14 @@ describe "OracleEnhancedAdapter structure dump" do
     it "should dump foreign keys when reference column name is not 'id'" do
       @conn.add_column :foos, :baz_id, :integer
 
-      @conn.execute <<-SQL
+      @conn.execute <<~SQL
         ALTER TABLE FOOS
         ADD CONSTRAINT UK_BAZ UNIQUE (BAZ_ID)
       SQL
 
       @conn.add_column :test_posts, :baz_id, :integer
 
-      @conn.execute <<-SQL
+      @conn.execute <<~SQL
         ALTER TABLE TEST_POSTS
         ADD CONSTRAINT fk_test_post_baz FOREIGN KEY (baz_id) REFERENCES foos(baz_id)
       SQL
@@ -98,7 +98,7 @@ describe "OracleEnhancedAdapter structure dump" do
     end
 
     it "should dump triggers" do
-      @conn.execute <<-SQL
+      @conn.execute <<~SQL
         create or replace TRIGGER TEST_POST_TRIGGER
           BEFORE INSERT
           ON TEST_POSTS
@@ -112,7 +112,7 @@ describe "OracleEnhancedAdapter structure dump" do
     end
 
     it "should dump types" do
-      @conn.execute <<-SQL
+      @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+/, " ")
@@ -128,7 +128,7 @@ describe "OracleEnhancedAdapter structure dump" do
 
     it "should dump virtual columns" do
       skip "Not supported in this database version" unless @oracle11g_or_higher
-      @conn.execute <<-SQL
+      @conn.execute <<~SQL
         CREATE TABLE bars (
           id          NUMBER(38,0) NOT NULL,
           id_plus     NUMBER GENERATED ALWAYS AS(id + 2) VIRTUAL,
@@ -141,7 +141,7 @@ describe "OracleEnhancedAdapter structure dump" do
 
     it "should dump RAW virtual columns" do
       skip "Not supported in this database version" unless @oracle11g_or_higher
-      @conn.execute <<-SQL
+      @conn.execute <<~SQL
         CREATE TABLE bars (
           id          NUMBER(38,0) NOT NULL,
           super       RAW(255) GENERATED ALWAYS AS \( HEXTORAW\(ID\) \) VIRTUAL,
@@ -153,7 +153,7 @@ describe "OracleEnhancedAdapter structure dump" do
     end
 
     it "should dump NCLOB columns" do
-      @conn.execute <<-SQL
+      @conn.execute <<~SQL
         CREATE TABLE bars (
           id          NUMBER(38,0) NOT NULL,
           nclob_text  NCLOB,
@@ -165,7 +165,7 @@ describe "OracleEnhancedAdapter structure dump" do
     end
 
     it "should dump unique keys" do
-      @conn.execute <<-SQL
+      @conn.execute <<~SQL
         ALTER TABLE test_posts
           add CONSTRAINT uk_foo_foo_id UNIQUE (foo, foo_id)
       SQL
@@ -180,7 +180,7 @@ describe "OracleEnhancedAdapter structure dump" 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
+      @conn.execute <<~SQL
         ALTER TABLE test_posts
           add CONSTRAINT uk_foo_foo_id UNIQUE (foo, foo_id)
       SQL
@@ -194,7 +194,7 @@ describe "OracleEnhancedAdapter structure dump" do
     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)
 
-      @conn.execute <<-SQL
+      @conn.execute <<~SQL
         CREATE INDEX "IX_TEST_POSTS_FUNCTION" ON "TEST_POSTS" (TO_CHAR(LENGTH("FOO"))||"FOO")
       SQL
 
@@ -204,7 +204,7 @@ describe "OracleEnhancedAdapter structure dump" do
     end
 
     it "should dump RAW columns" do
-      @conn.execute <<-SQL
+      @conn.execute <<~SQL
         CREATE TABLE bars (
           id          NUMBER(38,0) NOT NULL,
           super       RAW(255),
@@ -290,7 +290,7 @@ describe "OracleEnhancedAdapter structure dump" do
 
   describe "database structure dump extensions" do
     before(:all) do
-      @conn.execute <<-SQL
+      @conn.execute <<~SQL
         CREATE TABLE nvarchartable (
           unq_nvarchar  NVARCHAR2(255) DEFAULT NULL
         )
@@ -394,20 +394,20 @@ describe "OracleEnhancedAdapter structure dump" do
         t.string :foo
       end
       # view
-      @conn.execute <<-SQL
+      @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
+      @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
+      @conn.execute <<~SQL
         create or replace package full_drop_test_package as
           function test_func return varchar2;
         end test_package;
       SQL
-      @conn.execute <<-SQL
+      @conn.execute <<~SQL
         create or replace package body full_drop_test_package as
           function test_func return varchar2 is
             begin
@@ -416,7 +416,7 @@ describe "OracleEnhancedAdapter structure dump" do
         end test_package;
       SQL
       # function
-      @conn.execute <<-SQL
+      @conn.execute <<~SQL
         create or replace function full_drop_test_function
           return varchar2
         is
@@ -426,7 +426,7 @@ describe "OracleEnhancedAdapter structure dump" do
         end;
       SQL
       # procedure
-      @conn.execute <<-SQL
+      @conn.execute <<~SQL
         create or replace procedure full_drop_test_procedure
         begin
           delete from full_drop_test where id=1231231231
@@ -436,11 +436,11 @@ describe "OracleEnhancedAdapter structure dump" do
         end;
       SQL
       # synonym
-      @conn.execute <<-SQL
+      @conn.execute <<~SQL
         create or replace synonym full_drop_test_synonym for full_drop_test
       SQL
       # type
-      @conn.execute <<-SQL
+      @conn.execute <<~SQL
         create or replace type full_drop_test_type as table of number
       SQL
     end