*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.39 2000/01/13 18:26:11 petere Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.40 2000/01/18 05:10:29 ishii Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef MULTIBYTE
/* even if MULTIBYTE is not enabled, this function is neccesary
- * since pg_proc.h has an entry for it.
+ * since pg_proc.h has entries for them.
*/
const char *
getdatabaseencoding()
{
- elog(ERROR, "MultiByte strings (MB) must be enabled to use this function");
+ elog(ERROR, "MultiByte support must be enabled to use this function");
+ return ("");
+}
+
+const char *pg_encoding_to_char(int encoding)
+{
+ elog(ERROR, "MultiByte support must be enabled to use this function");
+ return ("");
+}
+
+int pg_char_to_encoding(const char *encoding_string)
+{
+ elog(ERROR, "MultiByte support must be enabled to use this function");
return ("");
}
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: catversion.h,v 1.7 2000/01/14 00:53:50 tgl Exp $
+ * $Id: catversion.h,v 1.8 2000/01/18 05:08:29 ishii Exp $
*
*-------------------------------------------------------------------------
*/
*/
/* yyyymmddN */
-#define CATALOG_VERSION_NO 200001131
+#define CATALOG_VERSION_NO 200001171
#endif
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pg_proc.h,v 1.113 2000/01/17 00:40:51 tgl Exp $
+ * $Id: pg_proc.h,v 1.114 2000/01/18 05:08:29 ishii Exp $
*
* NOTES
* The script catalog/genbki.sh reads this file and generates .bki
/* for multi-byte support */
DATA(insert OID = 1039 ( getdatabaseencoding PGUID 11 f t f 0 f 19 "0" 100 0 0 100 getdatabaseencoding - ));
+DESCR("encoding name of current database");
+
+DATA(insert OID = 1295 ( pg_char_to_encoding PGUID 11 f t f 1 f 23 "19" 100 0 0 100 pg_char_to_encoding - ));
+DESCR("convert encoding name to encoding id");
+
+DATA(insert OID = 1597 ( pg_encoding_to_char PGUID 11 f t f 1 f 19 "23" 100 0 0 100 pg_encoding_to_char - ));
+DESCR("convert encoding id to encoding name");
/* System-view support functions */
DATA(insert OID = 1640 ( pg_get_ruledef PGUID 11 f t f 1 f 25 "19" 100 0 0 100 pg_get_ruledef - ));
-/* $Id: pg_wchar.h,v 1.12 2000/01/15 18:30:35 petere Exp $ */
+/* $Id: pg_wchar.h,v 1.13 2000/01/18 05:08:31 ishii Exp $ */
#ifndef PG_WCHAR_H
#define PG_WCHAR_H
extern unsigned char *pg_client_to_server(unsigned char *, int);
extern unsigned char *pg_server_to_client(unsigned char *, int);
extern int pg_valid_client_encoding(const char *);
+
+/* moved to miscadmin.h
+ * pg_proc.h now have them.
extern const char *pg_encoding_to_char(int);
extern int pg_char_to_encoding(const char *);
+*/
+
extern int GetDatabaseEncoding(void);
extern void SetDatabaseEncoding(int);
extern void SetTemplateEncoding(int);
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: miscadmin.h,v 1.47 2000/01/13 18:26:15 petere Exp $
+ * $Id: miscadmin.h,v 1.48 2000/01/18 05:08:29 ishii Exp $
*
* NOTES
* some of the information in this file will be moved to
extern void SetDatabaseName(const char *name);
extern void SetDatabasePath(const char *path);
-/* even if MB is not enabled, this function is neccesary
+/* even if MULTIBYTE is not enabled, this function is neccesary
* since pg_proc.h does have.
*/
extern const char *getdatabaseencoding(void);
+extern const char *pg_encoding_to_char(int);
+extern int pg_char_to_encoding(const char *);
extern char *getpgusername(void);
extern void SetPgUserName(void);