Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit7b2b779

Browse files
committed
Add auto-size to screen to \d? commands. Use UNION to show all
\d? results in one query. Add \d? field search feature. Rename MBto MULTIBYTE.
1 parent550f209 commit7b2b779

File tree

26 files changed

+452
-392
lines changed

26 files changed

+452
-392
lines changed

‎src/backend/access/common/printtup.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.29 1998/06/16 07:29:18 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.30 1998/07/18 18:34:01 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -23,7 +23,7 @@
2323
#include<libpq/libpq.h>
2424
#include<utils/syscache.h>
2525

26-
#ifdefMB
26+
#ifdefMULTIBYTE
2727
#include<commands/variable.h>
2828
#endif
2929

@@ -84,7 +84,7 @@ printtup(HeapTuple tuple, TupleDesc typeinfo)
8484
Datumattr;
8585
boolisnull;
8686
Oidtypoutput;
87-
#ifdefMB
87+
#ifdefMULTIBYTE
8888
unsignedchar*p;
8989
#endif
9090

@@ -132,7 +132,7 @@ printtup(HeapTuple tuple, TupleDesc typeinfo)
132132
outputstr=fmgr(typoutput,attr,
133133
gettypelem(typeinfo->attrs[i]->atttypid),
134134
typeinfo->attrs[i]->atttypmod);
135-
#ifdefMB
135+
#ifdefMULTIBYTE
136136
p=pg_server_to_client(outputstr,strlen(outputstr));
137137
pq_putint(strlen(p)+VARHDRSZ,VARHDRSZ);
138138
pq_putnchar(p,strlen(p));
@@ -281,7 +281,7 @@ printtup_internal(HeapTuple tuple, TupleDesc typeinfo)
281281
/* variable length, assume a varlena structure */
282282
len=VARSIZE(attr)-VARHDRSZ;
283283

284-
#ifdefMB
284+
#ifdefMULTIBYTE
285285
pq_putncharlen(VARDATA(attr),len);
286286
#else
287287
pq_putint(len,VARHDRSZ);

‎src/backend/commands/mbutils.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* conversion between client encoding and server internal encoding
33
* (currently mule internal code (mic) is used)
44
* Tatsuo Ishii
5-
* $Id: mbutils.c,v 1.1 1998/06/16 07:38:18 momjian Exp $
5+
* $Id: mbutils.c,v 1.2 1998/07/18 18:34:01 momjian Exp $
66
*/
77
#include<stdio.h>
88
#include<string.h>
@@ -12,7 +12,7 @@
1212
#include"regex/pg_wchar.h"
1313
#include"commands/variable.h"
1414

15-
staticintclient_encoding=MB;/* defalut client encoding is set to
15+
staticintclient_encoding=MULTIBYTE;/* defalut client encoding is set to
1616
same as the server encoding */
1717
/*
1818
* convert bogus chars that cannot be represented in the current encoding
@@ -381,10 +381,10 @@ int pg_set_client_encoding(int encoding)
381381
{
382382
client_encoding=encoding;
383383

384-
if (client_encoding==MB) {/* server == client? */
384+
if (client_encoding==MULTIBYTE) {/* server == client? */
385385
client_to_mic=client_from_mic=0;
386386
server_to_mic=server_from_mic=0;
387-
}elseif (MB==MULE_INTERNAL) {/* server == MULE_INETRNAL? */
387+
}elseif (MULTIBYTE==MULE_INTERNAL) {/* server == MULE_INETRNAL? */
388388
client_to_mic=get_enc_ent(encoding)->to_mic;
389389
client_from_mic=get_enc_ent(encoding)->from_mic;
390390
server_to_mic=server_from_mic=0;
@@ -393,16 +393,16 @@ int pg_set_client_encoding(int encoding)
393393
}
394394
}elseif (encoding==MULE_INTERNAL) {/* client == MULE_INETRNAL? */
395395
client_to_mic=client_from_mic=0;
396-
server_to_mic=get_enc_ent(MB)->to_mic;
397-
server_from_mic=get_enc_ent(MB)->from_mic;
396+
server_to_mic=get_enc_ent(MULTIBYTE)->to_mic;
397+
server_from_mic=get_enc_ent(MULTIBYTE)->from_mic;
398398
if (server_to_mic==0||server_from_mic==0) {
399399
return(-1);
400400
}
401401
}else {
402402
client_to_mic=get_enc_ent(encoding)->to_mic;
403403
client_from_mic=get_enc_ent(encoding)->from_mic;
404-
server_to_mic=get_enc_ent(MB)->to_mic;
405-
server_from_mic=get_enc_ent(MB)->from_mic;
404+
server_to_mic=get_enc_ent(MULTIBYTE)->to_mic;
405+
server_from_mic=get_enc_ent(MULTIBYTE)->from_mic;
406406
if (client_to_mic==0||client_from_mic==0) {
407407
return(-1);
408408
}
@@ -504,7 +504,7 @@ const char *pg_encoding_to_char(int encoding)
504504
return(p->name);
505505
}
506506

507-
#ifdefMBUTILSDEBUG
507+
#ifdefMULTIBYTEUTILSDEBUG
508508
#include<stdio.h>
509509

510510
main()

‎src/backend/commands/variable.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Routines for handling of 'SET var TO',
33
*'SHOW var' and 'RESET var' statements.
44
*
5-
* $Id: variable.c,v 1.7 1998/06/16 07:29:21 momjian Exp $
5+
* $Id: variable.c,v 1.8 1998/07/18 18:34:01 momjian Exp $
66
*
77
*/
88

@@ -15,7 +15,7 @@
1515
#include"commands/variable.h"
1616
#include"utils/builtins.h"
1717
#include"optimizer/internal.h"
18-
#ifdefMB
18+
#ifdefMULTIBYTE
1919
#include"regex/pg_wchar.h"
2020
#endif
2121

@@ -522,7 +522,7 @@ reset_timezone()
522522
return TRUE;
523523
}/* reset_timezone() */
524524

525-
#ifdefMB
525+
#ifdefMULTIBYTE
526526
/*-----------------------------------------------------------------------*/
527527
bool
528528
parse_client_encoding(constchar*value)
@@ -535,7 +535,7 @@ parse_client_encoding(const char *value)
535535
}else {
536536
if (pg_set_client_encoding(encoding)) {
537537
elog(ERROR,"Conversion between %s and %s is not supported",
538-
value,pg_encoding_to_char(MB));
538+
value,pg_encoding_to_char(MULTIBYTE));
539539
}
540540
}
541541
return TRUE;
@@ -558,10 +558,10 @@ reset_client_encoding()
558558
if (env) {
559559
encoding=pg_char_to_encoding(env);
560560
if (encoding<0) {
561-
encoding=MB;
561+
encoding=MULTIBYTE;
562562
}
563563
}else {
564-
encoding=MB;
564+
encoding=MULTIBYTE;
565565
}
566566
pg_set_client_encoding(encoding);
567567
return TRUE;
@@ -598,7 +598,7 @@ struct VariableParsers
598598
{
599599
"r_plans",parse_r_plans,show_r_plans,reset_r_plans
600600
},
601-
#ifdefMB
601+
#ifdefMULTIBYTE
602602
{
603603
"client_encoding",parse_client_encoding,show_client_encoding,reset_client_encoding
604604
},

‎src/backend/libpq/pqcomm.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.48 1998/07/09 03:28:46 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.49 1998/07/18 18:34:03 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -67,7 +67,7 @@
6767
#include"libpq/auth.h"
6868
#include"libpq/libpq.h"/* where the declarations go */
6969
#include"storage/ipc.h"
70-
#ifdefMB
70+
#ifdefMULTIBYTE
7171
#include"commands/variable.h"
7272
#endif
7373

@@ -181,7 +181,7 @@ pq_getstr(char *s, int maxlen)
181181
{
182182
intc='\0';
183183

184-
#ifdefMB
184+
#ifdefMULTIBYTE
185185
unsignedchar*p,*ps;
186186
intlen;
187187

@@ -199,7 +199,7 @@ pq_getstr(char *s, int maxlen)
199199
*s++=c;
200200
*s='\0';
201201

202-
#ifdefMB
202+
#ifdefMULTIBYTE
203203
p=pg_client_to_server(ps,len);
204204
if (ps!=p) {/* actual conversion has been done? */
205205
strcpy(ps,p);
@@ -341,7 +341,7 @@ pq_getint(int b)
341341
void
342342
pq_putstr(char*s)
343343
{
344-
#ifdefMB
344+
#ifdefMULTIBYTE
345345
unsignedchar*p;
346346

347347
p=pg_server_to_client(s,strlen(s));
@@ -740,7 +740,7 @@ StreamOpen(char *hostName, short portName, Port *port)
740740
return (STATUS_OK);
741741
}
742742

743-
#ifdefMB
743+
#ifdefMULTIBYTE
744744
void
745745
pq_putncharlen(char*s,intn)
746746
{

‎src/backend/regex/engine.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,14 +117,14 @@ extern"C"
117117
#defineEOW(BOL+5)
118118
#defineCODEMAX (BOL+5)/* highest code used */
119119

120-
#ifdefMB
121-
# ifMB==MULE_INTERNAL
120+
#ifdefMULTIBYTE
121+
# ifMULTIBYTE==MULE_INTERNAL
122122
# defineNONCHAR(c)((c) > 16777216)/* 16777216 == 2^24 == 3 bytes */
123123
# defineNNONCHAR(CODEMAX-16777216)
124-
# elifMB==EUC_JP||MB==EUC_CN||MB==EUC_KR||MB==EUC_TW
124+
# elifMULTIBYTE==EUC_JP||MULTIBYTE==EUC_CN||MULTIBYTE==EUC_KR||MULTIBYTE==EUC_TW
125125
# defineNONCHAR(c)((c) > USHRT_MAX)
126126
# defineNNONCHAR(CODEMAX-USHRT_MAX)
127-
# elifMB==UNICODE
127+
# elifMULTIBYTE==UNICODE
128128
# defineNONCHAR(c)((c) > USHRT_MAX)
129129
# defineNNONCHAR(CODEMAX-USHRT_MAX)
130130
# else/* assume 1 byte code such as ISO8859-1 */
@@ -200,7 +200,7 @@ inteflags;
200200
else
201201
{
202202
start=string;
203-
#ifdefMB
203+
#ifdefMULTIBYTE
204204
stop=start+pg_wchar_strlen(start);
205205
#else
206206
stop=start+strlen(start);
@@ -214,7 +214,7 @@ inteflags;
214214
{
215215
for (dp=start;dp<stop;dp++)
216216
if (*dp==g->must[0]&&stop-dp >=g->mlen&&
217-
#ifdefMB
217+
#ifdefMULTIBYTE
218218
memcmp(dp,g->must, (size_t) (g->mlen*sizeof(pg_wchar)))==0)
219219
#else
220220
memcmp(dp,g->must, (size_t)g->mlen)==0)
@@ -1165,7 +1165,7 @@ sopnostopst;
11651165

11661166
staticintpg_isprint(intc)
11671167
{
1168-
#ifdefMB
1168+
#ifdefMULTIBYTE
11691169
return(c >=0&&c <=UCHAR_MAX&&isprint(c));
11701170
#else
11711171
return(isprint(c));

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp