diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2024-04-30 16:01:43 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2024-04-30 16:01:43 +0200 |
| commit | a2e80fee105022a536b5bf0366e2951fdcb9b2ce (patch) | |
| tree | 088c6c2ca9ffd178dc69f245e8ceb1849ce89f47 | |
| parent | b3ec2267f7ec7a4f590856f8de82eaf7af3de5fb (diff) | |
Fix preprocessor conditions in odb-tests/common/view/basics/
| -rw-r--r-- | odb-tests/common/view/basics/buildfile | 3 | ||||
| -rw-r--r-- | odb-tests/common/view/basics/driver.cxx | 16 | ||||
| -rw-r--r-- | odb-tests/common/view/basics/test.hxx | 30 |
3 files changed, 10 insertions, 39 deletions
diff --git a/odb-tests/common/view/basics/buildfile b/odb-tests/common/view/basics/buildfile index d9738a4..2cccab2 100644 --- a/odb-tests/common/view/basics/buildfile +++ b/odb-tests/common/view/basics/buildfile @@ -35,6 +35,9 @@ odb_options = --table-prefix t_view_b_ \ --generate-query \ --generate-prepared +if $multi + odb_options += -DMULTI_DATABASE + cxx.poptions =+ "-I$out_base" "-I$src_base" # Testscript's run-time prerequisites. diff --git a/odb-tests/common/view/basics/driver.cxx b/odb-tests/common/view/basics/driver.cxx index e2f611a..419b29d 100644 --- a/odb-tests/common/view/basics/driver.cxx +++ b/odb-tests/common/view/basics/driver.cxx @@ -721,12 +721,7 @@ main (int argc, char* argv[]) t.commit (); } - // @@ BUILD2 Also disable for DATABASE_MYSQL and DATABASE_PGSQL (see - // vright definition for details). - // -#if !defined(DATABASE_MYSQL) && \ - !defined(DATABASE_SQLITE) && \ - !defined(DATABASE_PGSQL) +#if !defined(DATABASE_SQLITE) && !defined(MULTI_DATABASE) { typedef odb::query<vright> query; typedef odb::result<vright> result; @@ -743,12 +738,9 @@ main (int argc, char* argv[]) } #endif - // @@ BUILD2 Also disable for DATABASE_PGSQL (see vfull definition for - // details). - // -#if !defined(DATABASE_MYSQL) && \ - !defined(DATABASE_SQLITE) && \ - !defined(DATABASE_PGSQL) +#if !defined(DATABASE_SQLITE) && \ + !defined(DATABASE_MYSQL) && \ + !defined(MULTI_DATABASE) { typedef odb::query<vfull> query; typedef odb::result<vfull> result; diff --git a/odb-tests/common/view/basics/test.hxx b/odb-tests/common/view/basics/test.hxx index 130bcd4..25c502b 100644 --- a/odb-tests/common/view/basics/test.hxx +++ b/odb-tests/common/view/basics/test.hxx @@ -543,18 +543,7 @@ namespace test2 odb::nullable<int> id2; }; - // @@ BUILD2 Also disable for ODB_DATABASE_MYSQL and ODB_DATABASE_PGSQL, - // otherwise we end up with the following error: - // - // test-odb-mysql.hxx:3202:20: error: invalid use of incomplete type ‘class odb::access::view_traits<test2::vright>’ - // 3202 | public access::view_traits< ::test2::vright > - // | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - // -//#if !defined(ODB_DATABASE_SQLITE) && !defined(ODB_DATABASE_COMMON) -#if !defined(ODB_DATABASE_MYSQL) && \ - !defined(ODB_DATABASE_SQLITE) && \ - !defined(ODB_DATABASE_PGSQL) && \ - !defined(ODB_DATABASE_COMMON) +#if !defined(ODB_DATABASE_SQLITE) && !defined(MULTI_DATABASE) #pragma db view object(obj2 = o2) object(obj1 = o1 right: o2::n == o1::n) struct vright @@ -565,22 +554,9 @@ namespace test2 #endif - // @@ BUILD2 Also disable for ODB_DATABASE_PGSQL, otherwise we end up with the - // following error: - // - // test-odb-pgsql.hxx:3325:20: error: invalid use of incomplete type ‘class odb::access::view_traits<test2::vfull>’ - // 3325 | public access::view_traits< ::test2::vfull > - // | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - // -/* -#if !defined(ODB_DATABASE_MYSQL) && \ - !defined(ODB_DATABASE_SQLITE) && \ - !defined(ODB_DATABASE_COMMON) -*/ -#if !defined(ODB_DATABASE_MYSQL) && \ +#if !defined(ODB_DATABASE_MYSQL) && \ !defined(ODB_DATABASE_SQLITE) && \ - !defined(ODB_DATABASE_PGSQL) && \ - !defined(ODB_DATABASE_COMMON) + !defined(MULTI_DATABASE) #pragma db view object(obj1 = o1) object(obj2 = o2 full: o1::n == o2::n) struct vfull |