diff options
author | Marc G. Fournier | 1998-07-24 03:32:46 +0000 |
---|---|---|
committer | Marc G. Fournier | 1998-07-24 03:32:46 +0000 |
commit | bf00bbb0c4940b80b46b7e5b379cd64184f2262f (patch) | |
tree | bf32bf3bafe6f367ee97249c83afb4c9e9a637af /src/backend/bootstrap | |
parent | 6e66468f3a160878111578a93be2852635eb4f4d (diff) |
I really hope that I haven't missed anything in this one...
From: t-ishii@sra.co.jp
Attached are patches to enhance the multi-byte support. (patches are
against 7/18 snapshot)
* determine encoding at initdb/createdb rather than compile time
Now initdb/createdb has an option to specify the encoding. Also, I
modified the syntax of CREATE DATABASE to accept encoding option. See
README.mb for more details.
For this purpose I have added new column "encoding" to pg_database.
Also pg_attribute and pg_class are changed to catch up the
modification to pg_database. Actually I haved added pg_database_mb.h,
pg_attribute_mb.h and pg_class_mb.h. These are used only when MB is
enabled. The reason having separate files is I couldn't find a way to
use ifdef or whatever in those files. I have to admit it looks
ugly. No way.
* support for PGCLIENTENCODING when issuing COPY command
commands/copy.c modified.
* support for SQL92 syntax "SET NAMES"
See gram.y.
* support for LATIN2-5
* add UNICODE regression test case
* new test suite for MB
New directory test/mb added.
* clean up source files
Basic idea is to have MB's own subdirectory for easier maintenance.
These are include/mb and backend/utils/mb.
Diffstat (limited to 'src/backend/bootstrap')
-rw-r--r-- | src/backend/bootstrap/Makefile | 5 | ||||
-rw-r--r-- | src/backend/bootstrap/bootparse.y | 7 | ||||
-rw-r--r-- | src/backend/bootstrap/bootscanner.l | 10 | ||||
-rw-r--r-- | src/backend/bootstrap/bootstrap.c | 7 |
4 files changed, 25 insertions, 4 deletions
diff --git a/src/backend/bootstrap/Makefile b/src/backend/bootstrap/Makefile index b172c4d267b..a3e8fa16858 100644 --- a/src/backend/bootstrap/Makefile +++ b/src/backend/bootstrap/Makefile @@ -4,7 +4,7 @@ # Makefile for the bootstrap module # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.13 1998/04/06 00:22:02 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.14 1998/07/24 03:31:06 scrappy Exp $ # # # We must build bootparse.c and bootscanner.c with yacc and lex and sed, @@ -22,6 +22,9 @@ SRCDIR= ../.. include ../../Makefile.global CFLAGS += -I.. +ifdef MB +CFLAGS += -DMB=$(MB) +endif ifeq ($(CC), gcc) CFLAGS+= -Wno-error diff --git a/src/backend/bootstrap/bootparse.y b/src/backend/bootstrap/bootparse.y index ef7c801347e..470d16b1015 100644 --- a/src/backend/bootstrap/bootparse.y +++ b/src/backend/bootstrap/bootparse.y @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.16 1998/04/26 04:05:51 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.17 1998/07/24 03:31:07 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -31,8 +31,13 @@ #include "bootstrap/bootstrap.h" #include "catalog/heap.h" #include "catalog/pg_am.h" +#ifdef MB +#include "catalog/pg_attribute_mb.h" +#include "catalog/pg_class_mb.h" +#else #include "catalog/pg_attribute.h" #include "catalog/pg_class.h" +#endif #include "commands/defrem.h" #include "nodes/nodes.h" #include "nodes/parsenodes.h" diff --git a/src/backend/bootstrap/bootscanner.l b/src/backend/bootstrap/bootscanner.l index e94133c2b0c..c3364c08735 100644 --- a/src/backend/bootstrap/bootscanner.l +++ b/src/backend/bootstrap/bootscanner.l @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootscanner.l,v 1.8 1997/11/24 05:07:56 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootscanner.l,v 1.9 1998/07/24 03:31:08 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -20,7 +20,11 @@ #include "storage/block.h" #include "storage/off.h" #include "storage/itemptr.h" +#ifdef MB +#include "catalog/pg_attribute_mb.h" +#else #include "catalog/pg_attribute.h" +#endif #include "access/attnum.h" #include "nodes/pg_list.h" #include "access/tupdesc.h" @@ -28,7 +32,11 @@ #include "access/funcindex.h" #include "storage/fd.h" #include "catalog/pg_am.h" +#ifdef MB +#include "catalog/pg_class_mb.h" +#else #include "catalog/pg_class.h" +#endif #include "nodes/nodes.h" #include "rewrite/prs2lock.h" #include "access/skey.h" diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index acf461d1627..b5fa5e1952a 100644 --- a/src/backend/bootstrap/bootstrap.c +++ b/src/backend/bootstrap/bootstrap.c @@ -7,7 +7,7 @@ * Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.44 1998/06/27 04:53:29 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.45 1998/07/24 03:31:08 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -41,8 +41,13 @@ #include "catalog/catname.h" #include "catalog/index.h" #include "catalog/pg_am.h" +#ifdef MB +#include "catalog/pg_attribute_mb.h" +#include "catalog/pg_class_mb.h" +#else #include "catalog/pg_attribute.h" #include "catalog/pg_class.h" +#endif #include "catalog/pg_type.h" #include "executor/execdesc.h" #include "executor/hashjoin.h" |