The following uuencoded, gzip'd file will ...

1. Remove the char2, char4, char8 and char16 types from postgresql
2. Change references of char16 to name in the regression tests.
3. Rename the char16.sql regression test to name.sql.  4. Modify
the regression test scripts and outputs to match up.

Might require new regression.{SYSTEM} files...

Darren King

1 files changed, 3 insertions, 3 deletions

diff --git a/src/test/regress/expected/create_index.out b/src/test/regress/expected/create_index.out
index d09a4e4d75..69535a52a0 100644
--- a/src/test/regress/expected/create_index.out
+++ b/src/test/regress/expected/create_index.out
@@ -1,7 +1,7 @@
 QUERY: CREATE INDEX onek_unique1 ON onek USING btree(unique1 int4_ops);
 QUERY: CREATE INDEX onek_unique2 ON onek USING btree(unique2 int4_ops);
 QUERY: CREATE INDEX onek_hundred ON onek USING btree(hundred int4_ops);
-QUERY: CREATE INDEX onek_stringu1 ON onek USING btree(stringu1 char16_ops);
+QUERY: CREATE INDEX onek_stringu1 ON onek USING btree(stringu1 name_ops);
 QUERY: CREATE INDEX tenk1_unique1 ON tenk1 USING btree(unique1 int4_ops);
 QUERY: CREATE INDEX tenk1_unique2 ON tenk1 USING btree(unique2 int4_ops);
 QUERY: CREATE INDEX tenk1_hundred ON tenk1 USING btree(hundred int4_ops);
@@ -12,11 +12,11 @@ QUERY: CREATE INDEX rix ON road USING btree (name text_ops);
 QUERY: CREATE INDEX iix ON ihighway USING btree (name text_ops);
 QUERY: CREATE INDEX six ON shighway USING btree (name text_ops);
 QUERY: CREATE INDEX bt_i4_index ON bt_i4_heap USING btree (seqno int4_ops);
-QUERY: CREATE INDEX bt_c16_index ON bt_c16_heap USING btree (seqno char16_ops);
+QUERY: CREATE INDEX bt_name_index ON bt_name_heap USING btree (seqno name_ops);
 QUERY: CREATE INDEX bt_txt_index ON bt_txt_heap USING btree (seqno text_ops);
 QUERY: CREATE INDEX bt_f8_index ON bt_f8_heap USING btree (seqno float8_ops);
 QUERY: CREATE INDEX rect2ind ON fast_emp4000 USING rtree (home_base bigbox_ops);
 QUERY: CREATE INDEX hash_i4_index ON hash_i4_heap USING hash (random int4_ops);
-QUERY: CREATE INDEX hash_c16_index ON hash_c16_heap USING hash (random char16_ops);
+QUERY: CREATE INDEX hash_name_index ON hash_name_heap USING hash (random name_ops);
 QUERY: CREATE INDEX hash_txt_index ON hash_txt_heap USING hash (random text_ops);
 QUERY: CREATE INDEX hash_f8_index ON hash_f8_heap USING hash (random float8_ops);