3 files changed, 44 insertions, 4 deletions
diff --git a/activerecord/test/schema/postgresql_specific_schema.rb b/activerecord/test/schema/postgresql_specific_schema.rb
index 25b416a906..e51db50ae3 100644
--- a/activerecord/test/schema/postgresql_specific_schema.rb
+++ b/activerecord/test/schema/postgresql_specific_schema.rb
@@ -1,8 +1,8 @@
 ActiveRecord::Schema.define do
 
   %w(postgresql_tsvectors postgresql_hstores postgresql_arrays postgresql_moneys postgresql_numbers postgresql_times postgresql_network_addresses postgresql_bit_strings
-      postgresql_oids postgresql_xml_data_type defaults geometrics postgresql_timestamp_with_zones).each do |table_name|
-    execute "DROP TABLE  IF EXISTS #{quote_table_name table_name}"
+      postgresql_oids postgresql_xml_data_type defaults geometrics postgresql_timestamp_with_zones postgresql_partitioned_table postgresql_partitioned_table_parent).each do |table_name|
+    execute "DROP TABLE IF EXISTS #{quote_table_name table_name}"
   end
 
   execute 'DROP SEQUENCE IF EXISTS companies_nonstd_seq CASCADE'
@@ -10,6 +10,8 @@ ActiveRecord::Schema.define do
   execute "ALTER TABLE companies ALTER COLUMN id SET DEFAULT nextval('companies_nonstd_seq')"
   execute 'DROP SEQUENCE IF EXISTS companies_id_seq'
 
+  execute 'DROP FUNCTION IF EXISTS partitioned_insert_trigger()'
+
   %w(accounts_id_seq developers_id_seq projects_id_seq topics_id_seq customers_id_seq orders_id_seq).each do |seq_name|
     execute "SELECT setval('#{seq_name}', 100)"
   end
@@ -125,6 +127,37 @@ _SQL
   );
 _SQL
 
+begin
+    execute <<_SQL
+    CREATE TABLE postgresql_partitioned_table_parent (
+      id SERIAL PRIMARY KEY,
+      number integer
+    );
+    CREATE TABLE postgresql_partitioned_table ( )
+      INHERITS (postgresql_partitioned_table_parent);
+
+    CREATE OR REPLACE FUNCTION partitioned_insert_trigger()
+    RETURNS TRIGGER AS $$
+    BEGIN
+      INSERT INTO postgresql_partitioned_table VALUES (NEW.*);
+      RETURN NULL;
+    END;
+    $$
+    LANGUAGE plpgsql;
+
+    CREATE TRIGGER insert_partitioning_trigger
+      BEFORE INSERT ON postgresql_partitioned_table_parent
+      FOR EACH ROW EXECUTE PROCEDURE partitioned_insert_trigger();
+_SQL
+rescue ActiveRecord::StatementInvalid => e
+  if e.message =~ /language "plpgsql" does not exist/
+    execute "CREATE LANGUAGE 'plpgsql';"
+    retry
+  else
+    raise e
+  end
+end
+
   begin
     execute <<_SQL
     CREATE TABLE postgresql_xml_data_type (
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb
index 377fde5c96..5bcb9652cd 100644
--- a/activerecord/test/schema/schema.rb
+++ b/activerecord/test/schema/schema.rb
@@ -38,7 +38,11 @@ ActiveRecord::Schema.define do
   create_table :admin_users, :force => true do |t|
     t.string :name
     t.text :settings, :null => true
-    t.text :preferences, :null => false, :default => ""
+    # MySQL does not allow default values for blobs. Fake it out with a
+    # big varchar below.
+    t.string :preferences, :null => false, :default => '', :limit => 1024
+    t.string :json_data, :null => true, :limit => 1024
+    t.string :json_data_empty, :null => false, :default => "", :limit => 1024
     t.references :account
   end
 
@@ -76,6 +80,7 @@ ActiveRecord::Schema.define do
   create_table :binaries, :force => true do |t|
     t.string :name
     t.binary :data
+    t.binary :short_data, :limit => 2048
   end
 
   create_table :birds, :force => true do |t|
@@ -173,6 +178,7 @@ ActiveRecord::Schema.define do
     t.integer :client_of
     t.integer :rating, :default => 1
     t.integer :account_id
+    t.string :description, :null => false, :default => ""
   end
 
   add_index :companies, [:firm_id, :type, :rating, :ruby_type], :name => "company_index"
@@ -426,6 +432,7 @@ ActiveRecord::Schema.define do
     t.string :name
     t.column :updated_at, :datetime
     t.column :happy_at,   :datetime
+    t.column :eats_at,    :time
     t.string :essay_id
   end
 
diff --git a/activerecord/test/schema/sqlite_specific_schema.rb b/activerecord/test/schema/sqlite_specific_schema.rb
index ea05b35fe0..e9ddeb32cf 100644
--- a/activerecord/test/schema/sqlite_specific_schema.rb
+++ b/activerecord/test/schema/sqlite_specific_schema.rb
@@ -1,5 +1,5 @@
 ActiveRecord::Schema.define do
-  # For sqlite 3.1.0+, make a table with a autoincrement column
+  # For sqlite 3.1.0+, make a table with an autoincrement column
   if supports_autoincrement?
     create_table :table_with_autoincrement, :force => true do |t|
       t.column :name, :string