diff --git a/.gitignore b/.gitignore index 07eb4f3..1b4ef6d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ postgresql-9.0beta1.tar.gz /postgresql-9.0.0.tar.gz +/postgresql-9.0.1.tar.gz diff --git a/sepostgresql-9.0-fullset.patch b/sepostgresql-9.0-fullset.patch index 01b861d..f3dddff 100644 --- a/sepostgresql-9.0-fullset.patch +++ b/sepostgresql-9.0-fullset.patch @@ -1,5 +1,5 @@ diff --git a/configure b/configure -index 7c54dc6..bb7e49c 100755 +index c4ba09e..bbed799 100755 --- a/configure +++ b/configure @@ -708,6 +708,7 @@ LDFLAGS_EX @@ -229,7 +229,7 @@ index 7c54dc6..bb7e49c 100755 # diff --git a/configure.in b/configure.in -index d7fec2c..cc3b119 100644 +index c381505..14d0aba 100644 --- a/configure.in +++ b/configure.in @@ -755,6 +755,19 @@ PGAC_ARG_BOOL(with, zlib, yes, @@ -3092,7 +3092,7 @@ index 2e5a7df..9647622 100644 /* * Modify the owner --- okay to scribble on tup because it's a copy diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c -index 4e95a83..a09eabe 100644 +index a6e1d35..50921ec 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -22,7 +22,10 @@ @@ -7374,10 +7374,10 @@ index 464183d..67d0316 100644 PG_RETURN_INT32(0); diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c -index 3e237c1..387d85d 100644 +index 6e6844b..8d58a17 100644 --- a/src/backend/nodes/copyfuncs.c +++ b/src/backend/nodes/copyfuncs.c -@@ -1824,6 +1824,7 @@ _copyRangeTblEntry(RangeTblEntry *from) +@@ -1825,6 +1825,7 @@ _copyRangeTblEntry(RangeTblEntry *from) COPY_SCALAR_FIELD(checkAsUser); COPY_BITMAPSET_FIELD(selectedCols); COPY_BITMAPSET_FIELD(modifiedCols); @@ -7385,7 +7385,7 @@ index 3e237c1..387d85d 100644 return newnode; } -@@ -2756,6 +2757,21 @@ _copyAlterOwnerStmt(AlterOwnerStmt *from) +@@ -2757,6 +2758,21 @@ _copyAlterOwnerStmt(AlterOwnerStmt *from) return newnode; } @@ -7407,7 +7407,7 @@ index 3e237c1..387d85d 100644 static RuleStmt * _copyRuleStmt(RuleStmt *from) { -@@ -3970,6 +3986,9 @@ copyObject(void *from) +@@ -3971,6 +3987,9 @@ copyObject(void *from) case T_AlterOwnerStmt: retval = _copyAlterOwnerStmt(from); break; @@ -7418,10 +7418,10 @@ index 3e237c1..387d85d 100644 retval = _copyRuleStmt(from); break; diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c -index dc5f883..33f2f5d 100644 +index 6e00584..2adfa91 100644 --- a/src/backend/nodes/equalfuncs.c +++ b/src/backend/nodes/equalfuncs.c -@@ -1308,6 +1308,19 @@ _equalAlterOwnerStmt(AlterOwnerStmt *a, AlterOwnerStmt *b) +@@ -1309,6 +1309,19 @@ _equalAlterOwnerStmt(AlterOwnerStmt *a, AlterOwnerStmt *b) } static bool @@ -7441,7 +7441,7 @@ index dc5f883..33f2f5d 100644 _equalRuleStmt(RuleStmt *a, RuleStmt *b) { COMPARE_NODE_FIELD(relation); -@@ -2187,6 +2200,7 @@ _equalRangeTblEntry(RangeTblEntry *a, RangeTblEntry *b) +@@ -2188,6 +2201,7 @@ _equalRangeTblEntry(RangeTblEntry *a, RangeTblEntry *b) COMPARE_SCALAR_FIELD(checkAsUser); COMPARE_BITMAPSET_FIELD(selectedCols); COMPARE_BITMAPSET_FIELD(modifiedCols); @@ -7449,7 +7449,7 @@ index dc5f883..33f2f5d 100644 return true; } -@@ -2658,6 +2672,9 @@ equal(void *a, void *b) +@@ -2659,6 +2673,9 @@ equal(void *a, void *b) case T_AlterOwnerStmt: retval = _equalAlterOwnerStmt(a, b); break; @@ -7460,10 +7460,10 @@ index dc5f883..33f2f5d 100644 retval = _equalRuleStmt(a, b); break; diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c -index 48c0888..34632d2 100644 +index ae0e2ab..36eee35 100644 --- a/src/backend/nodes/outfuncs.c +++ b/src/backend/nodes/outfuncs.c -@@ -2136,6 +2136,7 @@ _outRangeTblEntry(StringInfo str, RangeTblEntry *node) +@@ -2137,6 +2137,7 @@ _outRangeTblEntry(StringInfo str, RangeTblEntry *node) WRITE_OID_FIELD(checkAsUser); WRITE_BITMAPSET_FIELD(selectedCols); WRITE_BITMAPSET_FIELD(modifiedCols); @@ -15191,10 +15191,10 @@ index 79ca6c1..70fc9fb 100644 OIDOID, -1, 0); TupleDescInitEntry(tupdesc, (AttrNumber) 2, "grantee", diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c -index 8e342a9..2cbd1d9 100644 +index 705fcf1..e897f55 100644 --- a/src/backend/utils/adt/datetime.c +++ b/src/backend/utils/adt/datetime.c -@@ -4200,7 +4200,7 @@ pg_timezone_abbrevs(PG_FUNCTION_ARGS) +@@ -4213,7 +4213,7 @@ pg_timezone_abbrevs(PG_FUNCTION_ARGS) * build tupdesc for result tuples. This must match this function's * pg_proc entry! */ @@ -15203,7 +15203,7 @@ index 8e342a9..2cbd1d9 100644 TupleDescInitEntry(tupdesc, (AttrNumber) 1, "abbrev", TEXTOID, -1, 0); TupleDescInitEntry(tupdesc, (AttrNumber) 2, "utc_offset", -@@ -4293,7 +4293,7 @@ pg_timezone_names(PG_FUNCTION_ARGS) +@@ -4306,7 +4306,7 @@ pg_timezone_names(PG_FUNCTION_ARGS) * build tupdesc for result tuples. This must match this function's * pg_proc entry! */ @@ -15983,7 +15983,7 @@ index 4e55b16..a9f9f7e 100644 TEXTOID, -1, 0); TupleDescInitEntry(tupdesc, (AttrNumber) 2, "setting", diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample -index a3b1457..b78c6d9 100644 +index e1f5ab6..43f47f6 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -76,6 +76,8 @@ @@ -16295,7 +16295,7 @@ index 0a135ee..27b2ef5 100644 char *defn; char *dropStmt; diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c -index 7a06f9b..f7fa80a 100644 +index f93affd..0a89cf2 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -125,7 +125,7 @@ static int binary_upgrade = 0; @@ -16882,7 +16882,7 @@ index 7a06f9b..f7fa80a 100644 } PQclear(res); -@@ -6147,7 +6220,7 @@ dumpComment(Archive *fout, const char *target, +@@ -6153,7 +6226,7 @@ dumpComment(Archive *fout, const char *target, */ ArchiveEntry(fout, nilCatalogId, createDumpId(), target, namespace, NULL, owner, @@ -16891,7 +16891,7 @@ index 7a06f9b..f7fa80a 100644 query->data, "", NULL, &(dumpId), 1, NULL, NULL); -@@ -6208,7 +6281,7 @@ dumpTableComment(Archive *fout, TableInfo *tbinfo, +@@ -6214,7 +6287,7 @@ dumpTableComment(Archive *fout, TableInfo *tbinfo, target->data, tbinfo->dobj.namespace->dobj.name, NULL, tbinfo->rolname, @@ -16900,7 +16900,7 @@ index 7a06f9b..f7fa80a 100644 query->data, "", NULL, &(tbinfo->dobj.dumpId), 1, NULL, NULL); -@@ -6230,7 +6303,7 @@ dumpTableComment(Archive *fout, TableInfo *tbinfo, +@@ -6236,7 +6309,7 @@ dumpTableComment(Archive *fout, TableInfo *tbinfo, target->data, tbinfo->dobj.namespace->dobj.name, NULL, tbinfo->rolname, @@ -16909,7 +16909,7 @@ index 7a06f9b..f7fa80a 100644 query->data, "", NULL, &(tbinfo->dobj.dumpId), 1, NULL, NULL); -@@ -6510,7 +6583,7 @@ dumpDumpableObject(Archive *fout, DumpableObject *dobj) +@@ -6516,7 +6589,7 @@ dumpDumpableObject(Archive *fout, DumpableObject *dobj) case DO_BLOB_DATA: ArchiveEntry(fout, dobj->catId, dobj->dumpId, dobj->name, NULL, NULL, "", @@ -16918,7 +16918,7 @@ index 7a06f9b..f7fa80a 100644 "", "", NULL, dobj->dependencies, dobj->nDeps, dumpBlobs, NULL); -@@ -6550,7 +6623,7 @@ dumpNamespace(Archive *fout, NamespaceInfo *nspinfo) +@@ -6556,7 +6629,7 @@ dumpNamespace(Archive *fout, NamespaceInfo *nspinfo) nspinfo->dobj.name, NULL, NULL, nspinfo->rolname, @@ -16927,7 +16927,7 @@ index 7a06f9b..f7fa80a 100644 q->data, delq->data, NULL, nspinfo->dobj.dependencies, nspinfo->dobj.nDeps, NULL, NULL); -@@ -6562,6 +6635,9 @@ dumpNamespace(Archive *fout, NamespaceInfo *nspinfo) +@@ -6568,6 +6641,9 @@ dumpNamespace(Archive *fout, NamespaceInfo *nspinfo) NULL, nspinfo->rolname, nspinfo->dobj.catId, 0, nspinfo->dobj.dumpId); @@ -16937,7 +16937,7 @@ index 7a06f9b..f7fa80a 100644 dumpACL(fout, nspinfo->dobj.catId, nspinfo->dobj.dumpId, "SCHEMA", qnspname, NULL, nspinfo->dobj.name, NULL, nspinfo->rolname, nspinfo->nspacl); -@@ -6679,7 +6755,7 @@ dumpEnumType(Archive *fout, TypeInfo *tyinfo) +@@ -6685,7 +6761,7 @@ dumpEnumType(Archive *fout, TypeInfo *tyinfo) tyinfo->dobj.name, tyinfo->dobj.namespace->dobj.name, NULL, @@ -16946,7 +16946,7 @@ index 7a06f9b..f7fa80a 100644 "TYPE", SECTION_PRE_DATA, q->data, delq->data, NULL, tyinfo->dobj.dependencies, tyinfo->dobj.nDeps, -@@ -6693,6 +6769,12 @@ dumpEnumType(Archive *fout, TypeInfo *tyinfo) +@@ -6699,6 +6775,12 @@ dumpEnumType(Archive *fout, TypeInfo *tyinfo) tyinfo->dobj.namespace->dobj.name, tyinfo->rolname, tyinfo->dobj.catId, 0, tyinfo->dobj.dumpId); @@ -16959,7 +16959,7 @@ index 7a06f9b..f7fa80a 100644 PQclear(res); destroyPQExpBuffer(q); destroyPQExpBuffer(delq); -@@ -7055,7 +7137,7 @@ dumpBaseType(Archive *fout, TypeInfo *tyinfo) +@@ -7061,7 +7143,7 @@ dumpBaseType(Archive *fout, TypeInfo *tyinfo) tyinfo->dobj.name, tyinfo->dobj.namespace->dobj.name, NULL, @@ -16968,7 +16968,7 @@ index 7a06f9b..f7fa80a 100644 "TYPE", SECTION_PRE_DATA, q->data, delq->data, NULL, tyinfo->dobj.dependencies, tyinfo->dobj.nDeps, -@@ -7069,6 +7151,12 @@ dumpBaseType(Archive *fout, TypeInfo *tyinfo) +@@ -7075,6 +7157,12 @@ dumpBaseType(Archive *fout, TypeInfo *tyinfo) tyinfo->dobj.namespace->dobj.name, tyinfo->rolname, tyinfo->dobj.catId, 0, tyinfo->dobj.dumpId); @@ -16981,7 +16981,7 @@ index 7a06f9b..f7fa80a 100644 PQclear(res); destroyPQExpBuffer(q); destroyPQExpBuffer(delq); -@@ -7179,7 +7267,7 @@ dumpDomain(Archive *fout, TypeInfo *tyinfo) +@@ -7185,7 +7273,7 @@ dumpDomain(Archive *fout, TypeInfo *tyinfo) tyinfo->dobj.name, tyinfo->dobj.namespace->dobj.name, NULL, @@ -16990,7 +16990,7 @@ index 7a06f9b..f7fa80a 100644 "DOMAIN", SECTION_PRE_DATA, q->data, delq->data, NULL, tyinfo->dobj.dependencies, tyinfo->dobj.nDeps, -@@ -7193,6 +7281,12 @@ dumpDomain(Archive *fout, TypeInfo *tyinfo) +@@ -7199,6 +7287,12 @@ dumpDomain(Archive *fout, TypeInfo *tyinfo) tyinfo->dobj.namespace->dobj.name, tyinfo->rolname, tyinfo->dobj.catId, 0, tyinfo->dobj.dumpId); @@ -17003,7 +17003,7 @@ index 7a06f9b..f7fa80a 100644 destroyPQExpBuffer(q); destroyPQExpBuffer(delq); destroyPQExpBuffer(query); -@@ -7284,7 +7378,7 @@ dumpCompositeType(Archive *fout, TypeInfo *tyinfo) +@@ -7290,7 +7384,7 @@ dumpCompositeType(Archive *fout, TypeInfo *tyinfo) tyinfo->dobj.name, tyinfo->dobj.namespace->dobj.name, NULL, @@ -17012,7 +17012,7 @@ index 7a06f9b..f7fa80a 100644 "TYPE", SECTION_PRE_DATA, q->data, delq->data, NULL, tyinfo->dobj.dependencies, tyinfo->dobj.nDeps, -@@ -7299,6 +7393,12 @@ dumpCompositeType(Archive *fout, TypeInfo *tyinfo) +@@ -7305,6 +7399,12 @@ dumpCompositeType(Archive *fout, TypeInfo *tyinfo) tyinfo->dobj.namespace->dobj.name, tyinfo->rolname, tyinfo->dobj.catId, 0, tyinfo->dobj.dumpId); @@ -17025,7 +17025,7 @@ index 7a06f9b..f7fa80a 100644 PQclear(res); destroyPQExpBuffer(q); destroyPQExpBuffer(delq); -@@ -7403,7 +7503,7 @@ dumpCompositeTypeColComments(Archive *fout, TypeInfo *tyinfo) +@@ -7409,7 +7509,7 @@ dumpCompositeTypeColComments(Archive *fout, TypeInfo *tyinfo) target->data, tyinfo->dobj.namespace->dobj.name, NULL, tyinfo->rolname, @@ -17034,7 +17034,7 @@ index 7a06f9b..f7fa80a 100644 query->data, "", NULL, &(tyinfo->dobj.dumpId), 1, NULL, NULL); -@@ -7455,7 +7555,7 @@ dumpShellType(Archive *fout, ShellTypeInfo *stinfo) +@@ -7461,7 +7561,7 @@ dumpShellType(Archive *fout, ShellTypeInfo *stinfo) stinfo->dobj.name, stinfo->dobj.namespace->dobj.name, NULL, @@ -17043,7 +17043,7 @@ index 7a06f9b..f7fa80a 100644 "SHELL TYPE", SECTION_PRE_DATA, q->data, "", NULL, stinfo->dobj.dependencies, stinfo->dobj.nDeps, -@@ -7610,7 +7710,7 @@ dumpProcLang(Archive *fout, ProcLangInfo *plang) +@@ -7616,7 +7716,7 @@ dumpProcLang(Archive *fout, ProcLangInfo *plang) ArchiveEntry(fout, plang->dobj.catId, plang->dobj.dumpId, plang->dobj.name, lanschema, NULL, plang->lanowner, @@ -17052,7 +17052,7 @@ index 7a06f9b..f7fa80a 100644 defqry->data, delqry->data, NULL, plang->dobj.dependencies, plang->dobj.nDeps, NULL, NULL); -@@ -7796,6 +7896,7 @@ dumpFunc(Archive *fout, FuncInfo *finfo) +@@ -7802,6 +7902,7 @@ dumpFunc(Archive *fout, FuncInfo *finfo) char **argmodes = NULL; char **argnames = NULL; char **configitems = NULL; @@ -17060,7 +17060,7 @@ index 7a06f9b..f7fa80a 100644 int nconfigitems = 0; int i; -@@ -7826,8 +7927,10 @@ dumpFunc(Archive *fout, FuncInfo *finfo) +@@ -7832,8 +7933,10 @@ dumpFunc(Archive *fout, FuncInfo *finfo) "proiswindow, provolatile, proisstrict, prosecdef, " "proconfig, procost, prorows, " "(SELECT lanname FROM pg_catalog.pg_language WHERE oid = prolang) AS lanname " @@ -17071,7 +17071,7 @@ index 7a06f9b..f7fa80a 100644 finfo->dobj.catId.oid); } else if (g_fout->remoteVersion >= 80300) -@@ -7839,6 +7942,7 @@ dumpFunc(Archive *fout, FuncInfo *finfo) +@@ -7845,6 +7948,7 @@ dumpFunc(Archive *fout, FuncInfo *finfo) "provolatile, proisstrict, prosecdef, " "proconfig, procost, prorows, " "(SELECT lanname FROM pg_catalog.pg_language WHERE oid = prolang) AS lanname " @@ -17079,7 +17079,7 @@ index 7a06f9b..f7fa80a 100644 "FROM pg_catalog.pg_proc " "WHERE oid = '%u'::pg_catalog.oid", finfo->dobj.catId.oid); -@@ -7852,6 +7956,7 @@ dumpFunc(Archive *fout, FuncInfo *finfo) +@@ -7858,6 +7962,7 @@ dumpFunc(Archive *fout, FuncInfo *finfo) "provolatile, proisstrict, prosecdef, " "null AS proconfig, 0 AS procost, 0 AS prorows, " "(SELECT lanname FROM pg_catalog.pg_language WHERE oid = prolang) AS lanname " @@ -17087,7 +17087,7 @@ index 7a06f9b..f7fa80a 100644 "FROM pg_catalog.pg_proc " "WHERE oid = '%u'::pg_catalog.oid", finfo->dobj.catId.oid); -@@ -7867,6 +7972,7 @@ dumpFunc(Archive *fout, FuncInfo *finfo) +@@ -7873,6 +7978,7 @@ dumpFunc(Archive *fout, FuncInfo *finfo) "provolatile, proisstrict, prosecdef, " "null AS proconfig, 0 AS procost, 0 AS prorows, " "(SELECT lanname FROM pg_catalog.pg_language WHERE oid = prolang) AS lanname " @@ -17095,7 +17095,7 @@ index 7a06f9b..f7fa80a 100644 "FROM pg_catalog.pg_proc " "WHERE oid = '%u'::pg_catalog.oid", finfo->dobj.catId.oid); -@@ -7882,6 +7988,7 @@ dumpFunc(Archive *fout, FuncInfo *finfo) +@@ -7888,6 +7994,7 @@ dumpFunc(Archive *fout, FuncInfo *finfo) "provolatile, proisstrict, prosecdef, " "null AS proconfig, 0 AS procost, 0 AS prorows, " "(SELECT lanname FROM pg_catalog.pg_language WHERE oid = prolang) AS lanname " @@ -17103,7 +17103,7 @@ index 7a06f9b..f7fa80a 100644 "FROM pg_catalog.pg_proc " "WHERE oid = '%u'::pg_catalog.oid", finfo->dobj.catId.oid); -@@ -7899,6 +8006,7 @@ dumpFunc(Archive *fout, FuncInfo *finfo) +@@ -7905,6 +8012,7 @@ dumpFunc(Archive *fout, FuncInfo *finfo) "false AS prosecdef, " "null AS proconfig, 0 AS procost, 0 AS prorows, " "(SELECT lanname FROM pg_language WHERE oid = prolang) AS lanname " @@ -17111,7 +17111,7 @@ index 7a06f9b..f7fa80a 100644 "FROM pg_proc " "WHERE oid = '%u'::oid", finfo->dobj.catId.oid); -@@ -7916,6 +8024,7 @@ dumpFunc(Archive *fout, FuncInfo *finfo) +@@ -7922,6 +8030,7 @@ dumpFunc(Archive *fout, FuncInfo *finfo) "false AS prosecdef, " "NULL AS proconfig, 0 AS procost, 0 AS prorows, " "(SELECT lanname FROM pg_language WHERE oid = prolang) AS lanname " @@ -17119,7 +17119,7 @@ index 7a06f9b..f7fa80a 100644 "FROM pg_proc " "WHERE oid = '%u'::oid", finfo->dobj.catId.oid); -@@ -7960,6 +8069,7 @@ dumpFunc(Archive *fout, FuncInfo *finfo) +@@ -7966,6 +8075,7 @@ dumpFunc(Archive *fout, FuncInfo *finfo) procost = PQgetvalue(res, 0, PQfnumber(res, "procost")); prorows = PQgetvalue(res, 0, PQfnumber(res, "prorows")); lanname = PQgetvalue(res, 0, PQfnumber(res, "lanname")); @@ -17127,7 +17127,7 @@ index 7a06f9b..f7fa80a 100644 /* * See backend/commands/functioncmds.c for details of how the 'AS' clause -@@ -8170,7 +8280,7 @@ dumpFunc(Archive *fout, FuncInfo *finfo) +@@ -8176,7 +8286,7 @@ dumpFunc(Archive *fout, FuncInfo *finfo) funcsig_tag, finfo->dobj.namespace->dobj.name, NULL, @@ -17136,7 +17136,7 @@ index 7a06f9b..f7fa80a 100644 "FUNCTION", SECTION_PRE_DATA, q->data, delqry->data, NULL, finfo->dobj.dependencies, finfo->dobj.nDeps, -@@ -8183,6 +8293,12 @@ dumpFunc(Archive *fout, FuncInfo *finfo) +@@ -8189,6 +8299,12 @@ dumpFunc(Archive *fout, FuncInfo *finfo) finfo->dobj.namespace->dobj.name, finfo->rolname, finfo->dobj.catId, 0, finfo->dobj.dumpId); @@ -17149,7 +17149,7 @@ index 7a06f9b..f7fa80a 100644 dumpACL(fout, finfo->dobj.catId, finfo->dobj.dumpId, "FUNCTION", funcsig, NULL, funcsig_tag, finfo->dobj.namespace->dobj.name, -@@ -8324,7 +8440,7 @@ dumpCast(Archive *fout, CastInfo *cast) +@@ -8330,7 +8446,7 @@ dumpCast(Archive *fout, CastInfo *cast) ArchiveEntry(fout, cast->dobj.catId, cast->dobj.dumpId, castsig->data, "pg_catalog", NULL, "", @@ -17158,7 +17158,7 @@ index 7a06f9b..f7fa80a 100644 defqry->data, delqry->data, NULL, cast->dobj.dependencies, cast->dobj.nDeps, NULL, NULL); -@@ -8568,7 +8684,7 @@ dumpOpr(Archive *fout, OprInfo *oprinfo) +@@ -8574,7 +8690,7 @@ dumpOpr(Archive *fout, OprInfo *oprinfo) oprinfo->dobj.namespace->dobj.name, NULL, oprinfo->rolname, @@ -17167,7 +17167,7 @@ index 7a06f9b..f7fa80a 100644 q->data, delq->data, NULL, oprinfo->dobj.dependencies, oprinfo->dobj.nDeps, NULL, NULL); -@@ -9027,7 +9143,7 @@ dumpOpclass(Archive *fout, OpclassInfo *opcinfo) +@@ -9033,7 +9149,7 @@ dumpOpclass(Archive *fout, OpclassInfo *opcinfo) opcinfo->dobj.namespace->dobj.name, NULL, opcinfo->rolname, @@ -17176,7 +17176,7 @@ index 7a06f9b..f7fa80a 100644 q->data, delq->data, NULL, opcinfo->dobj.dependencies, opcinfo->dobj.nDeps, NULL, NULL); -@@ -9308,7 +9424,7 @@ dumpOpfamily(Archive *fout, OpfamilyInfo *opfinfo) +@@ -9314,7 +9430,7 @@ dumpOpfamily(Archive *fout, OpfamilyInfo *opfinfo) opfinfo->dobj.namespace->dobj.name, NULL, opfinfo->rolname, @@ -17185,7 +17185,7 @@ index 7a06f9b..f7fa80a 100644 q->data, delq->data, NULL, opfinfo->dobj.dependencies, opfinfo->dobj.nDeps, NULL, NULL); -@@ -9424,7 +9540,7 @@ dumpConversion(Archive *fout, ConvInfo *convinfo) +@@ -9430,7 +9546,7 @@ dumpConversion(Archive *fout, ConvInfo *convinfo) convinfo->dobj.namespace->dobj.name, NULL, convinfo->rolname, @@ -17194,7 +17194,7 @@ index 7a06f9b..f7fa80a 100644 q->data, delq->data, NULL, convinfo->dobj.dependencies, convinfo->dobj.nDeps, NULL, NULL); -@@ -9505,11 +9621,13 @@ dumpAgg(Archive *fout, AggInfo *agginfo) +@@ -9511,11 +9627,13 @@ dumpAgg(Archive *fout, AggInfo *agginfo) int i_aggtranstype; int i_agginitval; int i_convertok; @@ -17208,7 +17208,7 @@ index 7a06f9b..f7fa80a 100644 bool convertok; /* Skip if not to be dumped */ -@@ -9532,9 +9650,11 @@ dumpAgg(Archive *fout, AggInfo *agginfo) +@@ -9538,9 +9656,11 @@ dumpAgg(Archive *fout, AggInfo *agginfo) "aggsortop::pg_catalog.regoperator, " "agginitval, " "'t'::boolean AS convertok " @@ -17220,7 +17220,7 @@ index 7a06f9b..f7fa80a 100644 agginfo->aggfn.dobj.catId.oid); } else if (g_fout->remoteVersion >= 70300) -@@ -9544,6 +9664,7 @@ dumpAgg(Archive *fout, AggInfo *agginfo) +@@ -9550,6 +9670,7 @@ dumpAgg(Archive *fout, AggInfo *agginfo) "0 AS aggsortop, " "agginitval, " "'t'::boolean AS convertok " @@ -17228,7 +17228,7 @@ index 7a06f9b..f7fa80a 100644 "FROM pg_catalog.pg_aggregate a, pg_catalog.pg_proc p " "WHERE a.aggfnoid = p.oid " "AND p.oid = '%u'::pg_catalog.oid", -@@ -9556,6 +9677,7 @@ dumpAgg(Archive *fout, AggInfo *agginfo) +@@ -9562,6 +9683,7 @@ dumpAgg(Archive *fout, AggInfo *agginfo) "0 AS aggsortop, " "agginitval, " "'t'::boolean AS convertok " @@ -17236,7 +17236,7 @@ index 7a06f9b..f7fa80a 100644 "FROM pg_aggregate " "WHERE oid = '%u'::oid", agginfo->aggfn.dobj.catId.oid); -@@ -9568,6 +9690,7 @@ dumpAgg(Archive *fout, AggInfo *agginfo) +@@ -9574,6 +9696,7 @@ dumpAgg(Archive *fout, AggInfo *agginfo) "0 AS aggsortop, " "agginitval1 AS agginitval, " "(aggtransfn2 = 0 and aggtranstype2 = 0 and agginitval2 is null) AS convertok " @@ -17244,7 +17244,7 @@ index 7a06f9b..f7fa80a 100644 "FROM pg_aggregate " "WHERE oid = '%u'::oid", agginfo->aggfn.dobj.catId.oid); -@@ -9593,6 +9716,7 @@ dumpAgg(Archive *fout, AggInfo *agginfo) +@@ -9599,6 +9722,7 @@ dumpAgg(Archive *fout, AggInfo *agginfo) i_aggtranstype = PQfnumber(res, "aggtranstype"); i_agginitval = PQfnumber(res, "agginitval"); i_convertok = PQfnumber(res, "convertok"); @@ -17252,7 +17252,7 @@ index 7a06f9b..f7fa80a 100644 aggtransfn = PQgetvalue(res, 0, i_aggtransfn); aggfinalfn = PQgetvalue(res, 0, i_aggfinalfn); -@@ -9600,6 +9724,7 @@ dumpAgg(Archive *fout, AggInfo *agginfo) +@@ -9606,6 +9730,7 @@ dumpAgg(Archive *fout, AggInfo *agginfo) aggtranstype = PQgetvalue(res, 0, i_aggtranstype); agginitval = PQgetvalue(res, 0, i_agginitval); convertok = (PQgetvalue(res, 0, i_convertok)[0] == 't'); @@ -17260,7 +17260,7 @@ index 7a06f9b..f7fa80a 100644 aggsig = format_aggregate_signature(agginfo, fout, true); aggsig_tag = format_aggregate_signature(agginfo, fout, false); -@@ -9668,7 +9793,7 @@ dumpAgg(Archive *fout, AggInfo *agginfo) +@@ -9674,7 +9799,7 @@ dumpAgg(Archive *fout, AggInfo *agginfo) agginfo->aggfn.dobj.namespace->dobj.name, NULL, agginfo->aggfn.rolname, @@ -17269,7 +17269,7 @@ index 7a06f9b..f7fa80a 100644 q->data, delq->data, NULL, agginfo->aggfn.dobj.dependencies, agginfo->aggfn.dobj.nDeps, NULL, NULL); -@@ -9680,6 +9805,12 @@ dumpAgg(Archive *fout, AggInfo *agginfo) +@@ -9686,6 +9811,12 @@ dumpAgg(Archive *fout, AggInfo *agginfo) agginfo->aggfn.dobj.namespace->dobj.name, agginfo->aggfn.rolname, agginfo->aggfn.dobj.catId, 0, agginfo->aggfn.dobj.dumpId); @@ -17282,7 +17282,7 @@ index 7a06f9b..f7fa80a 100644 /* * Since there is no GRANT ON AGGREGATE syntax, we have to make the ACL * command look like a function's GRANT; in particular this affects the -@@ -9756,7 +9887,7 @@ dumpTSParser(Archive *fout, TSParserInfo *prsinfo) +@@ -9762,7 +9893,7 @@ dumpTSParser(Archive *fout, TSParserInfo *prsinfo) prsinfo->dobj.namespace->dobj.name, NULL, "", @@ -17291,7 +17291,7 @@ index 7a06f9b..f7fa80a 100644 q->data, delq->data, NULL, prsinfo->dobj.dependencies, prsinfo->dobj.nDeps, NULL, NULL); -@@ -9848,7 +9979,7 @@ dumpTSDictionary(Archive *fout, TSDictInfo *dictinfo) +@@ -9854,7 +9985,7 @@ dumpTSDictionary(Archive *fout, TSDictInfo *dictinfo) dictinfo->dobj.namespace->dobj.name, NULL, dictinfo->rolname, @@ -17300,7 +17300,7 @@ index 7a06f9b..f7fa80a 100644 q->data, delq->data, NULL, dictinfo->dobj.dependencies, dictinfo->dobj.nDeps, NULL, NULL); -@@ -9908,7 +10039,7 @@ dumpTSTemplate(Archive *fout, TSTemplateInfo *tmplinfo) +@@ -9914,7 +10045,7 @@ dumpTSTemplate(Archive *fout, TSTemplateInfo *tmplinfo) tmplinfo->dobj.namespace->dobj.name, NULL, "", @@ -17309,7 +17309,7 @@ index 7a06f9b..f7fa80a 100644 q->data, delq->data, NULL, tmplinfo->dobj.dependencies, tmplinfo->dobj.nDeps, NULL, NULL); -@@ -10041,7 +10172,7 @@ dumpTSConfig(Archive *fout, TSConfigInfo *cfginfo) +@@ -10047,7 +10178,7 @@ dumpTSConfig(Archive *fout, TSConfigInfo *cfginfo) cfginfo->dobj.namespace->dobj.name, NULL, cfginfo->rolname, @@ -17318,7 +17318,7 @@ index 7a06f9b..f7fa80a 100644 q->data, delq->data, NULL, cfginfo->dobj.dependencies, cfginfo->dobj.nDeps, NULL, NULL); -@@ -10097,7 +10228,7 @@ dumpForeignDataWrapper(Archive *fout, FdwInfo *fdwinfo) +@@ -10103,7 +10234,7 @@ dumpForeignDataWrapper(Archive *fout, FdwInfo *fdwinfo) NULL, NULL, fdwinfo->rolname, @@ -17327,7 +17327,7 @@ index 7a06f9b..f7fa80a 100644 q->data, delq->data, NULL, fdwinfo->dobj.dependencies, fdwinfo->dobj.nDeps, NULL, NULL); -@@ -10185,7 +10316,7 @@ dumpForeignServer(Archive *fout, ForeignServerInfo *srvinfo) +@@ -10191,7 +10322,7 @@ dumpForeignServer(Archive *fout, ForeignServerInfo *srvinfo) NULL, NULL, srvinfo->rolname, @@ -17336,7 +17336,7 @@ index 7a06f9b..f7fa80a 100644 q->data, delq->data, NULL, srvinfo->dobj.dependencies, srvinfo->dobj.nDeps, NULL, NULL); -@@ -10290,7 +10421,7 @@ dumpUserMappings(Archive *fout, +@@ -10296,7 +10427,7 @@ dumpUserMappings(Archive *fout, tag->data, namespace, NULL, @@ -17345,7 +17345,7 @@ index 7a06f9b..f7fa80a 100644 "USER MAPPING", SECTION_PRE_DATA, q->data, delq->data, NULL, &dumpId, 1, -@@ -10361,7 +10492,7 @@ dumpDefaultACL(Archive *fout, DefaultACLInfo *daclinfo) +@@ -10367,7 +10498,7 @@ dumpDefaultACL(Archive *fout, DefaultACLInfo *daclinfo) daclinfo->dobj.namespace ? daclinfo->dobj.namespace->dobj.name : NULL, NULL, daclinfo->defaclrole, @@ -17354,7 +17354,7 @@ index 7a06f9b..f7fa80a 100644 q->data, "", NULL, daclinfo->dobj.dependencies, daclinfo->dobj.nDeps, NULL, NULL); -@@ -10418,7 +10549,7 @@ dumpACL(Archive *fout, CatalogId objCatId, DumpId objDumpId, +@@ -10424,7 +10555,7 @@ dumpACL(Archive *fout, CatalogId objCatId, DumpId objDumpId, tag, nspname, NULL, owner ? owner : "", @@ -17363,7 +17363,7 @@ index 7a06f9b..f7fa80a 100644 sql->data, "", NULL, &(objDumpId), 1, NULL, NULL); -@@ -10427,6 +10558,123 @@ dumpACL(Archive *fout, CatalogId objCatId, DumpId objDumpId, +@@ -10433,6 +10564,123 @@ dumpACL(Archive *fout, CatalogId objCatId, DumpId objDumpId, } /* @@ -17487,7 +17487,7 @@ index 7a06f9b..f7fa80a 100644 * dumpTable * write out to fout the declarations (not data) of a user-defined table */ -@@ -10582,7 +10830,6 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo) +@@ -10588,7 +10836,6 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo) appendPQExpBuffer(q, "CREATE VIEW %s AS\n %s\n", fmtId(tbinfo->dobj.name), viewdef); @@ -17495,7 +17495,7 @@ index 7a06f9b..f7fa80a 100644 PQclear(res); } else -@@ -10933,6 +11180,7 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo) +@@ -10939,6 +11186,7 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo) (tbinfo->relkind == RELKIND_VIEW) ? NULL : tbinfo->reltablespace, tbinfo->rolname, (strcmp(reltypename, "TABLE") == 0) ? tbinfo->hasoids : false, @@ -17503,7 +17503,7 @@ index 7a06f9b..f7fa80a 100644 reltypename, SECTION_PRE_DATA, q->data, delq->data, NULL, tbinfo->dobj.dependencies, tbinfo->dobj.nDeps, -@@ -10953,6 +11201,27 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo) +@@ -10959,6 +11207,27 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo) dumpTableConstraintComment(fout, constr); } @@ -17531,7 +17531,7 @@ index 7a06f9b..f7fa80a 100644 destroyPQExpBuffer(query); destroyPQExpBuffer(q); destroyPQExpBuffer(delq); -@@ -11001,7 +11270,7 @@ dumpAttrDef(Archive *fout, AttrDefInfo *adinfo) +@@ -11007,7 +11276,7 @@ dumpAttrDef(Archive *fout, AttrDefInfo *adinfo) tbinfo->dobj.namespace->dobj.name, NULL, tbinfo->rolname, @@ -17540,7 +17540,7 @@ index 7a06f9b..f7fa80a 100644 q->data, delq->data, NULL, adinfo->dobj.dependencies, adinfo->dobj.nDeps, NULL, NULL); -@@ -11097,7 +11366,7 @@ dumpIndex(Archive *fout, IndxInfo *indxinfo) +@@ -11103,7 +11372,7 @@ dumpIndex(Archive *fout, IndxInfo *indxinfo) indxinfo->dobj.name, tbinfo->dobj.namespace->dobj.name, indxinfo->tablespace, @@ -17549,7 +17549,7 @@ index 7a06f9b..f7fa80a 100644 "INDEX", SECTION_POST_DATA, q->data, delq->data, NULL, indxinfo->dobj.dependencies, indxinfo->dobj.nDeps, -@@ -11222,7 +11491,7 @@ dumpConstraint(Archive *fout, ConstraintInfo *coninfo) +@@ -11228,7 +11497,7 @@ dumpConstraint(Archive *fout, ConstraintInfo *coninfo) coninfo->dobj.name, tbinfo->dobj.namespace->dobj.name, indxinfo->tablespace, @@ -17558,7 +17558,7 @@ index 7a06f9b..f7fa80a 100644 "CONSTRAINT", SECTION_POST_DATA, q->data, delq->data, NULL, coninfo->dobj.dependencies, coninfo->dobj.nDeps, -@@ -11255,7 +11524,7 @@ dumpConstraint(Archive *fout, ConstraintInfo *coninfo) +@@ -11261,7 +11530,7 @@ dumpConstraint(Archive *fout, ConstraintInfo *coninfo) coninfo->dobj.name, tbinfo->dobj.namespace->dobj.name, NULL, @@ -17567,7 +17567,7 @@ index 7a06f9b..f7fa80a 100644 "FK CONSTRAINT", SECTION_POST_DATA, q->data, delq->data, NULL, coninfo->dobj.dependencies, coninfo->dobj.nDeps, -@@ -11290,7 +11559,7 @@ dumpConstraint(Archive *fout, ConstraintInfo *coninfo) +@@ -11296,7 +11565,7 @@ dumpConstraint(Archive *fout, ConstraintInfo *coninfo) coninfo->dobj.name, tbinfo->dobj.namespace->dobj.name, NULL, @@ -17576,7 +17576,7 @@ index 7a06f9b..f7fa80a 100644 "CHECK CONSTRAINT", SECTION_POST_DATA, q->data, delq->data, NULL, coninfo->dobj.dependencies, coninfo->dobj.nDeps, -@@ -11326,7 +11595,7 @@ dumpConstraint(Archive *fout, ConstraintInfo *coninfo) +@@ -11332,7 +11601,7 @@ dumpConstraint(Archive *fout, ConstraintInfo *coninfo) coninfo->dobj.name, tyinfo->dobj.namespace->dobj.name, NULL, @@ -17585,7 +17585,7 @@ index 7a06f9b..f7fa80a 100644 "CHECK CONSTRAINT", SECTION_POST_DATA, q->data, delq->data, NULL, coninfo->dobj.dependencies, coninfo->dobj.nDeps, -@@ -11612,7 +11881,7 @@ dumpSequence(Archive *fout, TableInfo *tbinfo) +@@ -11618,7 +11887,7 @@ dumpSequence(Archive *fout, TableInfo *tbinfo) tbinfo->dobj.namespace->dobj.name, NULL, tbinfo->rolname, @@ -17594,7 +17594,7 @@ index 7a06f9b..f7fa80a 100644 query->data, delqry->data, NULL, tbinfo->dobj.dependencies, tbinfo->dobj.nDeps, NULL, NULL); -@@ -11648,7 +11917,7 @@ dumpSequence(Archive *fout, TableInfo *tbinfo) +@@ -11654,7 +11923,7 @@ dumpSequence(Archive *fout, TableInfo *tbinfo) tbinfo->dobj.namespace->dobj.name, NULL, tbinfo->rolname, @@ -17603,7 +17603,7 @@ index 7a06f9b..f7fa80a 100644 query->data, "", NULL, &(tbinfo->dobj.dumpId), 1, NULL, NULL); -@@ -11661,6 +11930,12 @@ dumpSequence(Archive *fout, TableInfo *tbinfo) +@@ -11667,6 +11936,12 @@ dumpSequence(Archive *fout, TableInfo *tbinfo) dumpComment(fout, query->data, tbinfo->dobj.namespace->dobj.name, tbinfo->rolname, tbinfo->dobj.catId, 0, tbinfo->dobj.dumpId); @@ -17616,7 +17616,7 @@ index 7a06f9b..f7fa80a 100644 } if (!schemaOnly) -@@ -11676,7 +11951,7 @@ dumpSequence(Archive *fout, TableInfo *tbinfo) +@@ -11682,7 +11957,7 @@ dumpSequence(Archive *fout, TableInfo *tbinfo) tbinfo->dobj.namespace->dobj.name, NULL, tbinfo->rolname, @@ -17625,7 +17625,7 @@ index 7a06f9b..f7fa80a 100644 query->data, "", NULL, &(tbinfo->dobj.dumpId), 1, NULL, NULL); -@@ -11860,7 +12135,7 @@ dumpTrigger(Archive *fout, TriggerInfo *tginfo) +@@ -11866,7 +12141,7 @@ dumpTrigger(Archive *fout, TriggerInfo *tginfo) tginfo->dobj.name, tbinfo->dobj.namespace->dobj.name, NULL, @@ -17634,7 +17634,7 @@ index 7a06f9b..f7fa80a 100644 "TRIGGER", SECTION_POST_DATA, query->data, delqry->data, NULL, tginfo->dobj.dependencies, tginfo->dobj.nDeps, -@@ -11980,7 +12255,7 @@ dumpRule(Archive *fout, RuleInfo *rinfo) +@@ -11986,7 +12261,7 @@ dumpRule(Archive *fout, RuleInfo *rinfo) rinfo->dobj.name, tbinfo->dobj.namespace->dobj.name, NULL, @@ -17643,7 +17643,7 @@ index 7a06f9b..f7fa80a 100644 "RULE", SECTION_POST_DATA, cmd->data, delcmd->data, NULL, rinfo->dobj.dependencies, rinfo->dobj.nDeps, -@@ -12345,7 +12620,7 @@ fmtQualifiedId(const char *schema, const char *id) +@@ -12351,7 +12626,7 @@ fmtQualifiedId(const char *schema, const char *id) * "", not an invalid "()" column list. */ static const char * @@ -17652,7 +17652,7 @@ index 7a06f9b..f7fa80a 100644 { static PQExpBuffer q = NULL; int numatts = ti->numatts; -@@ -12361,6 +12636,11 @@ fmtCopyColumnList(const TableInfo *ti) +@@ -12367,6 +12642,11 @@ fmtCopyColumnList(const TableInfo *ti) appendPQExpBuffer(q, "("); needComma = false; diff --git a/sepostgresql.spec b/sepostgresql.spec index 05ea0e8..b79d3e7 100644 --- a/sepostgresql.spec +++ b/sepostgresql.spec @@ -11,8 +11,8 @@ Summary: Security Enhanced PostgreSQL Name: sepostgresql -Version: 9.0.0 -Release: 20101005%{?dist} +Version: 9.0.1 +Release: 20101007%{?dist} License: PostgreSQL Group: Applications/Databases Url: http://code.google.com/p/sepgsql/ @@ -181,6 +181,9 @@ fi %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/backups %changelog +* Thu Oct 7 2010 KaiGai Kohei - 9.0.1-20101007 +- upgrade base version to 9.0.1 + * Tue Oct 5 2010 KaiGai Kohei - 9.0.0-20101005 - upgrade base version to 9.0.0 diff --git a/sources b/sources index f048e2f..5a1101a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9443b3b9c95a48d5e0713feafc209adc postgresql-9.0.0.tar.gz +5093c321bc47af2ea9afa726605ff1ce postgresql-9.0.1.tar.gz