2 files changed, 28 insertions, 38 deletions
diff --git a/activerecord/test/schema/mysql2_specific_schema.rb b/activerecord/test/schema/mysql2_specific_schema.rb
index ccca9a2d9b..61e9bc9af7 100644
--- a/activerecord/test/schema/mysql2_specific_schema.rb
+++ b/activerecord/test/schema/mysql2_specific_schema.rb
@@ -54,33 +54,25 @@ ActiveRecord::Schema.define do
     t.binary :binary_column,    limit: 1
   end
 
-  ActiveRecord::Base.connection.execute <<-SQL
-DROP PROCEDURE IF EXISTS ten;
-SQL
-
-  ActiveRecord::Base.connection.execute <<-SQL
-CREATE PROCEDURE ten() SQL SECURITY INVOKER
-BEGIN
-	select 10;
-END
-SQL
+  create_table :enum_tests, id: false, force: true do |t|
+    t.column :enum_column, "ENUM('text','blob','tiny','medium','long','unsigned','bigint')"
+  end
 
-  ActiveRecord::Base.connection.execute <<-SQL
-DROP PROCEDURE IF EXISTS topics;
-SQL
+  execute "DROP PROCEDURE IF EXISTS ten"
 
-  ActiveRecord::Base.connection.execute <<-SQL
-CREATE PROCEDURE topics(IN num INT) SQL SECURITY INVOKER
-BEGIN
-  select * from topics limit num;
-END
-SQL
+  execute <<~SQL
+    CREATE PROCEDURE ten() SQL SECURITY INVOKER
+    BEGIN
+      SELECT 10;
+    END
+  SQL
 
-  ActiveRecord::Base.connection.drop_table "enum_tests", if_exists: true
+  execute "DROP PROCEDURE IF EXISTS topics"
 
-  ActiveRecord::Base.connection.execute <<-SQL
-CREATE TABLE enum_tests (
-  enum_column ENUM('text','blob','tiny','medium','long','unsigned','bigint')
-)
-SQL
+  execute <<~SQL
+    CREATE PROCEDURE topics(IN num INT) SQL SECURITY INVOKER
+    BEGIN
+      SELECT * FROM topics LIMIT num;
+    END
+  SQL
 end
diff --git a/activerecord/test/schema/oracle_specific_schema.rb b/activerecord/test/schema/oracle_specific_schema.rb
index bc1e45ca80..08c6e24555 100644
--- a/activerecord/test/schema/oracle_specific_schema.rb
+++ b/activerecord/test/schema/oracle_specific_schema.rb
@@ -7,23 +7,21 @@ ActiveRecord::Schema.define do
   execute "drop table defaults" rescue nil
   execute "drop sequence defaults_seq" rescue nil
 
-  execute <<-SQL
-create table test_oracle_defaults (
-  id integer not null primary key,
-  test_char char(1) default 'X' not null,
-  test_string varchar2(20) default 'hello' not null,
-  test_int integer default 3 not null
-)
+  execute <<~SQL
+    create table test_oracle_defaults (
+      id integer not null primary key,
+      test_char char(1) default 'X' not null,
+      test_string varchar2(20) default 'hello' not null,
+      test_int integer default 3 not null
+    )
   SQL
 
-  execute <<-SQL
-create sequence test_oracle_defaults_seq minvalue 10000
-  SQL
+  execute "create sequence test_oracle_defaults_seq minvalue 10000"
 
   execute "create sequence companies_nonstd_seq minvalue 10000"
 
-  execute <<-SQL
-  CREATE TABLE defaults (
+  execute <<~SQL
+    CREATE TABLE defaults (
       id integer not null,
       modified_date date default sysdate,
       modified_date_function date default sysdate,
@@ -34,7 +32,7 @@ create sequence test_oracle_defaults_seq minvalue 10000
       char1 varchar2(1) default 'Y',
       char2 varchar2(50) default 'a varchar field',
       char3 clob default 'a text field'
-  )
+    )
   SQL
   execute "create sequence defaults_seq minvalue 10000"
 end