Merge pull request fnc12#873 from fnc12/version-1.7-fix

fnc12 · web-flow · commit fdcc1da46fbd · 2021-12-26T21:18:45.000+03:00
Version 1.7 fix
diff --git a/dev/prepared_statement.h b/dev/prepared_statement.h
@@ -308,6 +308,9 @@ namespace sqlite_orm {
 
         template<class T>
         using is_insert_constraint = std::is_same<insert_constraint, T>;
+
+        template<class T>
+        struct is_upsert_clause;
     }
 
     inline internal::insert_constraint or_rollback() {
diff --git a/include/sqlite_orm/sqlite_orm.h b/include/sqlite_orm/sqlite_orm.h
@@ -10037,6 +10037,9 @@ namespace sqlite_orm {
 
         template<class T>
         using is_insert_constraint = std::is_same<insert_constraint, T>;
+
+        template<class T>
+        struct is_upsert_clause;
     }
 
     inline internal::insert_constraint or_rollback() {

Original file line number	Diff line number	Diff line change
`@@ -308,6 +308,9 @@ namespace sqlite_orm {`
`308`	`308`
`309`	`309`	`template<class T>`
`310`	`310`	`using is_insert_constraint = std::is_same<insert_constraint, T>;`
	`311`	`+`
	`312`	`+ template<class T>`
	`313`	`+ struct is_upsert_clause;`
`311`	`314`	`}`
`312`	`315`
`313`	`316`	`inline internal::insert_constraint or_rollback() {`
Original file line number	Diff line number	Diff line change
`@@ -10037,6 +10037,9 @@ namespace sqlite_orm {`
`10037`	`10037`
`10038`	`10038`	`template<class T>`
`10039`	`10039`	`using is_insert_constraint = std::is_same<insert_constraint, T>;`
	`10040`	`+`
	`10041`	`+ template<class T>`
	`10042`	`+ struct is_upsert_clause;`
`10040`	`10043`	`}`
`10041`	`10044`
`10042`	`10045`	`inline internal::insert_constraint or_rollback() {`