Skip to content

Commit

Permalink
changed comments formatting rule
Browse files Browse the repository at this point in the history
  • Loading branch information
fnc12 committed Dec 11, 2019
1 parent de7c9cd commit 363a0cd
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ PenaltyBreakTemplateDeclaration: 10
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 60
PointerAlignment: Right
ReflowComments: true
ReflowComments: false
SortIncludes: false
SortUsingDeclarations: true
SpaceAfterCStyleCast: false
Expand Down
9 changes: 7 additions & 2 deletions dev/conditions.h
Original file line number Diff line number Diff line change
Expand Up @@ -1241,8 +1241,13 @@ namespace sqlite_orm {
/**
* ORDER BY column1, column2
* Difference from `multi_order_by` is that `dynamic_order_by` can be changed at runtime using `push_back` member
* function Example: auto orderBy = dynamic_order_by(storage); if(someCondition) { orderBy.push_back(&User::id); }
* else { orderBy.push_back(&User::name); orderBy.push_back(&User::birthDate);
* function Example:
* auto orderBy = dynamic_order_by(storage);
* if(someCondition) {
* orderBy.push_back(&User::id);
* } else {
* orderBy.push_back(&User::name);
* orderBy.push_back(&User::birthDate);
* }
*/
template<class S>
Expand Down
2 changes: 1 addition & 1 deletion dev/storage_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ namespace sqlite_orm {
}

if(!gottaCreateTable) { // if all storage columns are equal to actual db columns but there are
// excess columns at the db..
// excess columns at the db..
if(dbTableInfo.size() > 0) {
// extra table columns than storage columns
if(!preserve) {
Expand Down
2 changes: 1 addition & 1 deletion examples/select.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ int main(int, char **) {
auto allEmployeesTuples = storage.select(asterisk<Employee>());
cout << "allEmployeesTuples count = " << allEmployeesTuples.size() << endl;
for(auto &row: allEmployeesTuples) { // row is std::tuple<int, std::string, int, std::unique_ptr<std::string>,
// std::unique_ptr<double>>
// std::unique_ptr<double>>
cout << std::get<0>(row) << '\t' << std::get<1>(row) << '\t' << std::get<2>(row) << '\t';
if(auto &value = std::get<3>(row)) {
cout << *value;
Expand Down
2 changes: 1 addition & 1 deletion include/sqlite_orm/sqlite_orm.h
Original file line number Diff line number Diff line change
Expand Up @@ -6398,7 +6398,7 @@ namespace sqlite_orm {
}

if(!gottaCreateTable) { // if all storage columns are equal to actual db columns but there are
// excess columns at the db..
// excess columns at the db..
if(dbTableInfo.size() > 0) {
// extra table columns than storage columns
if(!preserve) {
Expand Down

0 comments on commit 363a0cd

Please sign in to comment.