Skip to content

Commit fde5539

Browse files
gaoxueyugaoxueyu
authored
Merge pull request #759 from bigplaice/set_version_to_be_1.17
modify the version to be 1.17
2 parents c2503d5 + a3ea81f commit fde5539

File tree

5 files changed

+132
-3
lines changed

5 files changed

+132
-3
lines changed

‎configure‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2827,7 +2827,7 @@ _ACEOF
28272827

28282828

28292829
# IvorySQL version
2830-
PACKAGE_IVORYSQL_VERSION='1.8'
2830+
PACKAGE_IVORYSQL_VERSION='1.17'
28312831

28322832
PG_MAJORVERSION=`expr "$PACKAGE_VERSION" : '\([0-9][0-9]*\)'`
28332833
PG_MINORVERSION=`expr "$PACKAGE_VERSION" : '.*\.\([0-9][0-9]*\)'`

‎configure.ac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ AC_PREFIX_DEFAULT(/usr/local/pgsql)
3030
AC_DEFINE_UNQUOTED(CONFIGURE_ARGS, ["$ac_configure_args"], [Saved arguments from configure])
3131

3232
# IvorySQL version
33-
PACKAGE_IVORYSQL_VERSION='1.8'
33+
PACKAGE_IVORYSQL_VERSION='1.17'
3434

3535
[PG_MAJORVERSION=`expr "$PACKAGE_VERSION" : '\([0-9][0-9]*\)'`]
3636
[PG_MINORVERSION=`expr "$PACKAGE_VERSION" : '.*\.\([0-9][0-9]*\)'`]

‎src/oracle_test/modules/test_pg_dump/expected/test_pg_dump_1.out‎

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
CREATE ROLE regress_dump_test_role;
2+
CREATE EXTENSION test_pg_dump;
3+
ALTER EXTENSION test_pg_dump ADD DATABASE postgres; -- error
4+
ERROR: cannot add an object of this type to an extension
5+
CREATE TABLE test_pg_dump_t1 (c1 int, junk text);
6+
ALTER TABLE test_pg_dump_t1 DROP COLUMN junk; -- to exercise dropped-col cases
7+
CREATE VIEW test_pg_dump_v1 AS SELECT * FROM test_pg_dump_t1;
8+
CREATE MATERIALIZED VIEW test_pg_dump_mv1 AS SELECT * FROM test_pg_dump_t1;
9+
CREATE SCHEMA test_pg_dump_s1;
10+
CREATE TYPE test_pg_dump_e1 AS ENUM ('abc', 'def');
11+
CREATE AGGREGATE newavg (
12+
sfunc = int4_avg_accum, basetype = int4, stype = _int8,
13+
finalfunc = int8_avg,
14+
initcond1 = '{0,0}'
15+
);
16+
CREATE FUNCTION test_pg_dump(int) RETURNS int AS $$
17+
BEGIN
18+
RETURN abs($1);
19+
END
20+
$$ LANGUAGE plpgsql IMMUTABLE;
21+
/
22+
CREATE OPERATOR ==== (
23+
LEFTARG = int,
24+
RIGHTARG = int,
25+
PROCEDURE = int4eq,
26+
COMMUTATOR = ====
27+
);
28+
CREATE ACCESS METHOD gist2 TYPE INDEX HANDLER gisthandler;
29+
CREATE TYPE casttesttype;
30+
CREATE FUNCTION casttesttype_in(cstring)
31+
RETURNS casttesttype
32+
AS 'textin'
33+
LANGUAGE internal STRICT IMMUTABLE;
34+
/
35+
NOTICE: return type casttesttype is only a shell
36+
CREATE FUNCTION casttesttype_out(casttesttype)
37+
RETURNS cstring
38+
AS 'textout'
39+
LANGUAGE internal STRICT IMMUTABLE;
40+
/
41+
NOTICE: argument type casttesttype is only a shell
42+
CREATE TYPE casttesttype (
43+
internallength = variable,
44+
input = casttesttype_in,
45+
output = casttesttype_out,
46+
alignment = int4
47+
);
48+
CREATE CAST (text AS casttesttype) WITHOUT FUNCTION;
49+
CREATE FOREIGN DATA WRAPPER dummy;
50+
CREATE SERVER s0 FOREIGN DATA WRAPPER dummy;
51+
CREATE FOREIGN TABLE ft1 (
52+
c1 integer OPTIONS ("param 1" 'val1') NOT NULL,
53+
c2 text OPTIONS (param2 'val2', param3 'val3') CHECK (c2 <> ''),
54+
c3 date,
55+
CHECK (c3 BETWEEN '1994-01-01'::date AND '1994-01-31'::date)
56+
) SERVER s0 OPTIONS (delimiter ',', quote '"', "be quoted" 'value');
57+
REVOKE EXECUTE ON FUNCTION test_pg_dump(int) FROM PUBLIC;
58+
GRANT EXECUTE ON FUNCTION test_pg_dump(int) TO regress_dump_test_role;
59+
GRANT SELECT (c1) ON test_pg_dump_t1 TO regress_dump_test_role;
60+
GRANT SELECT ON test_pg_dump_v1 TO regress_dump_test_role;
61+
GRANT USAGE ON FOREIGN DATA WRAPPER dummy TO regress_dump_test_role;
62+
GRANT USAGE ON FOREIGN SERVER s0 TO regress_dump_test_role;
63+
GRANT SELECT (c1) ON ft1 TO regress_dump_test_role;
64+
GRANT SELECT ON ft1 TO regress_dump_test_role;
65+
GRANT UPDATE ON test_pg_dump_mv1 TO regress_dump_test_role;
66+
GRANT USAGE ON SCHEMA test_pg_dump_s1 TO regress_dump_test_role;
67+
GRANT USAGE ON TYPE test_pg_dump_e1 TO regress_dump_test_role;
68+
ALTER EXTENSION test_pg_dump ADD ACCESS METHOD gist2;
69+
ALTER EXTENSION test_pg_dump ADD AGGREGATE newavg(int4);
70+
ALTER EXTENSION test_pg_dump ADD CAST (text AS casttesttype);
71+
ALTER EXTENSION test_pg_dump ADD FOREIGN DATA WRAPPER dummy;
72+
ALTER EXTENSION test_pg_dump ADD FOREIGN TABLE ft1;
73+
ALTER EXTENSION test_pg_dump ADD MATERIALIZED VIEW test_pg_dump_mv1;
74+
ALTER EXTENSION test_pg_dump ADD OPERATOR ==== (int, int);
75+
ALTER EXTENSION test_pg_dump ADD SCHEMA test_pg_dump_s1;
76+
ALTER EXTENSION test_pg_dump ADD SERVER s0;
77+
ALTER EXTENSION test_pg_dump ADD FUNCTION test_pg_dump(int);
78+
ALTER EXTENSION test_pg_dump ADD TABLE test_pg_dump_t1;
79+
ALTER EXTENSION test_pg_dump ADD TYPE test_pg_dump_e1;
80+
ALTER EXTENSION test_pg_dump ADD VIEW test_pg_dump_v1;
81+
REVOKE SELECT (c1) ON test_pg_dump_t1 FROM regress_dump_test_role;
82+
REVOKE SELECT ON test_pg_dump_v1 FROM regress_dump_test_role;
83+
REVOKE USAGE ON FOREIGN DATA WRAPPER dummy FROM regress_dump_test_role;
84+
ALTER EXTENSION test_pg_dump DROP ACCESS METHOD gist2;
85+
ALTER EXTENSION test_pg_dump DROP AGGREGATE newavg(int4);
86+
ALTER EXTENSION test_pg_dump DROP CAST (text AS casttesttype);
87+
ALTER EXTENSION test_pg_dump DROP FOREIGN DATA WRAPPER dummy;
88+
ALTER EXTENSION test_pg_dump DROP FOREIGN TABLE ft1;
89+
ALTER EXTENSION test_pg_dump DROP FUNCTION test_pg_dump(int);
90+
ALTER EXTENSION test_pg_dump DROP MATERIALIZED VIEW test_pg_dump_mv1;
91+
ALTER EXTENSION test_pg_dump DROP OPERATOR ==== (int, int);
92+
ALTER EXTENSION test_pg_dump DROP SCHEMA test_pg_dump_s1;
93+
ALTER EXTENSION test_pg_dump DROP SERVER s0;
94+
ALTER EXTENSION test_pg_dump DROP TABLE test_pg_dump_t1;
95+
ALTER EXTENSION test_pg_dump DROP TYPE test_pg_dump_e1;
96+
ALTER EXTENSION test_pg_dump DROP VIEW test_pg_dump_v1;
97+
DROP OWNED BY regress_dump_test_role RESTRICT;
98+
DROP ROLE regress_dump_test_role;
99+
DROP EXTENSION test_pg_dump;
100+
-- shouldn't be anything left in pg_init_privs
101+
SELECT * FROM pg_init_privs WHERE privtype = 'e';
102+
objoid | classoid | objsubid | privtype | initprivs
103+
--------+----------+----------+----------+-----------------------------------
104+
14890 | 1259 | 0 | e | {highgo=rwU/highgo,=rwU/highgo}
105+
14924 | 1259 | 0 | e | {highgo=arwdDxt/highgo,=r/highgo}
106+
14929 | 1259 | 0 | e | {highgo=arwdDxt/highgo,=r/highgo}
107+
14934 | 1259 | 0 | e | {highgo=arwdDxt/highgo,=r/highgo}
108+
14940 | 1259 | 0 | e | {highgo=arwdDxt/highgo,=r/highgo}
109+
14945 | 1259 | 0 | e | {highgo=arwdDxt/highgo,=r/highgo}
110+
14950 | 1259 | 0 | e | {highgo=arwdDxt/highgo,=r/highgo}
111+
14956 | 1259 | 0 | e | {highgo=arwdDxt/highgo,=r/highgo}
112+
14961 | 1259 | 0 | e | {highgo=arwdDxt/highgo,=r/highgo}
113+
14966 | 1259 | 0 | e | {highgo=arwdDxt/highgo,=r/highgo}
114+
(10 rows)
115+

‎src/oracle_test/perl/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ include $(top_builddir)/src/Makefile.global
1717
ifeq ($(enable_tap_tests),yes)
1818

1919
installdirs:
20-
$(MKDIR_P) '$(DESTDIR)$(pgxsdir)/$(subdir)'
20+
$(MKDIR_P) '$(DESTDIR)$(pgxsdir)/$(subdir)/PostgreSQL/Test'
2121

2222
install: all installdirs
2323
$(INSTALL_DATA) $(srcdir)/TestLib.pm '$(DESTDIR)$(pgxsdir)/$(subdir)/TestLib.pm'

‎src/oracle_test/regress/expected/xml_2.out‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ ERROR: invalid XML content
1010
LINE 1: INSERT INTO xmltest VALUES (3, '<wrong');
1111
^
1212
DETAIL: line 1: Couldn't find end of Start Tag wrong line 1
13+
<wrong
14+
^
1315
SELECT * FROM xmltest;
1416
id | data
1517
----+--------------------
@@ -62,6 +64,8 @@ ERROR: invalid XML content
6264
LINE 1: SELECT xmlconcat('bad', '<syntax');
6365
^
6466
DETAIL: line 1: Couldn't find end of Start Tag syntax line 1
67+
<syntax
68+
^
6569
SELECT xmlconcat('<foo/>', NULL, '<?xml version="1.1" standalone="no"?><bar/>');
6670
xmlconcat
6771
--------------
@@ -245,6 +249,8 @@ DETAIL: line 1: Entity 'idontexist' not defined
245249
<twoerrors>&idontexist;</unbalanced>
246250
^
247251
line 1: Opening and ending tag mismatch: twoerrors line 1 and unbalanced
252+
<twoerrors>&idontexist;</unbalanced>
253+
^
248254
SELECT xmlparse(content '<nosuchprefix:tag/>');
249255
xmlparse
250256
---------------------
@@ -254,6 +260,8 @@ SELECT xmlparse(content '<nosuchprefix:tag/>');
254260
SELECT xmlparse(document ' ');
255261
ERROR: invalid XML document
256262
DETAIL: line 1: Start tag expected, '<' not found
263+
264+
^
257265
SELECT xmlparse(document 'abc');
258266
ERROR: invalid XML document
259267
DETAIL: line 1: Start tag expected, '<' not found
@@ -271,12 +279,16 @@ DETAIL: line 1: xmlParseEntityRef: no name
271279
<invalidentity>&</abc>
272280
^
273281
line 1: Opening and ending tag mismatch: invalidentity line 1 and abc
282+
<invalidentity>&</abc>
283+
^
274284
SELECT xmlparse(document '<undefinedentity>&idontexist;</abc>');
275285
ERROR: invalid XML document
276286
DETAIL: line 1: Entity 'idontexist' not defined
277287
<undefinedentity>&idontexist;</abc>
278288
^
279289
line 1: Opening and ending tag mismatch: undefinedentity line 1 and abc
290+
<undefinedentity>&idontexist;</abc>
291+
^
280292
SELECT xmlparse(document '<invalidns xmlns=''&lt;''/>');
281293
xmlparse
282294
---------------------------
@@ -295,6 +307,8 @@ DETAIL: line 1: Entity 'idontexist' not defined
295307
<twoerrors>&idontexist;</unbalanced>
296308
^
297309
line 1: Opening and ending tag mismatch: twoerrors line 1 and unbalanced
310+
<twoerrors>&idontexist;</unbalanced>
311+
^
298312
SELECT xmlparse(document '<nosuchprefix:tag/>');
299313
xmlparse
300314
---------------------

0 commit comments

Comments
 (0)