diff options
Diffstat (limited to 'odb-tests/common')
61 files changed, 581 insertions, 11 deletions
diff --git a/odb-tests/common/access/testscript b/odb-tests/common/access/testscript index 04f0ec0..3b2618f 100644 --- a/odb-tests/common/access/testscript +++ b/odb-tests/common/access/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/as/testscript b/odb-tests/common/as/testscript index 12d9753..4f445ff 100644 --- a/odb-tests/common/as/testscript +++ b/odb-tests/common/as/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/blob/testscript b/odb-tests/common/blob/testscript index 4fb9955..f568d9b 100644 --- a/odb-tests/common/blob/testscript +++ b/odb-tests/common/blob/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/bulk/buildfile b/odb-tests/common/bulk/buildfile index 68e3c8b..61d4fac 100644 --- a/odb-tests/common/bulk/buildfile +++ b/odb-tests/common/bulk/buildfile @@ -7,7 +7,8 @@ if ($build.meta_operation != 'dist') "bulk operations are disabled for pgsql which is specified as single database" } -import libodb = libodb%lib{odb} +import libodb = libodb%lib{odb} +import libcommon = lib{common} libs = @@ -17,14 +18,12 @@ for db: $databases import libs += libodb-$db%lib{odb-$db} } -import libs += lib{common} - exe{driver}: {hxx cxx}{* -*-odb -*-odb-*} {hxx ixx cxx}{test-odb} testscript # Introduce the metadata library target to make sure the libodb library is # resolved for the odb_compile ad hoc rule (see build/root.build for details). # -libue{test-meta}: $libodb +libue{test-meta}: $libodb $libcommon <{hxx ixx cxx}{test-odb}>: hxx{test} libue{test-meta} diff --git a/odb-tests/common/bulk/driver.cxx b/odb-tests/common/bulk/driver.cxx index 23b49ad..f598dcc 100644 --- a/odb-tests/common/bulk/driver.cxx +++ b/odb-tests/common/bulk/driver.cxx @@ -1091,7 +1091,7 @@ main (int argc, char* argv[]) // Test SQL Server optimistic concurrency with ROWVERSION. // -#ifdef DATABASE_MSSQL +#if !defined(MULTI_DATABASE) && defined(DATABASE_MSSQL) { using namespace test8; diff --git a/odb-tests/common/bulk/test.hxx b/odb-tests/common/bulk/test.hxx index 71755f2..60663f7 100644 --- a/odb-tests/common/bulk/test.hxx +++ b/odb-tests/common/bulk/test.hxx @@ -9,6 +9,8 @@ #include <odb/core.hxx> +#include <libcommon/config.hxx> // DATABASE_XXX + // Test basic functionality. // #pragma db namespace table("t1_") @@ -186,7 +188,7 @@ namespace test7 // Test SQL Server optimistic concurrency with ROWVERSION. // -#if defined(ODB_DATABASE_MSSQL) || defined(DATABASE_MSSQL) +#if !defined(MULTI_DATABASE) && defined(DATABASE_MSSQL) #pragma db namespace table("t8_") namespace test8 { diff --git a/odb-tests/common/bulk/testscript b/odb-tests/common/bulk/testscript index e7567c9..6e4e610 100644 --- a/odb-tests/common/bulk/testscript +++ b/odb-tests/common/bulk/testscript @@ -501,3 +501,18 @@ if ($pgsql && $pgsql_bulk) end end } + +: mssql +: +if $mssql +{ + .include ../../mssql.testscript + + $create_schema; + + if $multi + $* # Noop. + else + $* >>>../output + end +} diff --git a/odb-tests/common/callback/testscript b/odb-tests/common/callback/testscript index c7d03ee..6e71d67 100644 --- a/odb-tests/common/callback/testscript +++ b/odb-tests/common/callback/testscript @@ -98,3 +98,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/changelog/testscript b/odb-tests/common/changelog/testscript index 9368938..af8dcf5 100644 --- a/odb-tests/common/changelog/testscript +++ b/odb-tests/common/changelog/testscript @@ -64,3 +64,22 @@ if $pgsql diff $src_base/$n-pgsql-patch.xml $(n).xml end } + +: mssql +: +if $mssql +{ + odb_options += --database 'mssql' --changelog-dir $~ + + for h: $headers + n = $base($leaf($h)) + + $* $odb_options -DBVER=1 -DCVER=1 --init-changelog $h &$(n).xml &$(n).sql + + $* $odb_options -DBVER=1 -DCVER=2 $h + diff $src_base/$n-mssql-diff.xml $(n).xml + + $* $odb_options -DBVER=2 -DCVER=3 $h + diff $src_base/$n-mssql-patch.xml $(n).xml + end +} diff --git a/odb-tests/common/circular/multiple/testscript b/odb-tests/common/circular/multiple/testscript index 6a05dc6..6c46a3f 100644 --- a/odb-tests/common/circular/multiple/testscript +++ b/odb-tests/common/circular/multiple/testscript @@ -29,3 +29,12 @@ if $pgsql $* } + +: mssql +: +if $mssql +{ + .include ../../../mssql.testscript + + $* +} diff --git a/odb-tests/common/circular/single/testscript b/odb-tests/common/circular/single/testscript index b870306..6429aa7 100644 --- a/odb-tests/common/circular/single/testscript +++ b/odb-tests/common/circular/single/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/composite/testscript b/odb-tests/common/composite/testscript index 0747507..8b95a89 100644 --- a/odb-tests/common/composite/testscript +++ b/odb-tests/common/composite/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/const-member/testscript b/odb-tests/common/const-member/testscript index c81d856..ca05a3b 100644 --- a/odb-tests/common/const-member/testscript +++ b/odb-tests/common/const-member/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/const-object/testscript b/odb-tests/common/const-object/testscript index 3885e96..20595ef 100644 --- a/odb-tests/common/const-object/testscript +++ b/odb-tests/common/const-object/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/container/basics/testscript b/odb-tests/common/container/basics/testscript index ea99498..644231b 100644 --- a/odb-tests/common/container/basics/testscript +++ b/odb-tests/common/container/basics/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/container/change-tracking/testscript b/odb-tests/common/container/change-tracking/testscript index 2169869..bd585a6 100644 --- a/odb-tests/common/container/change-tracking/testscript +++ b/odb-tests/common/container/change-tracking/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/ctor/testscript b/odb-tests/common/ctor/testscript index 8946ddb..e786073 100644 --- a/odb-tests/common/ctor/testscript +++ b/odb-tests/common/ctor/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/default/testscript b/odb-tests/common/default/testscript index f29cef4..e71da52 100644 --- a/odb-tests/common/default/testscript +++ b/odb-tests/common/default/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/definition/testscript b/odb-tests/common/definition/testscript index c9dea6d..d825d37 100644 --- a/odb-tests/common/definition/testscript +++ b/odb-tests/common/definition/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/enum/testscript b/odb-tests/common/enum/testscript index d2ca28c..417663c 100644 --- a/odb-tests/common/enum/testscript +++ b/odb-tests/common/enum/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/erase-query/testscript b/odb-tests/common/erase-query/testscript index 90862ab..f0d6cfd 100644 --- a/odb-tests/common/erase-query/testscript +++ b/odb-tests/common/erase-query/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/id/auto/testscript b/odb-tests/common/id/auto/testscript index bb2a3a4..9e3aac8 100644 --- a/odb-tests/common/id/auto/testscript +++ b/odb-tests/common/id/auto/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/id/composite/testscript b/odb-tests/common/id/composite/testscript index f87d4bc..75891ec 100644 --- a/odb-tests/common/id/composite/testscript +++ b/odb-tests/common/id/composite/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/id/nested/testscript b/odb-tests/common/id/nested/testscript index 89e8d7a..d6c4c43 100644 --- a/odb-tests/common/id/nested/testscript +++ b/odb-tests/common/id/nested/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/include/testscript b/odb-tests/common/include/testscript index 089f7a1..4c7219f 100644 --- a/odb-tests/common/include/testscript +++ b/odb-tests/common/include/testscript @@ -29,3 +29,12 @@ if $pgsql $* } + +: mssql +: +if $mssql +{ + .include ../../mssql.testscript + + $* +} diff --git a/odb-tests/common/index/testscript b/odb-tests/common/index/testscript index cbce341..e5cf55d 100644 --- a/odb-tests/common/index/testscript +++ b/odb-tests/common/index/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/inheritance/polymorphism/testscript b/odb-tests/common/inheritance/polymorphism/testscript index 89e5726..dbe4b41 100644 --- a/odb-tests/common/inheritance/polymorphism/testscript +++ b/odb-tests/common/inheritance/polymorphism/testscript @@ -78,3 +78,16 @@ if $pgsql $* ($multi ? 'pgsql' : ) $pgsql_options } + +: mssql +: +if $mssql +{ + .include ../../../mssql-schema.testscript + + for s: $schemas + $create_schema_cmd -i $out_base/"$s"($multi ? '-mssql' : '').sql + end; + + $* ($multi ? 'mssql' : ) $mssql_options +} diff --git a/odb-tests/common/inheritance/reuse/testscript b/odb-tests/common/inheritance/reuse/testscript index 995b3f5..6522a60 100644 --- a/odb-tests/common/inheritance/reuse/testscript +++ b/odb-tests/common/inheritance/reuse/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/inheritance/transient/testscript b/odb-tests/common/inheritance/transient/testscript index bce91de..2d6a170 100644 --- a/odb-tests/common/inheritance/transient/testscript +++ b/odb-tests/common/inheritance/transient/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/inverse/buildfile b/odb-tests/common/inverse/buildfile index 63fa1cb..bea135b 100644 --- a/odb-tests/common/inverse/buildfile +++ b/odb-tests/common/inverse/buildfile @@ -35,6 +35,9 @@ odb_options = --table-prefix t_inverse_ \ --generate-query \ --generate-session +if $mssql + odb_options += --fkeys-deferrable-mode mssql:not_deferrable + cxx.poptions =+ "-I$out_base" "-I$src_base" # Testscript's run-time prerequisites. diff --git a/odb-tests/common/inverse/testscript b/odb-tests/common/inverse/testscript index c2a4e3e..3b55c41 100644 --- a/odb-tests/common/inverse/testscript +++ b/odb-tests/common/inverse/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/lazy-ptr/testscript b/odb-tests/common/lazy-ptr/testscript index 736fa4c..7aa727a 100644 --- a/odb-tests/common/lazy-ptr/testscript +++ b/odb-tests/common/lazy-ptr/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/lifecycle/testscript b/odb-tests/common/lifecycle/testscript index 0337bba..faf30ed 100644 --- a/odb-tests/common/lifecycle/testscript +++ b/odb-tests/common/lifecycle/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/no-id/testscript b/odb-tests/common/no-id/testscript index 5ec57ee..dd3d74e 100644 --- a/odb-tests/common/no-id/testscript +++ b/odb-tests/common/no-id/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/object/testscript b/odb-tests/common/object/testscript index 6982409..7bb3bb5 100644 --- a/odb-tests/common/object/testscript +++ b/odb-tests/common/object/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/optimistic/testscript b/odb-tests/common/optimistic/testscript index 9ebafb2..b1c0b48 100644 --- a/odb-tests/common/optimistic/testscript +++ b/odb-tests/common/optimistic/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/pragma/testscript b/odb-tests/common/pragma/testscript index 089f7a1..4c7219f 100644 --- a/odb-tests/common/pragma/testscript +++ b/odb-tests/common/pragma/testscript @@ -29,3 +29,12 @@ if $pgsql $* } + +: mssql +: +if $mssql +{ + .include ../../mssql.testscript + + $* +} diff --git a/odb-tests/common/prepared/testscript b/odb-tests/common/prepared/testscript index 3530c5b..05df04f 100644 --- a/odb-tests/common/prepared/testscript +++ b/odb-tests/common/prepared/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/query/array/testscript b/odb-tests/common/query/array/testscript index 631ae24..628d2d7 100644 --- a/odb-tests/common/query/array/testscript +++ b/odb-tests/common/query/array/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/query/basics/testscript b/odb-tests/common/query/basics/testscript index 9086b66..c5d9af0 100644 --- a/odb-tests/common/query/basics/testscript +++ b/odb-tests/common/query/basics/testscript @@ -148,3 +148,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/query/one/testscript b/odb-tests/common/query/one/testscript index 963a206..002e723 100644 --- a/odb-tests/common/query/one/testscript +++ b/odb-tests/common/query/one/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/readonly/driver.cxx b/odb-tests/common/readonly/driver.cxx index b207627..3531e57 100644 --- a/odb-tests/common/readonly/driver.cxx +++ b/odb-tests/common/readonly/driver.cxx @@ -12,7 +12,7 @@ #include <odb/database.hxx> #include <odb/transaction.hxx> -#include <libcommon/config.hxx> // DATABASE_* +#include <libcommon/config.hxx> // MULTI_DATABASE #include <libcommon/common.hxx> #include "test.hxx" diff --git a/odb-tests/common/readonly/testscript b/odb-tests/common/readonly/testscript index c798201..f2f364b 100644 --- a/odb-tests/common/readonly/testscript +++ b/odb-tests/common/readonly/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/relationship/basics/testscript b/odb-tests/common/relationship/basics/testscript index b498bfa..c4df5e9 100644 --- a/odb-tests/common/relationship/basics/testscript +++ b/odb-tests/common/relationship/basics/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/relationship/on-delete/buildfile b/odb-tests/common/relationship/on-delete/buildfile index 965a2eb..5cdb585 100644 --- a/odb-tests/common/relationship/on-delete/buildfile +++ b/odb-tests/common/relationship/on-delete/buildfile @@ -30,11 +30,14 @@ exe{driver}: libue{test-meta} $libs # Specify the ODB custom options to be used by the odb_compile ad hoc rule # (see build/root.build for details). # -odb_options = --table-prefix t_rel_on_d_ \ - --generate-schema \ - --fkeys-deferrable-mode mysql:not_deferrable \ - --fkeys-deferrable-mode mssql:not_deferrable +odb_options = --table-prefix t_rel_on_d_ \ + --generate-schema +if $mysql + odb_options += --fkeys-deferrable-mode mysql:not_deferrable + +if $mssql + odb_options += --fkeys-deferrable-mode mssql:not_deferrable cxx.poptions =+ "-I$out_base" "-I$src_base" diff --git a/odb-tests/common/relationship/on-delete/testscript b/odb-tests/common/relationship/on-delete/testscript index 8288ebc..5a48bb6 100644 --- a/odb-tests/common/relationship/on-delete/testscript +++ b/odb-tests/common/relationship/on-delete/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/relationship/query/testscript b/odb-tests/common/relationship/query/testscript index d5ad419..0fa5ec5 100644 --- a/odb-tests/common/relationship/query/testscript +++ b/odb-tests/common/relationship/query/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/schema/embedded/basics/testscript b/odb-tests/common/schema/embedded/basics/testscript index 24448c0..ef58fc0 100644 --- a/odb-tests/common/schema/embedded/basics/testscript +++ b/odb-tests/common/schema/embedded/basics/testscript @@ -29,3 +29,12 @@ if $pgsql $* } + +: mssql +: +if $mssql +{ + .include ../../../../mssql.testscript + + $* +} diff --git a/odb-tests/common/schema/embedded/order/testscript b/odb-tests/common/schema/embedded/order/testscript index 6dfe58c..5257d87 100644 --- a/odb-tests/common/schema/embedded/order/testscript +++ b/odb-tests/common/schema/embedded/order/testscript @@ -29,3 +29,12 @@ if $pgsql $* } + +: mssql +: +if $mssql +{ + .include ../../../../mssql.testscript + + $* +} diff --git a/odb-tests/common/schema/namespace/testscript b/odb-tests/common/schema/namespace/testscript index 0fabe6e..9e4cd78 100644 --- a/odb-tests/common/schema/namespace/testscript +++ b/odb-tests/common/schema/namespace/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/section/basics/testscript b/odb-tests/common/section/basics/testscript index c0c6617..e49828a 100644 --- a/odb-tests/common/section/basics/testscript +++ b/odb-tests/common/section/basics/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/section/polymorphism/testscript b/odb-tests/common/section/polymorphism/testscript index f2cd536..55f5028 100644 --- a/odb-tests/common/section/polymorphism/testscript +++ b/odb-tests/common/section/polymorphism/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/session/cache/testscript b/odb-tests/common/session/cache/testscript index 6d013eb..351dfda 100644 --- a/odb-tests/common/session/cache/testscript +++ b/odb-tests/common/session/cache/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/session/custom/testscript b/odb-tests/common/session/custom/testscript index 39c281d..47efed9 100644 --- a/odb-tests/common/session/custom/testscript +++ b/odb-tests/common/session/custom/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/threads/testscript b/odb-tests/common/threads/testscript index 87e03e0..18eb88f 100644 --- a/odb-tests/common/threads/testscript +++ b/odb-tests/common/threads/testscript @@ -48,3 +48,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/transaction/basics/testscript b/odb-tests/common/transaction/basics/testscript index 94c58b6..ae24106 100644 --- a/odb-tests/common/transaction/basics/testscript +++ b/odb-tests/common/transaction/basics/testscript @@ -60,3 +60,12 @@ if $pgsql $* } + +: mssql +: +if $mssql +{ + .include ../../../mssql.testscript + + $* +} diff --git a/odb-tests/common/transaction/callback/testscript b/odb-tests/common/transaction/callback/testscript index 7229ecd..9ff0a89 100644 --- a/odb-tests/common/transaction/callback/testscript +++ b/odb-tests/common/transaction/callback/testscript @@ -70,3 +70,12 @@ if $pgsql $* } + +: mssql +: +if $mssql +{ + .include ../../../mssql.testscript + + $* +} diff --git a/odb-tests/common/view/basics/testscript b/odb-tests/common/view/basics/testscript index faa8408..3b03534 100644 --- a/odb-tests/common/view/basics/testscript +++ b/odb-tests/common/view/basics/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/view/olv/testscript b/odb-tests/common/view/olv/testscript index 160426d..865338e 100644 --- a/odb-tests/common/view/olv/testscript +++ b/odb-tests/common/view/olv/testscript @@ -37,3 +37,16 @@ if $pgsql $* ($multi ? 'pgsql' : ) $pgsql_options } + +: mssql +: +if $mssql +{ + .include ../../../mssql-schema.testscript + + for s: $schemas + $create_schema_cmd -i $out_base/"$s"($multi ? '-mssql' : '').sql + end; + + $* ($multi ? 'mssql' : ) $mssql_options +} diff --git a/odb-tests/common/virtual/testscript b/odb-tests/common/virtual/testscript index 769c7f9..508da6d 100644 --- a/odb-tests/common/virtual/testscript +++ b/odb-tests/common/virtual/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../mssql.testscript + + $create_schema; + $* +} diff --git a/odb-tests/common/wrapper/testscript b/odb-tests/common/wrapper/testscript index 6630813..a5aa392 100644 --- a/odb-tests/common/wrapper/testscript +++ b/odb-tests/common/wrapper/testscript @@ -31,3 +31,13 @@ if $pgsql $create_schema; $* } + +: mssql +: +if $mssql +{ + .include ../../mssql.testscript + + $create_schema; + $* +} |