From b95eff25492660329ae38847932fb1e9069b31c3 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Thu, 28 Mar 2024 15:19:48 +0300
Subject: Add package configuration to libodb-pgsql and libodb-mysql for
 testing in multi-database odb-tests mode

---
 libodb-mysql/manifest  | 22 ++++++++++++++++++++++
 libodb-pgsql/manifest  | 23 ++++++++++++++++++++++-
 libodb-sqlite/manifest | 13 +------------
 3 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/libodb-mysql/manifest b/libodb-mysql/manifest
index eecebcd..76f7537 100644
--- a/libodb-mysql/manifest
+++ b/libodb-mysql/manifest
@@ -43,3 +43,25 @@ default-build-config:
   config.odb_tests.mysql.port=$getenv(DATABASE_PORT)
 }+ odb-tests
 \
+
+# Only build this package configuration where it can be tested via odb-tests
+# package (see its manifest for details).
+#
+multi-builds: all
+multi-builds: -wasm
+multi-builds: -( +windows &gcc ) ; MinGW GCC is not supported by libmysqlclient.
+multi-builds: -( +windows -gcc )
+multi-builds: &gcc
+multi-builds: &gcc-5+
+multi-builds: -static
+multi-build-config:
+\
+{
+  config.odb_tests.multi_database=true
+
+  config.odb_tests.mysql.user=$getenv(DATABASE_USER)
+  config.odb_tests.mysql.database=$getenv(DATABASE_NAME)
+  config.odb_tests.mysql.host=$getenv(DATABASE_HOST)
+  config.odb_tests.mysql.port=$getenv(DATABASE_PORT)
+}+ odb-tests
+\
diff --git a/libodb-pgsql/manifest b/libodb-pgsql/manifest
index 67ebf6d..1c58eb3 100644
--- a/libodb-pgsql/manifest
+++ b/libodb-pgsql/manifest
@@ -20,7 +20,7 @@ requires: c++11
 depends: * build2 >= 0.16.0-
 depends: * bpkg >= 0.16.0-
 
-depends: libpq >=7.4.0
+depends: libpq >= 7.4.0
 depends: libodb == $
 depends: * cli ^1.2.0- ? ($config.libodb_pgsql.develop)
 
@@ -41,3 +41,24 @@ default-build-config:
   config.odb_tests.pgsql.port=$getenv(DATABASE_PORT)
 }+ odb-tests
 \
+
+# Only build this package configuration where it can be tested via odb-tests
+# package (see its manifest for details).
+#
+multi-builds: all
+multi-builds: -wasm
+multi-builds: -( +windows -gcc )
+multi-builds: &gcc
+multi-builds: &gcc-5+
+multi-builds: -static
+multi-build-config:
+\
+{
+  config.odb_tests.multi_database=true
+
+  config.odb_tests.pgsql.user=$getenv(DATABASE_USER)
+  config.odb_tests.pgsql.database=$getenv(DATABASE_NAME)
+  config.odb_tests.pgsql.host=$getenv(DATABASE_HOST)
+  config.odb_tests.pgsql.port=$getenv(DATABASE_PORT)
+}+ odb-tests
+\
diff --git a/libodb-sqlite/manifest b/libodb-sqlite/manifest
index 2977964..c382c67 100644
--- a/libodb-sqlite/manifest
+++ b/libodb-sqlite/manifest
@@ -27,25 +27,14 @@ depends: * cli ^1.2.0- ? ($config.libodb_sqlite.develop)
 tests: odb-tests == $ \
   ? (!$defined(config.odb_tests.database)) config.odb_tests.database=sqlite
 
-# @@ TMP
-#
 builds: all
-#builds: all sqlite
 
 # Only build this package configuration where it can be tested via odb-tests
 # package (see its manifest for details).
 #
-# @@ TMP
-#
 multi-builds: all
-#multi-builds: sqlite
 multi-builds: -( +windows -gcc )
 multi-builds: &gcc
 multi-builds: &gcc-5+
 multi-builds: -static
-multi-build-config:
-\
-{ config.odb_tests.multi_database=true }+ odb-tests
-;
-Enable testing in dynamic multi-database mode.
-\
+multi-build-config: { config.odb_tests.multi_database=true }+ odb-tests
-- 
cgit v1.1