Skip to content

Commit d2d935b

Browse files
sea5kgsea5kg
committed
Preapered namespece wsjcpp
1 parent 56df29b commit d2d935b

File tree

7 files changed

+48
-41
lines changed

7 files changed

+48
-41
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Example main func:
2323
#include <wsjcpp_sql_builder.h>
2424

2525
int main(int argc, const char* argv[]) {
26-
WsjcppSqlBuilder builder;
26+
wsjcpp::SqlBuilder builder;
2727
builder.selectFrom("table1")
2828
.colum("col1")
2929
.colum("col2", "c3")

‎src/tests/test_delete.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <wsjcpp_sql_builder.h>
3030

3131
int main() {
32-
WsjcppSqlBuilder builder;
32+
wsjcpp::SqlBuilder builder;
3333
builder.deleteFrom("table4")
3434
.where()
3535
.equal("col1", "1")

‎src/tests/test_insert.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <wsjcpp_sql_builder.h>
3030

3131
int main() {
32-
WsjcppSqlBuilder builder;
32+
wsjcpp::SqlBuilder builder;
3333
builder.insertInto("table2")
3434
.colum("col1")
3535
.addColums({"col2", "col3"})

‎src/tests/test_select.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <wsjcpp_sql_builder.h>
3030

3131
int main() {
32-
WsjcppSqlBuilder builder;
32+
wsjcpp::SqlBuilder builder;
3333
builder.selectFrom("table1")
3434
.colum("col1")
3535
.colum("col2", "c3")

‎src/tests/test_update.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <wsjcpp_sql_builder.h>
3030

3131
int main() {
32-
WsjcppSqlBuilder builder;
32+
wsjcpp::SqlBuilder builder;
3333
builder.update("table3")
3434
.set("col1", "val uuu")
3535
.set("col2", 1)

‎src/wsjcpp_sql_builder.cpp‎

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
#include <algorithm>
3030

3131

32+
namespace wsjcpp {
33+
3234
// ---------------------------------------------------------------------
3335
// WsjcppSqlBuilderHelpers
3436

@@ -63,7 +65,7 @@ std::string WsjcppSqlBuilderHelpers::escapingStringValue(const std::string &sVal
6365
}
6466

6567

66-
WsjcppSqlQuery::WsjcppSqlQuery(WsjcppSqlQueryType sqlType, WsjcppSqlBuilder *builder, const std::string &tableName)
68+
WsjcppSqlQuery::WsjcppSqlQuery(WsjcppSqlQueryType sqlType, SqlBuilder *builder, const std::string &tableName)
6769
: m_sqlType(sqlType), m_builder(builder), m_tableName(tableName) {
6870

6971
}
@@ -72,11 +74,11 @@ WsjcppSqlQueryType WsjcppSqlQuery::sqlType() {
7274
return m_sqlType;
7375
}
7476

75-
WsjcppSqlBuilder &WsjcppSqlQuery::builder() {
77+
SqlBuilder &WsjcppSqlQuery::builder() {
7678
return *m_builder;
7779
}
7880

79-
WsjcppSqlBuilder *WsjcppSqlQuery::builderRawPtr() {
81+
SqlBuilder *WsjcppSqlQuery::builderRawPtr() {
8082
return m_builder;
8183
}
8284

@@ -185,7 +187,7 @@ std::string WsjcppSqlWhereCondition::sql() {
185187
// ---------------------------------------------------------------------
186188
// WsjcppSqlSelect
187189

188-
WsjcppSqlSelect::WsjcppSqlSelect(const std::string &tableName, WsjcppSqlBuilder *builder)
190+
WsjcppSqlSelect::WsjcppSqlSelect(const std::string &tableName, SqlBuilder *builder)
189191
: WsjcppSqlQuery(WsjcppSqlQueryType::SELECT, builder, tableName) {
190192
// TODO multitype table names with AS
191193
}
@@ -242,7 +244,7 @@ std::string WsjcppSqlSelect::sql() {
242244
// ---------------------------------------------------------------------
243245
// WsjcppSqlInsert
244246

245-
WsjcppSqlInsert::WsjcppSqlInsert(const std::string &tableName, WsjcppSqlBuilder *builder)
247+
WsjcppSqlInsert::WsjcppSqlInsert(const std::string &tableName, SqlBuilder *builder)
246248
: WsjcppSqlQuery(WsjcppSqlQueryType::INSERT, builder, tableName) {
247249

248250
}
@@ -316,7 +318,7 @@ std::string WsjcppSqlInsert::sql() {
316318
// ---------------------------------------------------------------------
317319
// WsjcppSqlUpdate
318320

319-
WsjcppSqlUpdate::WsjcppSqlUpdate(const std::string &tableName, WsjcppSqlBuilder *builder)
321+
WsjcppSqlUpdate::WsjcppSqlUpdate(const std::string &tableName, SqlBuilder *builder)
320322
: WsjcppSqlQuery(WsjcppSqlQueryType::UPDATE, builder, tableName) {
321323

322324
}
@@ -380,7 +382,7 @@ std::string WsjcppSqlUpdate::sql() {
380382
// ---------------------------------------------------------------------
381383
// WsjcppSqlDelete
382384

383-
WsjcppSqlDelete::WsjcppSqlDelete(const std::string &tableName, WsjcppSqlBuilder *builder)
385+
WsjcppSqlDelete::WsjcppSqlDelete(const std::string &tableName, SqlBuilder *builder)
384386
: WsjcppSqlQuery(WsjcppSqlQueryType::DELETE, builder, tableName) {
385387

386388
}
@@ -403,24 +405,24 @@ std::string WsjcppSqlDelete::sql() {
403405
};
404406

405407
// ---------------------------------------------------------------------
406-
// WsjcppSqlBuilder
408+
// SqlBuilder
407409

408-
WsjcppSqlBuilder::WsjcppSqlBuilder(WsjcppSqlBuilderForDatabase dbType) : m_dbType(dbType) {
410+
SqlBuilder::SqlBuilder(WsjcppSqlBuilderForDatabase dbType) : m_dbType(dbType) {
409411

410412
}
411413

412-
WsjcppSqlSelect &WsjcppSqlBuilder::selectFrom(const std::string &tableName) {
414+
WsjcppSqlSelect &SqlBuilder::selectFrom(const std::string &tableName) {
413415
m_queries.push_back(std::make_shared<WsjcppSqlSelect>(tableName, this));
414416
// TODO check must be select last one;
415417
return *(WsjcppSqlSelect *)(m_queries[m_queries.size() -1].get());
416418
}
417419

418-
WsjcppSqlInsert &WsjcppSqlBuilder::insertInto(const std::string &tableName) {
420+
WsjcppSqlInsert &SqlBuilder::insertInto(const std::string &tableName) {
419421
m_queries.push_back(std::make_shared<WsjcppSqlInsert>(tableName, this));
420422
return *(WsjcppSqlInsert *)(m_queries[m_queries.size() -1].get());
421423
}
422424

423-
WsjcppSqlInsert &WsjcppSqlBuilder::findInsertOrCreate(const std::string &tableName) {
425+
WsjcppSqlInsert &SqlBuilder::findInsertOrCreate(const std::string &tableName) {
424426
for (auto query : m_queries) {
425427
if (query->sqlType() == WsjcppSqlQueryType::INSERT && query->tableName() == tableName) {
426428
return *(WsjcppSqlInsert *)(query.get());
@@ -429,12 +431,12 @@ WsjcppSqlInsert &WsjcppSqlBuilder::findInsertOrCreate(const std::string &tableNa
429431
return insertInto(tableName);
430432
}
431433

432-
WsjcppSqlUpdate &WsjcppSqlBuilder::update(const std::string &tableName) {
434+
WsjcppSqlUpdate &SqlBuilder::update(const std::string &tableName) {
433435
m_queries.push_back(std::make_shared<WsjcppSqlUpdate>(tableName, this));
434436
return *(WsjcppSqlUpdate *)(m_queries[m_queries.size() -1].get());
435437
}
436438

437-
WsjcppSqlUpdate &WsjcppSqlBuilder::findUpdateOrCreate(const std::string &tableName) {
439+
WsjcppSqlUpdate &SqlBuilder::findUpdateOrCreate(const std::string &tableName) {
438440
for (auto query : m_queries) {
439441
if (query->sqlType() == WsjcppSqlQueryType::UPDATE && query->tableName() == tableName) {
440442
return *(WsjcppSqlUpdate *)(query.get());
@@ -443,12 +445,12 @@ WsjcppSqlUpdate &WsjcppSqlBuilder::findUpdateOrCreate(const std::string &tableNa
443445
return update(tableName);
444446
}
445447

446-
WsjcppSqlDelete &WsjcppSqlBuilder::deleteFrom(const std::string &tableName) {
448+
WsjcppSqlDelete &SqlBuilder::deleteFrom(const std::string &tableName) {
447449
m_queries.push_back(std::make_shared<WsjcppSqlDelete>(tableName, this));
448450
return *(WsjcppSqlDelete *)(m_queries[m_queries.size() -1].get());
449451
}
450452

451-
WsjcppSqlDelete &WsjcppSqlBuilder::findDeleteOrCreate(const std::string &tableName) {
453+
WsjcppSqlDelete &SqlBuilder::findDeleteOrCreate(const std::string &tableName) {
452454
for (auto query : m_queries) {
453455
if (query->sqlType() == WsjcppSqlQueryType::DELETE && query->tableName() == tableName) {
454456
return *(WsjcppSqlDelete *)(query.get());
@@ -457,19 +459,19 @@ WsjcppSqlDelete &WsjcppSqlBuilder::findDeleteOrCreate(const std::string &tableNa
457459
return deleteFrom(tableName);
458460
}
459461

460-
void WsjcppSqlBuilder::clear() {
462+
void SqlBuilder::clear() {
461463
m_queries.clear();
462464
}
463465

464-
bool WsjcppSqlBuilder::hasErrors() {
466+
bool SqlBuilder::hasErrors() {
465467
return m_errors.size() > 0;
466468
}
467469

468-
void WsjcppSqlBuilder::addError(const std::string &err) {
470+
void SqlBuilder::addError(const std::string &err) {
469471
m_errors.push_back(err);
470472
}
471473

472-
std::string WsjcppSqlBuilder::sql() {
474+
std::string SqlBuilder::sql() {
473475
std::string ret = "";
474476
for (auto query : m_queries) {
475477
if (ret.size() > 0) {
@@ -481,11 +483,12 @@ std::string WsjcppSqlBuilder::sql() {
481483
}
482484

483485

484-
void WsjcppSqlBuilder::setDatabaseType(WsjcppSqlBuilderForDatabase dbType) {
486+
void SqlBuilder::setDatabaseType(WsjcppSqlBuilderForDatabase dbType) {
485487
m_dbType = dbType;
486488
}
487489

488-
WsjcppSqlBuilderForDatabase WsjcppSqlBuilder::databaseType() {
490+
WsjcppSqlBuilderForDatabase SqlBuilder::databaseType() {
489491
return m_dbType;
490492
}
491493

494+
} // namespace wsjcpp

‎src/wsjcpp_sql_builder.h‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
#include <vector>
3333
#include <memory>
3434

35+
namespace wsjcpp {
36+
3537
enum class WsjcppSqlQueryType {
3638
SELECT,
3739
INSERT,
@@ -62,7 +64,7 @@ class WsjcppSqlBuilderHelpers {
6264
static std::string escapingStringValue(const std::string &sValue);
6365
};
6466

65-
class WsjcppSqlBuilder;
67+
class SqlBuilder;
6668
class WsjcppSqlQuery;
6769
class WsjcppSqlInsert;
6870
class WsjcppSqlUpdate;
@@ -91,17 +93,17 @@ class IWsjcppSqlBuilder {
9193

9294
class WsjcppSqlQuery {
9395
public:
94-
WsjcppSqlQuery(WsjcppSqlQueryType sqlType, WsjcppSqlBuilder *builder, const std::string &tableName);
96+
WsjcppSqlQuery(WsjcppSqlQueryType sqlType, SqlBuilder *builder, const std::string &tableName);
9597
WsjcppSqlQueryType sqlType();
96-
WsjcppSqlBuilder &builder();
97-
WsjcppSqlBuilder *builderRawPtr();
98+
SqlBuilder &builder();
99+
SqlBuilder *builderRawPtr();
98100
const std::string &tableName();
99101
virtual std::string sql() = 0;
100102

101103
private:
102104
WsjcppSqlQueryType m_sqlType;
103105
std::string m_tableName;
104-
WsjcppSqlBuilder *m_builder;
106+
SqlBuilder *m_builder;
105107
};
106108

107109
class WsjcppSqlWhereBase {
@@ -147,7 +149,7 @@ class WsjcppSqlSelect;
147149
template<class T>
148150
class WsjcppSqlWhere : public WsjcppSqlWhereBase {
149151
public:
150-
WsjcppSqlWhere(WsjcppSqlWhere<T> *parent, WsjcppSqlBuilder *builder, T *query)
152+
WsjcppSqlWhere(WsjcppSqlWhere<T> *parent, SqlBuilder *builder, T *query)
151153
: WsjcppSqlWhereBase(WsjcppSqlWhereType::SUB_CONDITION), m_parent(parent), m_builder(builder), m_query(query) { }
152154

153155
template <typename TVal>
@@ -259,15 +261,15 @@ class WsjcppSqlWhere : public WsjcppSqlWhereBase {
259261
((IWsjcppSqlBuilder *)m_builder)->addError(err);
260262
}
261263

262-
WsjcppSqlBuilder *m_builder;
264+
SqlBuilder *m_builder;
263265
T *m_query;
264266
WsjcppSqlWhere<T> *m_parent;
265267
std::vector<std::shared_ptr<WsjcppSqlWhereBase>> m_conditions;
266268
};
267269

268270
class WsjcppSqlSelect : public WsjcppSqlQuery {
269271
public:
270-
WsjcppSqlSelect(const std::string &tableName, WsjcppSqlBuilder *builder);
272+
WsjcppSqlSelect(const std::string &tableName, SqlBuilder *builder);
271273
WsjcppSqlSelect &colum(const std::string &col, const std::string &col_as = "");
272274

273275
WsjcppSqlWhere<WsjcppSqlSelect> &where();
@@ -284,7 +286,7 @@ class WsjcppSqlSelect : public WsjcppSqlQuery {
284286

285287
class WsjcppSqlInsert : public WsjcppSqlQuery {
286288
public:
287-
WsjcppSqlInsert(const std::string &tableName, WsjcppSqlBuilder *builder);
289+
WsjcppSqlInsert(const std::string &tableName, SqlBuilder *builder);
288290
WsjcppSqlInsert &colum(const std::string &col);
289291
WsjcppSqlInsert &addColums(const std::vector<std::string> &cols);
290292
WsjcppSqlInsert &clearValues();
@@ -303,7 +305,7 @@ class WsjcppSqlInsert : public WsjcppSqlQuery {
303305

304306
class WsjcppSqlUpdate : public WsjcppSqlQuery {
305307
public:
306-
WsjcppSqlUpdate(const std::string &tableName, WsjcppSqlBuilder *builder);
308+
WsjcppSqlUpdate(const std::string &tableName, SqlBuilder *builder);
307309

308310
WsjcppSqlUpdate &set(const std::string &name, const std::string &val);
309311
WsjcppSqlUpdate &set(const std::string &name, int val);
@@ -324,16 +326,16 @@ class WsjcppSqlUpdate : public WsjcppSqlQuery {
324326

325327
class WsjcppSqlDelete : public WsjcppSqlQuery {
326328
public:
327-
WsjcppSqlDelete(const std::string &tableName, WsjcppSqlBuilder *builder);
329+
WsjcppSqlDelete(const std::string &tableName, SqlBuilder *builder);
328330
WsjcppSqlWhere<WsjcppSqlDelete> &where();
329331
virtual std::string sql() override;
330332
private:
331333
std::shared_ptr<WsjcppSqlWhere<WsjcppSqlDelete>> m_where;
332334
};
333335

334-
class WsjcppSqlBuilder : public IWsjcppSqlBuilder {
336+
class SqlBuilder : public IWsjcppSqlBuilder {
335337
public:
336-
WsjcppSqlBuilder(WsjcppSqlBuilderForDatabase dbType = WsjcppSqlBuilderForDatabase::SQLITE3);
338+
SqlBuilder(WsjcppSqlBuilderForDatabase dbType = WsjcppSqlBuilderForDatabase::SQLITE3);
337339

338340
// TODO begin / end transaction can be added here
339341

@@ -364,4 +366,6 @@ class WsjcppSqlBuilder : public IWsjcppSqlBuilder {
364366
std::vector<std::string> m_errors;
365367
std::vector<std::shared_ptr<WsjcppSqlQuery>> m_queries;
366368
WsjcppSqlBuilderForDatabase m_dbType;
367-
};
369+
};
370+
371+
} // namespace wsjcpp

0 commit comments

Comments
 (0)