Skip to content

Added some bindings for std::string_view when using c++17 #224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kaptenhonek wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Added some bindings for std::string_view when using c++17 #224

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f2f68b7
Added some bindings for std::string_view when using c++17
kaptenhonek Sep 26, 2019
7002c1f
Added a size parameter to const char * bind functions
kaptenhonek Sep 26, 2019
7665ad7
Merge remote-tracking branch 'github/master'
BobbyHenrik Jan 20, 2020
2d3ffb1
Restored test coverage
BobbyHenrik Jan 20, 2020
f25364e
More coverage fixes
BobbyHenrik Jan 20, 2020
1a98ec4
More coverage fixes and small typo fix
BobbyHenrik Jan 20, 2020
7465704
Address sanitizer fix
BobbyHenrik Jan 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
More coverage fixes and small typo fix
  • Loading branch information
@BobbyHenrik
BobbyHenrik committed Jan 20, 2020
commit 1a98ec4fa7fdbfab929d1de0c0677c0155b7edcd
23 changes: 22 additions & 1 deletion tests/Statement_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -730,7 +730,7 @@ TEST(Statement, bindNoCopyByName)
const std::string txt2 = "sec\0nd2";
const unsigned char blob[] = { 'b','l','\0','b','2' };
insert.bindNoCopy(atxt1, txt1);
insert.bindNoCopy(atxt2, txt2.c_str(), static_cast<int>(atxt2.size()));
insert.bindNoCopy(atxt2, txt2.c_str(), static_cast<int>(txt2.size()));
insert.bindNoCopy(ablob, blob, sizeof(blob));
EXPECT_EQ(1, insert.exec());
EXPECT_EQ(2, db.getLastInsertRowid());
Expand All @@ -746,6 +746,27 @@ TEST(Statement, bindNoCopyByName)
EXPECT_EQ(0, memcmp(&txt2[0], &query.getColumn(2).getString()[0], txt2.size()));
EXPECT_EQ(0, memcmp(blob, &query.getColumn(3).getString()[0], sizeof(blob)));
}

insert.reset();
query.reset();

// Insert a third row with some more variants of bindNoCopy() using std::string names
{
const std::string atxt1 = "@txt1";
const std::string txt1 = "fir\0st";
insert.bindNoCopy(atxt1, txt1);
EXPECT_EQ(1, insert.exec());
EXPECT_EQ(3, db.getLastInsertRowid());
EXPECT_EQ(SQLITE_DONE, db.getErrorCode());

// Check the result
query.executeStep(); // pass on the first row
query.executeStep(); // pass on the second row as well
query.executeStep();
EXPECT_TRUE(query.hasRow());
EXPECT_FALSE(query.isDone());
EXPECT_EQ(txt1, query.getColumn(1).getString());
}
}

TEST(Statement, isColumnNull)
Expand Down