postgres: drop use of 'WITH OIDS'

PostgreSQL since version 12 no longer supports 'WITH OIDS':
Previously, a normally-invisible oid column could be specified during
table creation using WITH OIDS; that ability has been removed. Columns
can still be explicitly declared as type oid. Operations on tables that
have columns created using WITH OIDS will need adjustment.
The system catalogs that previously had hidden oid columns now have
ordinary oid columns. Hence, SELECT * will now output those columns,
whereas previously they would be displayed only if selected explicitly.

Drop 'WITH OIDS' as it was stated even on tables for plugins which
didn't make any use of the then exposed 'oid' column.
In the case of datacache and datastore the 'oid' column is used,
so replace the 'WITH OIDS' statement with an explicit 'oid' column
having 'OID' type and a corresponding sequence.

No measures are taken to still work with PostgreSQL before version 12.
Users should update PostgreSQL to version 12 or newer.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

1 files changed, 10 insertions, 4 deletions

diff --git a/src/datastore/plugin_datastore_postgres.c b/src/datastore/plugin_datastore_postgres.c
index 88ceb1b0a..6a5d45832 100644
--- a/src/datastore/plugin_datastore_postgres.c
+++ b/src/datastore/plugin_datastore_postgres.c
@@ -72,8 +72,10 @@ init_connection (struct Plugin *plugin)
      * we only test equality on it and can cast it to/from uint32_t. For repl, prio, and anonLevel
      * we do math or inequality tests, so we can't handle the entire range of uint32_t.
      * This will also cause problems for expiration times after 294247-01-10-04:00:54 UTC.
-     * PostgreSQL also recommends against using WITH OIDS.
-     */GNUNET_PQ_make_execute ("CREATE TABLE IF NOT EXISTS gn090 ("
+     */
+    GNUNET_PQ_make_try_execute (
+      "CREATE SEQUENCE IF NOT EXISTS gn090_oid_seq"),
+    GNUNET_PQ_make_execute ("CREATE TABLE IF NOT EXISTS gn090 ("
                             "  repl INTEGER NOT NULL DEFAULT 0,"
                             "  type INTEGER NOT NULL DEFAULT 0,"
                             "  prio INTEGER NOT NULL DEFAULT 0,"
@@ -82,8 +84,12 @@ init_connection (struct Plugin *plugin)
                             "  rvalue BIGINT NOT NULL DEFAULT 0,"
                             "  hash BYTEA NOT NULL DEFAULT '',"
                             "  vhash BYTEA NOT NULL DEFAULT '',"
-                            "  value BYTEA NOT NULL DEFAULT '')"
-                            "WITH OIDS"),
+                            "  value BYTEA NOT NULL DEFAULT '',"
+                            "  oid OID NOT NULL DEFAULT nextval('gn090_oid_seq'))"),
+    GNUNET_PQ_make_try_execute (
+      "ALTER SEQUENCE gn090_oid_seq OWNED BY gn090.oid"),
+    GNUNET_PQ_make_try_execute (
+      "CREATE INDEX IF NOT EXISTS oid_hash ON gn090 (oid)"),
     GNUNET_PQ_make_try_execute (
       "CREATE INDEX IF NOT EXISTS idx_hash ON gn090 (hash)"),
     GNUNET_PQ_make_try_execute (