Skip to content

Commit f341814

Browse files
committed
Fix UNION Dbo test for Firebird, disable EXCEPT/INTERSECT for MySQL/FB
1 parent a05a7c5 commit f341814

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

test/dbo/DboTest.C

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3092,7 +3092,7 @@ BOOST_AUTO_TEST_CASE( dbo_test39a )
30923092
{
30933093
dbo::Transaction t(*session_);
30943094

3095-
As as = session_->query<Wt::Dbo::ptr<A> >("select a from table_a a where i = 3 union select a from table_a a where i = 5");
3095+
As as = session_->query<Wt::Dbo::ptr<A> >("select a from \"table_a\" a where a.\"i\" = 3 union select a from \"table_a\" a where a.\"i\" = 5");
30963096

30973097
BOOST_REQUIRE(as.size() == 2);
30983098

@@ -3107,6 +3107,7 @@ BOOST_AUTO_TEST_CASE( dbo_test39a )
31073107

31083108
BOOST_AUTO_TEST_CASE( dbo_test39b )
31093109
{
3110+
#if !defined(MYSQL) && !defined(FIREBIRD) // MySQL and Firebird don't do INTERSECT
31103111
// Test INTERSECT
31113112
DboFixture f;
31123113
dbo::Session *session_ = f.session_;
@@ -3116,7 +3117,7 @@ BOOST_AUTO_TEST_CASE( dbo_test39b )
31163117
{
31173118
dbo::Transaction t(*session_);
31183119

3119-
As as = session_->query<Wt::Dbo::ptr<A> >("select a from table_a a where i > 3 intersect select a from table_a a where i < 5");
3120+
As as = session_->query<Wt::Dbo::ptr<A> >("select a from \"table_a\" a where a.\"i\" > 3 intersect select a from \"table_a\" a where a.\"i\" < 5");
31203121

31213122
BOOST_REQUIRE(as.size() == 1);
31223123

@@ -3125,10 +3126,12 @@ BOOST_AUTO_TEST_CASE( dbo_test39b )
31253126
++it;
31263127
BOOST_REQUIRE(it == as.end());
31273128
}
3129+
#endif
31283130
}
31293131

31303132
BOOST_AUTO_TEST_CASE( dbo_test39c )
31313133
{
3134+
#if !defined(MYSQL) && !defined(FIREBIRD) // MySQL and Firebird don't do EXCEPT
31323135
// Test EXCEPT
31333136
DboFixture f;
31343137
dbo::Session *session_ = f.session_;
@@ -3138,7 +3141,7 @@ BOOST_AUTO_TEST_CASE( dbo_test39c )
31383141
{
31393142
dbo::Transaction t(*session_);
31403143

3141-
As as = session_->query<Wt::Dbo::ptr<A> >("select a from table_a a where i >= 3 except select a from table_a a where i = 4");
3144+
As as = session_->query<Wt::Dbo::ptr<A> >("select a from \"table_a\" a where a.\"i\" >= 3 except select a from \"table_a\" a where a.\"i\" = 4");
31423145

31433146
BOOST_REQUIRE(as.size() == 2);
31443147

@@ -3149,4 +3152,5 @@ BOOST_AUTO_TEST_CASE( dbo_test39c )
31493152
++it;
31503153
BOOST_REQUIRE(it == as.end());
31513154
}
3155+
#endif
31523156
}

0 commit comments

Comments
 (0)