Merge commit 'core/master'

2 files changed, 18 insertions, 1 deletions

diff --git a/activerecord/test/schema/postgresql_specific_schema.rb b/activerecord/test/schema/postgresql_specific_schema.rb
index 35e9ecf64d..576a4d03c6 100644
--- a/activerecord/test/schema/postgresql_specific_schema.rb
+++ b/activerecord/test/schema/postgresql_specific_schema.rb
@@ -2,7 +2,7 @@ ActiveRecord::Schema.define do
 
   %w(postgresql_arrays postgresql_moneys postgresql_numbers postgresql_times postgresql_network_addresses postgresql_bit_strings
       postgresql_oids defaults geometrics).each do |table_name|
-        drop_table table_name
+    execute "DROP TABLE  IF EXISTS #{quote_table_name table_name}"
   end
 
   execute 'DROP SEQUENCE IF EXISTS companies_nonstd_seq CASCADE'
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb
index 2e78844c9b..818237f076 100644
--- a/activerecord/test/schema/schema.rb
+++ b/activerecord/test/schema/schema.rb
@@ -162,6 +162,11 @@ ActiveRecord::Schema.define do
     t.column :type, :string
   end
 
+
+  create_table :jobs, :force => true do |t|
+    t.integer :ideal_reference_id
+  end
+
   create_table :keyboards, :force => true, :id  => false do |t|
     t.primary_key :key_number
     t.string      :name
@@ -197,6 +202,13 @@ ActiveRecord::Schema.define do
     t.string :type
   end
 
+  create_table :references, :force => true do |t|
+    t.integer :person_id
+    t.integer :job_id
+    t.boolean :favourite
+    t.integer :lock_version, :default => 0
+  end
+
   create_table :minimalistics, :force => true do |t|
   end
 
@@ -337,6 +349,11 @@ ActiveRecord::Schema.define do
   end
   add_index :subscribers, :nick, :unique => true
 
+  create_table :subscriptions, :force => true do |t|
+    t.string :subscriber_id
+    t.integer :book_id
+  end
+
   create_table :tasks, :force => true do |t|
     t.datetime :starting
     t.datetime :ending