diff options
| author | Christian Grothoff <grothoff@gnunet.org> | 2023-08-27 14:06:28 +0200 |
|---|---|---|
| committer | Christian Grothoff <grothoff@gnunet.org> | 2023-08-27 14:06:28 +0200 |
| commit | e7a67dfbb515c71e9fbefe9e30ec1a2e017adf38 (patch) | |
| tree | c14a22f2e92c19e3a2ce02761e7bddc422b62f14 /src | |
| parent | ffa45201bd1c279a5ca83cd8dedf08ac115049e1 (diff) | |
-fix issue with multiple dbinit running concurrently
Diffstat (limited to 'src')
| -rw-r--r-- | src/auditordb/versioning.sql | 7 | ||||
| -rw-r--r-- | src/exchangedb/versioning.sql | 7 | ||||
| -rw-r--r-- | src/include/taler_testing_lib.h | 4 |
3 files changed, 14 insertions, 4 deletions
diff --git a/src/auditordb/versioning.sql b/src/auditordb/versioning.sql index 116f409b7..c7fa81213 100644 --- a/src/auditordb/versioning.sql +++ b/src/auditordb/versioning.sql @@ -146,12 +146,17 @@ BEGIN; +-- Added by Christian Grothoff to support concurrency, see +-- https://stackoverflow.com/questions/29900845/create-schema-if-not-exists-raises-duplicate-key-error?rq=4 +LOCK TABLE pg_catalog.pg_namespace; + + -- This file adds versioning support to database it will be loaded to. -- It requires that PL/pgSQL is already loaded - will raise exception otherwise. -- All versioning "stuff" (tables, functions) is in "_v" schema. -- All functions are defined as 'RETURNS SETOF INT4' to be able to make them to RETURN literally nothing (0 rows). --- >> RETURNS VOID<< IS similar, but it still outputs "empty line" in psql when calling. +-- >> RETURNS VOID<< IS similar, but it still outputs "empty line" in psql when calling CREATE SCHEMA IF NOT EXISTS _v; COMMENT ON SCHEMA _v IS 'Schema for versioning data and functionality.'; diff --git a/src/exchangedb/versioning.sql b/src/exchangedb/versioning.sql index 116f409b7..c7fa81213 100644 --- a/src/exchangedb/versioning.sql +++ b/src/exchangedb/versioning.sql @@ -146,12 +146,17 @@ BEGIN; +-- Added by Christian Grothoff to support concurrency, see +-- https://stackoverflow.com/questions/29900845/create-schema-if-not-exists-raises-duplicate-key-error?rq=4 +LOCK TABLE pg_catalog.pg_namespace; + + -- This file adds versioning support to database it will be loaded to. -- It requires that PL/pgSQL is already loaded - will raise exception otherwise. -- All versioning "stuff" (tables, functions) is in "_v" schema. -- All functions are defined as 'RETURNS SETOF INT4' to be able to make them to RETURN literally nothing (0 rows). --- >> RETURNS VOID<< IS similar, but it still outputs "empty line" in psql when calling. +-- >> RETURNS VOID<< IS similar, but it still outputs "empty line" in psql when calling CREATE SCHEMA IF NOT EXISTS _v; COMMENT ON SCHEMA _v IS 'Schema for versioning data and functionality.'; diff --git a/src/include/taler_testing_lib.h b/src/include/taler_testing_lib.h index a514ad2dd..367b54bba 100644 --- a/src/include/taler_testing_lib.h +++ b/src/include/taler_testing_lib.h @@ -275,12 +275,12 @@ struct TALER_TESTING_Command * * @param cls closure * @param cmd command being run - * @param i interpreter state + * @param is interpreter state */ void (*run)(void *cls, const struct TALER_TESTING_Command *cmd, - struct TALER_TESTING_Interpreter *i); + struct TALER_TESTING_Interpreter *is); /** |