8000 Type lztext is toast. · postgrespro/postgres_cluster@8f9fa0e · GitHub
[go: up one dir, main page]
Skip to content

Commit 8f9fa0e

Browse files
tglsfdctglsfdc
committed
Type lztext is toast.
(Sorry, couldn't help it...) Removed type filename as well, since it's unused and probably useless. INITDB FORCED, because pg_rewrite columns are now plain text again.
1 parent 3a9a74a commit 8f9fa0e

File tree

18 files changed

+45
-622
lines changed
  • test/regress/expected

    • 18 files changed

    +45
    -622
    lines changed

    ‎src/backend/parser/gram.y

    Lines changed: 16 additions & 6 deletions
    Original file line numberDiff line numberDiff line change
    @@ -11,7 +11,7 @@
    1111
    *
    1212
    *
    1313
    * IDENTIFICATION
    14-
    * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.180 2000/07/28 14:47:23 thomas Exp $
    14+
    * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.181 2000/07/30 22:13:50 tgl Exp $
    1515
    *
    1616
    * HISTORY
    1717
    * AUTHOR DATE MAJOR EVENT
    @@ -2360,14 +2360,18 @@ index_elem: attr_name opt_class
    23602360
    opt_class: class
    23612361
    {
    23622362
    /*
    2363-
    * Release 7.0 removed network_ops, timespan_ops, and datetime_ops,
    2364-
    * so we suppress it from being passed to the backend so the default
    2365-
    * *_ops is used. This can be removed in some later release.
    2366-
    * bjm 2000/02/07
    2363+
    * Release 7.0 removed network_ops, timespan_ops, and
    2364+
    * datetime_ops, so we suppress it from being passed to
    2365+
    * the parser so the default *_ops is used. This can be
    2366+
    * removed in some later release. bjm 2000/02/07
    2367+
    *
    2368+
    * Release 7.1 removes lztext_ops, so suppress that too
    2369+
    * for a while. tgl 2000/07/30
    23672370
    */
    23682371
    if (strcmp($1, "network_ops") != 0 &&
    23692372
    strcmp($1, "timespan_ops") != 0 &&
    2370-
    strcmp($1, "datetime_ops") != 0)
    2373+
    strcmp($1, "datetime_ops") != 0 &&
    2374+
    strcmp($1, "lztext_ops") != 0)
    23712375
    $$ = $1;
    23722376
    else
    23732377
    $$ = NULL;
    @@ -5884,6 +5888,10 @@ xlateSqlFunc(char *name)
    58845888
    *
    58855889
    * Convert "datetime" and "timespan" to allow a transition to SQL92 type names.
    58865890
    * Remove this translation for v7.1 - thomas 2000-03-25
    5891+
    *
    5892+
    * Convert "lztext" to "text" to allow forward compatibility for anyone using
    5893+
    * the undocumented "lztext" type in 7.0. This can go away in 7.2 or later
    5894+
    * - tgl 2000-07-30
    58875895
    */
    58885896
    static char *
    58895897
    xlateSqlType(char *name)
    @@ -5905,6 +5913,8 @@ xlateSqlType(char *name)
    59055913
    return "timestamp";
    59065914
    else if (strcmp(name, "timespan") == 0)
    59075915
    return "interval";
    5916+
    else if (strcmp(name, "lztext") == 0)
    5917+
    return "text";
    59085918
    else if (strcmp(name, "boolean") == 0)
    59095919
    return "bool";
    59105920
    else

    ‎src/backend/parser/parse_coerce.c

    Lines changed: 1 addition & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -8,7 +8,7 @@
    88
    *
    99
    *
    1010
    * IDENTIFICATION
    11-
    * $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.45 2000/07/05 23:11:32 tgl Exp $
    11+
    * $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.46 2000/07/30 22:13:50 tgl Exp $
    1212
    *
    1313
    *-------------------------------------------------------------------------
    1414
    */
    @@ -333,7 +333,6 @@ TypeCategory(Oid inType)
    333333
    case (BPCHAROID):
    334334
    case (VARCHAROID):
    335335
    case (TEXTOID):
    336-
    case (LZTEXTOID):
    337336
    result = STRING_TYPE;
    338337
    break;
    339338

    ‎src/backend/rewrite/rewriteDefine.c

    Lines changed: 3 additions & 3 deletions
    Original file line numberDiff line numberDiff line change
    @@ -8,7 +8,7 @@
    88
    *
    99
    *
    1010
    * IDENTIFICATION
    11-
    * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.48 2000/06/30 07:04:22 tgl Exp $
    11+
    * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.49 2000/07/30 22:13:51 tgl Exp $
    1212
    *
    1313
    *-------------------------------------------------------------------------
    1414
    */
    @@ -65,8 +65,8 @@ InsertRule(char *rulname,
    6565
    values[i++] = ObjectIdGetDatum(eventrel_oid);
    6666
    values[i++] = Int16GetDatum(evslot_index);
    6767
    values[i++] = BoolGetDatum(evinstead);
    68-
    values[i++] = PointerGetDatum(lztextin(evqual));
    69-
    values[i++] = PointerGetDatum(lztextin(actiontree));
    68+
    values[i++] = DirectFunctionCall1(textin, CStringGetDatum(evqual));
    69+
    values[i++] = DirectFunctionCall1(textin, CStringGetDatum(actiontree));
    7070

    7171
    /* ----------------
    7272
    * create a new pg_rewrite tuple

    ‎src/backend/utils/adt/Makefile

    Lines changed: 3 additions & 3 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,7 +1,7 @@
    11
    #
    22
    # Makefile for utils/adt
    33
    #
    4-
    # $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.40 2000/07/22 03:34:43 tgl Exp $
    4+
    # $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.41 2000/07/30 22:13:52 tgl Exp $
    55
    #
    66

    77
    subdir = src/backend/utils/adt
    @@ -16,8 +16,8 @@ endif
    1616
    endif
    1717

    1818
    OBJS = acl.o arrayfuncs.o arrayutils.o bool.o cash.o char.o \
    19-
    date.o datetime.o datum.o filename.o float.o format_type.o \
    20-
    geo_ops.o geo_selfuncs.o int.o int8.o like.o lztext.o \
    19+
    date.o datetime.o datum.o float.o format_type.o \
    20+
    geo_ops.o geo_selfuncs.o int.o int8.o like.o \
    2121
    misc.o nabstime.o name.o not_in.o numeric.o numutils.o \
    2222
    oid.o oracle_compat.o \
    2323
    regexp.o regproc.o ruleutils.o selfuncs.o sets.o \

    ‎src/backend/utils/adt/filename.c

    Lines changed: 0 additions & 132 deletions
    This file was deleted.

    0 commit comments

    Comments
     (0)
    0