Merge pull request #667 from Weyzu/master

Ensure that CHECK's expressions are wrapped in parentheses
fnc12 · Feb 16, 2021 · 482c6dc · 482c6dc
2 parents afa22a8 + 6960914
commit 482c6dc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/dev/statement_serializator.h b/dev/statement_serializator.h
@@ -498,6 +498,9 @@ namespace sqlite_orm {
             std::string operator()(const statement_type &c, const C &context) const {
                 std::stringstream ss;
                 auto leftString = serialize(c.l, context);
+                if(context.use_parentheses) {
+                    ss << '(';
+                }
                 ss << leftString << " " << static_cast<std::string>(c) << " ( ";
                 for(size_t index = 0; index < c.arg.size(); ++index) {
                     auto &value = c.arg[index];
@@ -507,6 +510,9 @@ namespace sqlite_orm {
                     }
                 }
                 ss << " )";
+                if(context.use_parentheses) {
+                    ss << ')';
+                }
                 return ss.str();
             }
         };

diff --git a/include/sqlite_orm/sqlite_orm.h b/include/sqlite_orm/sqlite_orm.h
@@ -10048,6 +10048,9 @@ namespace sqlite_orm {
             std::string operator()(const statement_type &c, const C &context) const {
                 std::stringstream ss;
                 auto leftString = serialize(c.l, context);
+                if(context.use_parentheses) {
+                    ss << '(';
+                }
                 ss << leftString << " " << static_cast<std::string>(c) << " ( ";
                 for(size_t index = 0; index < c.arg.size(); ++index) {
                     auto &value = c.arg[index];
@@ -10057,6 +10060,9 @@ namespace sqlite_orm {
                     }
                 }
                 ss << " )";
+                if(context.use_parentheses) {
+                    ss << ')';
+                }
                 return ss.str();
             }
         };