Skip to content

Commit 7e24bea

Browse files
committed
Bug #21220766: MYSQLPUMP DOES NOT FILTER OUT OBJECT NAMES CORRECTLY WHEN HAVING '.' OR '@'
Post-push fix: Fix broken build with GCC.
1 parent bbb5855 commit 7e24bea

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

unittest/gunit/pump_object_filter-t.cc

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,23 +33,23 @@ class PumpObjectParserTest : public ::testing::Test
3333
TEST_F(PumpObjectParserTest, empty)
3434
{
3535
err= parse_inclusion_string("", list, true, false);
36-
EXPECT_EQ(err.length(), 0);
36+
EXPECT_EQ(err.length(), 0U);
3737
}
3838

3939
TEST_F(PumpObjectParserTest, singe)
4040
{
4141
err= parse_inclusion_string(" t1 ", list, true, false);
42-
EXPECT_EQ(err.length(), 0) << "returned '" << err << "'";
43-
EXPECT_EQ(list.size(), 1);
42+
EXPECT_EQ(err.length(), 0U) << "returned '" << err << "'";
43+
EXPECT_EQ(list.size(), 1U);
4444
EXPECT_EQ(list[0].first, "%");
4545
EXPECT_EQ(list[0].second, "t1");
4646
}
4747

4848
TEST_F(PumpObjectParserTest, two_tables)
4949
{
5050
err= parse_inclusion_string(" t1 , foo . bar ", list, true, false);
51-
EXPECT_EQ(err.length(), 0) << "returned '" << err << "'";
52-
EXPECT_EQ(list.size(), 2);
51+
EXPECT_EQ(err.length(), 0U) << "returned '" << err << "'";
52+
EXPECT_EQ(list.size(), 2U);
5353
EXPECT_EQ(list[0].first, "%");
5454
EXPECT_EQ(list[0].second, "t1");
5555
EXPECT_EQ(list[1].first, "foo");
@@ -59,40 +59,40 @@ TEST_F(PumpObjectParserTest, two_tables)
5959
TEST_F(PumpObjectParserTest, table_with_a_dot)
6060
{
6161
err= parse_inclusion_string(" t1\\\\.t2 ", list, true, false);
62-
EXPECT_EQ(err.length(), 0) << "returned '" << err << "'";
63-
EXPECT_EQ(list.size(), 1);
62+
EXPECT_EQ(err.length(), 0U) << "returned '" << err << "'";
63+
EXPECT_EQ(list.size(), 1U);
6464
EXPECT_EQ(list[0].first, "%");
6565
EXPECT_EQ(list[0].second, "t1.t2");
6666
}
6767

6868
TEST_F(PumpObjectParserTest, bad_list_escape)
6969
{
7070
err= parse_inclusion_string(" t1\\.t2 ", list, true, false);
71-
EXPECT_NE(err.length(), 0) << "returned '" << err << "'";
72-
EXPECT_EQ(list.size(), 0);
71+
EXPECT_NE(err.length(), 0U) << "returned '" << err << "'";
72+
EXPECT_EQ(list.size(), 0U);
7373
}
7474

7575
TEST_F(PumpObjectParserTest, bad_table_name_escape)
7676
{
7777
err= parse_inclusion_string(" t1\\\\,t2 ", list, true, false);
78-
EXPECT_NE(err.length(), 0) << "returned '" << err << "'";
79-
EXPECT_EQ(list.size(), 0);
78+
EXPECT_NE(err.length(), 0U) << "returned '" << err << "'";
79+
EXPECT_EQ(list.size(), 0U);
8080
}
8181

8282
TEST_F(PumpObjectParserTest, table_with_a_comma)
8383
{
8484
err= parse_inclusion_string(" t1\\,t2 ", list, true, false);
85-
EXPECT_EQ(err.length(), 0) << "returned '" << err << "'";
86-
EXPECT_EQ(list.size(), 1);
85+
EXPECT_EQ(err.length(), 0U) << "returned '" << err << "'";
86+
EXPECT_EQ(list.size(), 1U);
8787
EXPECT_EQ(list[0].first, "%");
8888
EXPECT_EQ(list[0].second, "t1,t2");
8989
}
9090

9191
TEST_F(PumpObjectParserTest, user_with_an_at)
9292
{
9393
err= parse_inclusion_string(" t1\\\\@t2 ", list, true, true);
94-
EXPECT_EQ(err.length(), 0) << "returned '" << err << "'";
95-
EXPECT_EQ(list.size(), 1);
94+
EXPECT_EQ(err.length(), 0U) << "returned '" << err << "'";
95+
EXPECT_EQ(list.size(), 1U);
9696
EXPECT_EQ(list[0].first, "'t1@t2'");
9797
EXPECT_EQ(list[0].second, "%");
9898
}

0 commit comments

Comments
 (0)