1 files changed, 59 insertions, 17 deletions

diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb
index 994ece9244..4c6d1ef3ce 100644
--- a/activerecord/test/schema/schema.rb
+++ b/activerecord/test/schema/schema.rb
@@ -1,4 +1,3 @@
-
 ActiveRecord::Schema.define do
   def except(adapter_names_to_exclude)
     unless [adapter_names_to_exclude].flatten.include?(adapter_name)
@@ -252,10 +251,17 @@ ActiveRecord::Schema.define do
   create_table :developers, force: true do |t|
     t.string   :name
     t.integer  :salary, default: 70000
-    t.datetime :created_at
-    t.datetime :updated_at
-    t.datetime :created_on
-    t.datetime :updated_on
+    if subsecond_precision_supported?
+      t.datetime :created_at, precision: 6
+      t.datetime :updated_at, precision: 6
+      t.datetime :created_on, precision: 6
+      t.datetime :updated_on, precision: 6
+    else
+      t.datetime :created_at
+      t.datetime :updated_at
+      t.datetime :created_on
+      t.datetime :updated_on
+    end
   end
 
   create_table :developers_projects, force: true, id: false do |t|
@@ -354,7 +360,11 @@ ActiveRecord::Schema.define do
 
   create_table :invoices, force: true do |t|
     t.integer :balance
-    t.datetime :updated_at
+    if subsecond_precision_supported?
+      t.datetime :updated_at, precision: 6
+    else
+      t.datetime :updated_at
+    end
   end
 
   create_table :iris, force: true do |t|
@@ -504,7 +514,11 @@ ActiveRecord::Schema.define do
 
   create_table :owners, primary_key: :owner_id, force: true do |t|
     t.string :name
-    t.column :updated_at, :datetime
+    if subsecond_precision_supported?
+      t.column :updated_at, :datetime, precision: 6
+    else
+      t.column :updated_at, :datetime
+    end
     t.column :happy_at,   :datetime
     t.string :essay_id
   end
@@ -522,10 +536,17 @@ ActiveRecord::Schema.define do
     t.column :color, :string
     t.column :parrot_sti_class, :string
     t.column :killer_id, :integer
-    t.column :created_at, :datetime
-    t.column :created_on, :datetime
-    t.column :updated_at, :datetime
-    t.column :updated_on, :datetime
+    if subsecond_precision_supported?
+      t.column :created_at, :datetime, precision: 0
+      t.column :created_on, :datetime, precision: 0
+      t.column :updated_at, :datetime, precision: 0
+      t.column :updated_on, :datetime, precision: 0
+    else
+      t.column :created_at, :datetime
+      t.column :created_on, :datetime
+      t.column :updated_at, :datetime
+      t.column :updated_on, :datetime
+    end
   end
 
   create_table :parrots_pirates, id: false, force: true do |t|
@@ -568,15 +589,24 @@ ActiveRecord::Schema.define do
   create_table :pets, primary_key: :pet_id, force: true do |t|
     t.string :name
     t.integer :owner_id, :integer
-    t.timestamps null: false
+    if subsecond_precision_supported?
+      t.timestamps null: false, precision: 6
+    else
+      t.timestamps null: false
+    end
   end
 
   create_table :pirates, force: true do |t|
     t.column :catchphrase, :string
     t.column :parrot_id, :integer
     t.integer :non_validated_parrot_id
-    t.column :created_on, :datetime
-    t.column :updated_on, :datetime
+    if subsecond_precision_supported?
+      t.column :created_on, :datetime, precision: 6
+      t.column :updated_on, :datetime, precision: 6
+    else
+      t.column :created_on, :datetime
+      t.column :updated_on, :datetime
+    end
   end
 
   create_table :posts, force: true do |t|
@@ -686,7 +716,11 @@ ActiveRecord::Schema.define do
   create_table :ship_parts, force: true do |t|
     t.string :name
     t.integer :ship_id
-    t.datetime :updated_at
+    if subsecond_precision_supported?
+      t.datetime :updated_at, precision: 6
+    else
+      t.datetime :updated_at
+    end
   end
 
   create_table :prisoners, force: true do |t|
@@ -756,7 +790,7 @@ ActiveRecord::Schema.define do
     t.string   :title, limit: 250
     t.string   :author_name
     t.string   :author_email_address
-    if mysql_56?
+    if subsecond_precision_supported?
       t.datetime :written_on, precision: 6
     else
       t.datetime :written_on
@@ -779,7 +813,11 @@ ActiveRecord::Schema.define do
     t.string   :parent_title
     t.string   :type
     t.string   :group
-    t.timestamps null: true
+    if subsecond_precision_supported?
+      t.timestamps null: true, precision: 6
+    else
+      t.timestamps null: true
+    end
   end
 
   create_table :toys, primary_key: :toy_id, force: true do |t|
@@ -944,6 +982,10 @@ ActiveRecord::Schema.define do
     t.string :token
     t.string :auth_token
   end
+
+  create_table :test_with_keyword_column_name, force: true do |t|
+    t.string :desc
+  end
 end
 
 Course.connection.create_table :courses, force: true do |t|