1 files changed, 7 insertions, 20 deletions
diff --git a/activerecord/test/schema/postgresql_specific_schema.rb b/activerecord/test/schema/postgresql_specific_schema.rb
index a86a188bcf..7c3b170c08 100644
--- a/activerecord/test/schema/postgresql_specific_schema.rb
+++ b/activerecord/test/schema/postgresql_specific_schema.rb
@@ -1,7 +1,9 @@
 ActiveRecord::Schema.define do
 
-  %w(postgresql_tsvectors postgresql_hstores postgresql_arrays postgresql_moneys postgresql_numbers postgresql_times postgresql_network_addresses postgresql_bit_strings postgresql_uuids postgresql_ltrees
-      postgresql_oids postgresql_xml_data_type defaults geometrics postgresql_timestamp_with_zones postgresql_partitioned_table postgresql_partitioned_table_parent postgresql_json_data_type).each do |table_name|
+  %w(postgresql_tsvectors postgresql_hstores postgresql_arrays postgresql_moneys postgresql_numbers postgresql_times
+      postgresql_network_addresses postgresql_uuids postgresql_ltrees postgresql_oids postgresql_xml_data_type defaults
+      geometrics postgresql_timestamp_with_zones postgresql_partitioned_table postgresql_partitioned_table_parent
+      postgresql_citext).each do |table_name|
     execute "DROP TABLE IF EXISTS #{quote_table_name table_name}"
   end
 
@@ -99,23 +101,16 @@ _SQL
 _SQL
   end
 
-  if 't' == select_value("select 'json'=ANY(select typname from pg_type)")
+  if 't' == select_value("select 'citext'=ANY(select typname from pg_type)")
   execute <<_SQL
-  CREATE TABLE postgresql_json_data_type (
+  CREATE TABLE postgresql_citext (
     id SERIAL PRIMARY KEY,
-    json_data json default '{}'::json
+    text_citext citext default ''::citext
   );
 _SQL
   end
 
   execute <<_SQL
-  CREATE TABLE postgresql_moneys (
-    id SERIAL PRIMARY KEY,
-    wealth MONEY
-  );
-_SQL
-
-  execute <<_SQL
   CREATE TABLE postgresql_numbers (
     id SERIAL PRIMARY KEY,
     single REAL,
@@ -141,14 +136,6 @@ _SQL
 _SQL
 
   execute <<_SQL
-  CREATE TABLE postgresql_bit_strings (
-    id SERIAL PRIMARY KEY,
-    bit_string BIT(8),
-    bit_string_varying BIT VARYING(8)
-  );
-_SQL
-
-  execute <<_SQL
   CREATE TABLE postgresql_oids (
     id SERIAL PRIMARY KEY,
     obj_id OID