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

Commit1bd5e05

Browse files
author
Michael Meskes
committed
Hide Informix datatypes. They are not seen by our built process anymore.
1 parent17f6824 commit1bd5e05

File tree

8 files changed

+93
-73
lines changed

8 files changed

+93
-73
lines changed

‎src/interfaces/ecpg/ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1661,6 +1661,10 @@ Fri Sep 26 17:14:07 CEST 2003
16611661

16621662
- Incorrect datatype with precision argument should not create a
16631663
segfault.
1664+
1665+
Fri Oct 3 12:04:57 CEST 2003
1666+
1667+
- Hide Informix datatypes in PostgreSQL built process.
16641668
- Set ecpg version to 3.0.0
16651669
- Set ecpg library to 4.0.0
16661670
- Set pgtypes library to 1.0.0

‎src/interfaces/ecpg/compatlib/informix.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
#include<ctype.h>
66

77
#include<ecpgtype.h>
8-
#include<ecpg_informix.h>
8+
#include<compatlib.h>
99
#include<pgtypes_error.h>
1010
#include<pgtypes_date.h>
11+
#include<pgtypes_numeric.h>
1112
#include<sqltypes.h>
1213

1314
char*ECPGalloc(long,int);
@@ -886,7 +887,7 @@ rtypwidth(int sqltype, int sqllen)
886887
}
887888

888889
int
889-
dtcvfmtasc(char*inbuf,char*fmtstr,dtime_t*dtvalue)
890+
dtcvfmtasc(char*inbuf,char*fmtstr,timestamp*dtvalue)
890891
{
891892
returnPGTYPEStimestamp_defmt_asc(inbuf,fmtstr,dtvalue);
892893
}

‎src/interfaces/ecpg/include/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ include $(top_builddir)/src/Makefile.global
55
install: all installdirs install-headers
66

77
.PHONY: install-headers
8-
ecpg_headers = ecpgerrno.h ecpglib.h ecpgtype.h sqlca.h sql3types.h ecpg_informix.h pgtypes_error.h pgtypes_numeric.h pgtypes_timestamp.h pgtypes_date.h datetime.h decimal.h pgtypes_interval.h sqltypes.h
8+
ecpg_headers = ecpgerrno.h ecpglib.h ecpgtype.h sqlca.h sql3types.h ecpg_informix.h pgtypes_error.h pgtypes_numeric.h pgtypes_timestamp.h pgtypes_date.h datetime.h decimal.h pgtypes_interval.h sqltypes.h compatlib.h
99

1010
install-headers:$(ecpg_headers)
1111
foriin $^;do$(INSTALL_DATA)$$i$(DESTDIR)$(includedir);done
Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
#ifndef_COMPATLIB_H
2+
#define_COMPATLIB_H
3+
/*
4+
* This file contains stuff needed to be as compatible to other DBMS as possible.
5+
*/
6+
7+
#include<ecpglib.h>
8+
#include<pgtypes_date.h>
9+
#include<pgtypes_interval.h>
10+
#include<pgtypes_numeric.h>
11+
#include<pgtypes_timestamp.h>
12+
13+
/* The following stuff is for Informix compatibility */
14+
15+
#defineSQLNOTFOUND 100
16+
17+
#defineECPG_INFORMIX_NUM_OVERFLOW-1200
18+
#defineECPG_INFORMIX_NUM_UNDERFLOW-1201
19+
#defineECPG_INFORMIX_DIVIDE_ZERO-1202
20+
#defineECPG_INFORMIX_BAD_YEAR-1204
21+
#defineECPG_INFORMIX_BAD_MONTH-1205
22+
#defineECPG_INFORMIX_BAD_DAY-1206
23+
#defineECPG_INFORMIX_ENOSHORTDATE-1209
24+
#defineECPG_INFORMIX_DATE_CONVERT-1210
25+
#defineECPG_INFORMIX_OUT_OF_MEMORY-1211
26+
#defineECPG_INFORMIX_ENOTDMY-1212
27+
#defineECPG_INFORMIX_BAD_NUMERIC-1213
28+
#defineECPG_INFORMIX_BAD_EXPONENT-1216
29+
#defineECPG_INFORMIX_BAD_DATE-1218
30+
#defineECPG_INFORMIX_EXTRA_CHARS-1264
31+
32+
externintrdatestr(date,char*);
33+
externvoidrtoday(date*);
34+
externintrjulmdy(date,short*);
35+
externintrdefmtdate(date*,char*,char*);
36+
externintrfmtdate(date,char*,char*);
37+
externintrmdyjul(short*,date*);
38+
externintrstrdate(char*,date*);
39+
externintrdayofweek(date);
40+
41+
externintrfmtlong(long,char*,char*);
42+
externintrgetmsg(int,char*,int);
43+
externintrisnull(int,char*);
44+
externintrsetnull(int,char*);
45+
externintrtypalign(int,int);
46+
externintrtypmsize(int,int);
47+
externintrtypwidth(int,int);
48+
externvoidrupshift(char*);
49+
50+
externintbyleng(char*,int);
51+
externvoidldchar(char*,int,char*);
52+
53+
externvoidECPG_informix_set_var(int,void*,int);
54+
externvoid*ECPG_informix_get_var(int);
55+
56+
/* Informix defines these in decimal.h */
57+
intdecadd(decimal*,decimal*,decimal*);
58+
intdeccmp(decimal*,decimal*);
59+
voiddeccopy(decimal*,decimal*);
60+
intdeccvasc(char*,int,decimal*);
61+
intdeccvdbl(double,decimal*);
62+
intdeccvint(int,decimal*);
63+
intdeccvlong(long,decimal*);
64+
intdecdiv(decimal*,decimal*,decimal*);
65+
intdecmul(decimal*,decimal*,decimal*);
66+
intdecsub(decimal*,decimal*,decimal*);
67+
intdectoasc(decimal*,char*,int,int);
68+
intdectodbl(decimal*,double*);
69+
intdectoint(decimal*,int*);
70+
intdectolong(decimal*,long*);
71+
72+
/* Informix defines these in datetime.h */
73+
74+
externvoiddtcurrent(timestamp*);
75+
externintdtcvasc(char*,timestamp*);
76+
externintdtsub(timestamp*,timestamp*,interval*);
77+
externintdttoasc(timestamp*,char*);
78+
externintdttofmtasc(timestamp*,char*,int,char*);
79+
externintintoasc(interval*,char*);
80+
externintdtcvfmtasc(char*,char*,timestamp*);
81+
82+
#endif/* ndef _COMPATLIB_H */
Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
11
#ifndef_ECPG_DATETIME_H
22
#define_ECPG_DATETIME_H
33

4-
#include<pgtypes_timestamp.h>
5-
#include<pgtypes_interval.h>
4+
#include<compatlib.h>
65

76
typedeftimestampdtime_t;
87
typedefintervalintrvl_t;
98

10-
externvoiddtcurrent(dtime_t*);
11-
externintdtcvasc(char*,dtime_t*);
12-
externintdtsub(dtime_t*,dtime_t*,intrvl_t*);
13-
externintdttoasc(dtime_t*,char*);
14-
externintdttofmtasc(dtime_t*,char*,int,char*);
15-
externintintoasc(intrvl_t*,char*);
16-
externintdtcvfmtasc(char*,char*,dtime_t*);
17-
189
#endif/* ndef _ECPG_DATETIME_H */

‎src/interfaces/ecpg/include/decimal.h

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,8 @@
11
#ifndef_ECPG_DECIMAL_H
22
#define_ECPG_DECIMAL_H
33

4-
#include<pgtypes_numeric.h>
4+
#include<compatlib.h>
55

66
typedefdecimaldec_t;
77

8-
intdecadd(dec_t*,dec_t*,dec_t*);
9-
intdeccmp(dec_t*,dec_t*);
10-
voiddeccopy(dec_t*,dec_t*);
11-
intdeccvasc(char*,int,dec_t*);
12-
intdeccvdbl(double,dec_t*);
13-
intdeccvint(int,dec_t*);
14-
intdeccvlong(long,dec_t*);
15-
intdecdiv(dec_t*,dec_t*,dec_t*);
16-
intdecmul(dec_t*,dec_t*,dec_t*);
17-
intdecsub(dec_t*,dec_t*,dec_t*);
18-
intdectoasc(dec_t*,char*,int,int);
19-
intdectodbl(dec_t*,double*);
20-
intdectoint(dec_t*,int*);
21-
intdectolong(dec_t*,long*);
22-
238
#endif/* ndef _ECPG_DECIMAL_H */

‎src/interfaces/ecpg/include/ecpg_informix.h

Lines changed: 1 addition & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -6,48 +6,6 @@
66

77
#include<decimal.h>
88
#include<datetime.h>
9-
#include<ecpglib.h>
10-
#include<pgtypes_date.h>
11-
12-
#defineSQLNOTFOUND 100
13-
14-
#defineECPG_INFORMIX_NUM_OVERFLOW-1200
15-
#defineECPG_INFORMIX_NUM_UNDERFLOW-1201
16-
#defineECPG_INFORMIX_DIVIDE_ZERO-1202
17-
#defineECPG_INFORMIX_BAD_YEAR-1204
18-
#defineECPG_INFORMIX_BAD_MONTH-1205
19-
#defineECPG_INFORMIX_BAD_DAY-1206
20-
#defineECPG_INFORMIX_ENOSHORTDATE-1209
21-
#defineECPG_INFORMIX_DATE_CONVERT-1210
22-
#defineECPG_INFORMIX_OUT_OF_MEMORY-1211
23-
#defineECPG_INFORMIX_ENOTDMY-1212
24-
#defineECPG_INFORMIX_BAD_NUMERIC-1213
25-
#defineECPG_INFORMIX_BAD_EXPONENT-1216
26-
#defineECPG_INFORMIX_BAD_DATE-1218
27-
#defineECPG_INFORMIX_EXTRA_CHARS-1264
28-
29-
externintrdatestr(date,char*);
30-
externvoidrtoday(date*);
31-
externintrjulmdy(date,short*);
32-
externintrdefmtdate(date*,char*,char*);
33-
externintrfmtdate(date,char*,char*);
34-
externintrmdyjul(short*,date*);
35-
externintrstrdate(char*,date*);
36-
externintrdayofweek(date);
37-
38-
externintrfmtlong(long,char*,char*);
39-
externintrgetmsg(int,char*,int);
40-
externintrisnull(int,char*);
41-
externintrsetnull(int,char*);
42-
externintrtypalign(int,int);
43-
externintrtypmsize(int,int);
44-
externintrtypwidth(int,int);
45-
externvoidrupshift(char*);
46-
47-
externintbyleng(char*,int);
48-
externvoidldchar(char*,int,char*);
49-
50-
externvoidECPG_informix_set_var(int,void*,int);
51-
externvoid*ECPG_informix_get_var(int);
9+
#include<compatlib.h>
5210

5311
#endif/* ndef _ECPG_INFORMIX_H */

‎src/interfaces/ecpg/pgtypeslib/interval.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include"dt.h"
1111
#include"pgtypes_error.h"
1212
#include"pgtypes_interval.h"
13-
#include"datetime.h"
1413

1514
/* TrimTrailingZeros()
1615
* ... resulting from printing numbers with full precision.

0 commit comments

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