Skip to content

Now using ofJson included in OF's core. #5

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Now using ofJson included in OF's core. #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1c947b
Now using ofJson included in OF's core.
smallfly Feb 22, 2016
dcc8c95
Replaced Json::nullValue (from JsonCpp) by nullptr used with 'JSON fo…
smallfly Feb 23, 2016
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
13 changes: 7 additions & 6 deletions src/SQLiteCppUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,14 @@
namespace SQLite {


Json::Value SQLiteUtils::execute(SQLite::Statement& query)
ofJson SQLiteUtils::execute(SQLite::Statement& query)
{
Json::Value columns;

ofJson columns;

while (query.executeStep())
{
Json::Value row;
ofJson row;

for (int i = 0; i < query.getColumnCount(); ++i)
{
Expand All @@ -57,7 +58,7 @@ Json::Value SQLiteUtils::execute(SQLite::Statement& query)
}
case SQLITE_NULL:
{
row[column.getName()] = Json::nullValue;
row[column.getName()] = nullptr;
break;
}
case SQLITE_TEXT:
Expand All @@ -83,8 +84,8 @@ Json::Value SQLiteUtils::execute(SQLite::Statement& query)
}
}
}

columns.append(row);
columns.push_back(row);
}

// Reset the query to use it again.
Expand Down
7 changes: 3 additions & 4 deletions src/SQLiteCppUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,23 +25,22 @@

#pragma once


#include "ofMain.h"
#include "SQLiteCpp.h"
#include <json/json.h>


namespace SQLite {


class SQLiteUtils
{
public:

/// \brief Export SQLite results as JSON.
///
/// Encodes BLOBs using BASE64.
///
/// Throws exceptions.
static Json::Value execute(SQLite::Statement& query);
static ofJson execute(SQLite::Statement& query);


};
Expand Down