added <<, >>, & and | bitwise operators

dev/column_result.h

@@ -112,6 +112,26 @@ namespace sqlite_orm {
             using type = double;
         };
 
+        template<class St, class L, class R>
+        struct column_result_t<St, bitwise_shift_left_t<L, R>, void> {
+            using type = int;
+        };
+
+        template<class St, class L, class R>
+        struct column_result_t<St, bitwise_shift_right_t<L, R>, void> {
+            using type = int;
+        };
+
+        template<class St, class L, class R>
+        struct column_result_t<St, bitwise_and_t<L, R>, void> {
+            using type = int;
+        };
+
+        template<class St, class L, class R>
+        struct column_result_t<St, bitwise_or_t<L, R>, void> {
+            using type = int;
+        };
+
         template<class St>
         struct column_result_t<St, rowid_t, void> {
             using type = int64;

dev/operators.h

@@ -94,12 +94,59 @@ namespace sqlite_orm {
         template<class L, class R>
         using mod_t = binary_operator<L, R, mod_string, arithmetic_t>;
 
+        struct bitwise_shift_left_string {
+            operator std::string() const {
+                return "<<";
+            }
+        };
+
+        /**
+     * Result of bitwise shift left << operator
+     */
+        template<class L, class R>
+        using bitwise_shift_left_t = binary_operator<L, R, bitwise_shift_left_string, arithmetic_t>;
+
+        struct bitwise_shift_right_string {
+            operator std::string() const {
+                return ">>";
+            }
+        };
+
+        /**
+     * Result of bitwise shift right >> operator
+     */
+        template<class L, class R>
+        using bitwise_shift_right_t = binary_operator<L, R, bitwise_shift_right_string, arithmetic_t>;
+
+        struct bitwise_and_string {
+            operator std::string() const {
+                return "&";
+            }
+        };
+
+        /**
+     * Result of bitwise and & operator
+     */
+        template<class L, class R>
+        using bitwise_and_t = binary_operator<L, R, bitwise_and_string, arithmetic_t>;
+
+        struct bitwise_or_string {
+            operator std::string() const {
+                return "|";
+            }
+        };
+
+        /**
+     * Result of bitwise or | operator
+     */
+        template<class L, class R>
+        using bitwise_or_t = binary_operator<L, R, bitwise_or_string, arithmetic_t>;
+
         struct assign_string {
             operator std::string() const {
                 return "=";
             }
         };
-
         /**
          *  Result of assign = operator
          */
@@ -188,6 +235,26 @@ namespace sqlite_orm {
         return {std::move(l), std::move(r)};
     }
 
+    template<class L, class R>
+    internal::bitwise_shift_left_t<L, R> bitwise_shift_left(L l, R r) {
+        return {std::move(l), std::move(r)};
+    }
+
+    template<class L, class R>
+    internal::bitwise_shift_right_t<L, R> bitwise_shift_right(L l, R r) {
+        return {std::move(l), std::move(r)};
+    }
+
+    template<class L, class R>
+    internal::bitwise_and_t<L, R> bitwise_and(L l, R r) {
+        return {std::move(l), std::move(r)};
+    }
+
+    template<class L, class R>
+    internal::bitwise_or_t<L, R> bitwise_or(L l, R r) {
+        return {std::move(l), std::move(r)};
+    }
+
     template<class L, class R>
     internal::assign_t<L, R> assign(L l, R r) {
         return {std::move(l), std::move(r)};

include/sqlite_orm/sqlite_orm.h

@@ -1143,12 +1143,59 @@ namespace sqlite_orm {
         template<class L, class R>
         using mod_t = binary_operator<L, R, mod_string, arithmetic_t>;
 
+        struct bitwise_shift_left_string {
+            operator std::string() const {
+                return "<<";
+            }
+        };
+
+        /**
+     * Result of bitwise shift left << operator
+     */
+        template<class L, class R>
+        using bitwise_shift_left_t = binary_operator<L, R, bitwise_shift_left_string, arithmetic_t>;
+
+        struct bitwise_shift_right_string {
+            operator std::string() const {
+                return ">>";
+            }
+        };
+
+        /**
+     * Result of bitwise shift right >> operator
+     */
+        template<class L, class R>
+        using bitwise_shift_right_t = binary_operator<L, R, bitwise_shift_right_string, arithmetic_t>;
+
+        struct bitwise_and_string {
+            operator std::string() const {
+                return "&";
+            }
+        };
+
+        /**
+     * Result of bitwise and & operator
+     */
+        template<class L, class R>
+        using bitwise_and_t = binary_operator<L, R, bitwise_and_string, arithmetic_t>;
+
+        struct bitwise_or_string {
+            operator std::string() const {
+                return "|";
+            }
+        };
+
+        /**
+     * Result of bitwise or | operator
+     */
+        template<class L, class R>
+        using bitwise_or_t = binary_operator<L, R, bitwise_or_string, arithmetic_t>;
+
         struct assign_string {
             operator std::string() const {
                 return "=";
             }
         };
-
         /**
          *  Result of assign = operator
          */
@@ -1237,6 +1284,26 @@ namespace sqlite_orm {
         return {std::move(l), std::move(r)};
     }
 
+    template<class L, class R>
+    internal::bitwise_shift_left_t<L, R> bitwise_shift_left(L l, R r) {
+        return {std::move(l), std::move(r)};
+    }
+
+    template<class L, class R>
+    internal::bitwise_shift_right_t<L, R> bitwise_shift_right(L l, R r) {
+        return {std::move(l), std::move(r)};
+    }
+
+    template<class L, class R>
+    internal::bitwise_and_t<L, R> bitwise_and(L l, R r) {
+        return {std::move(l), std::move(r)};
+    }
+
+    template<class L, class R>
+    internal::bitwise_or_t<L, R> bitwise_or(L l, R r) {
+        return {std::move(l), std::move(r)};
+    }
+
     template<class L, class R>
     internal::assign_t<L, R> assign(L l, R r) {
         return {std::move(l), std::move(r)};
@@ -5684,6 +5751,26 @@ namespace sqlite_orm {
             using type = double;
         };
 
+        template<class St, class L, class R>
+        struct column_result_t<St, bitwise_shift_left_t<L, R>, void> {
+            using type = int;
+        };
+
+        template<class St, class L, class R>
+        struct column_result_t<St, bitwise_shift_right_t<L, R>, void> {
+            using type = int;
+        };
+
+        template<class St, class L, class R>
+        struct column_result_t<St, bitwise_and_t<L, R>, void> {
+            using type = int;
+        };
+
+        template<class St, class L, class R>
+        struct column_result_t<St, bitwise_or_t<L, R>, void> {
+            using type = int;
+        };
+
         template<class St>
         struct column_result_t<St, rowid_t, void> {
             using type = int64;

tests/CMakeLists.txt

@@ -10,7 +10,7 @@ else()
     add_subdirectory(third_party/sqlite)
 endif()
 
-add_executable(unit_tests tests.cpp tests2.cpp tests3.cpp tests4.cpp tests5.cpp private_getters_tests.cpp pragma_tests.cpp explicit_columns.cpp core_functions_tests.cpp constraints/composite_key.cpp static_tests.cpp operators/arithmetic_operators.cpp operators/like.cpp operators/glob.cpp operators/in.cpp operators/cast.cpp operators/is_null.cpp operators/not_operator.cpp dynamic_order_by.cpp prepared_statement_tests/select.cpp prepared_statement_tests/get_all.cpp prepared_statement_tests/get_all_pointer.cpp prepared_statement_tests/get_all_optional.cpp prepared_statement_tests/update_all.cpp prepared_statement_tests/remove_all.cpp prepared_statement_tests/get.cpp prepared_statement_tests/get_pointer.cpp prepared_statement_tests/get_optional.cpp prepared_statement_tests/update.cpp prepared_statement_tests/remove.cpp prepared_statement_tests/insert.cpp prepared_statement_tests/replace.cpp prepared_statement_tests/insert_range.cpp prepared_statement_tests/replace_range.cpp prepared_statement_tests/insert_explicit.cpp pragma_tests.cpp simple_query.cpp static_tests/is_bindable.cpp static_tests/arithmetic_operators_result_type.cpp static_tests/tuple_conc.cpp static_tests/node_tuple.cpp static_tests/bindable_filter.cpp static_tests/count_tuple.cpp static_tests/member_traits_tests.cpp static_tests/select_return_type.cpp constraints/default.cpp constraints/foreign_key.cpp constraints/check.cpp table_tests.cpp statement_serializator_tests/primary_key.cpp statement_serializator_tests/column_names.cpp statement_serializator_tests/autoincrement.cpp statement_serializator_tests/arithmetic_operators.cpp statement_serializator_tests/core_functions.cpp statement_serializator_tests/comparison_operators.cpp statement_serializator_tests/unique.cpp statement_serializator_tests/foreign_key.cpp statement_serializator_tests/collate.cpp statement_serializator_tests/check.cpp unique_cases/get_all_with_two_tables.cpp unique_cases/prepare_get_all_with_case.cpp)
+add_executable(unit_tests tests.cpp tests2.cpp tests3.cpp tests4.cpp tests5.cpp private_getters_tests.cpp pragma_tests.cpp explicit_columns.cpp core_functions_tests.cpp constraints/composite_key.cpp static_tests.cpp operators/arithmetic_operators.cpp operators/like.cpp operators/glob.cpp operators/in.cpp operators/cast.cpp operators/is_null.cpp operators/not_operator.cpp operators/bitwise.cpp dynamic_order_by.cpp prepared_statement_tests/select.cpp prepared_statement_tests/get_all.cpp prepared_statement_tests/get_all_pointer.cpp prepared_statement_tests/get_all_optional.cpp prepared_statement_tests/update_all.cpp prepared_statement_tests/remove_all.cpp prepared_statement_tests/get.cpp prepared_statement_tests/get_pointer.cpp prepared_statement_tests/get_optional.cpp prepared_statement_tests/update.cpp prepared_statement_tests/remove.cpp prepared_statement_tests/insert.cpp prepared_statement_tests/replace.cpp prepared_statement_tests/insert_range.cpp prepared_statement_tests/replace_range.cpp prepared_statement_tests/insert_explicit.cpp pragma_tests.cpp simple_query.cpp static_tests/is_bindable.cpp static_tests/arithmetic_operators_result_type.cpp static_tests/tuple_conc.cpp static_tests/node_tuple.cpp static_tests/bindable_filter.cpp static_tests/count_tuple.cpp static_tests/member_traits_tests.cpp static_tests/select_return_type.cpp constraints/default.cpp constraints/foreign_key.cpp constraints/check.cpp table_tests.cpp statement_serializator_tests/primary_key.cpp statement_serializator_tests/column_names.cpp statement_serializator_tests/autoincrement.cpp statement_serializator_tests/arithmetic_operators.cpp statement_serializator_tests/core_functions.cpp statement_serializator_tests/comparison_operators.cpp statement_serializator_tests/unique.cpp statement_serializator_tests/foreign_key.cpp statement_serializator_tests/collate.cpp statement_serializator_tests/check.cpp unique_cases/get_all_with_two_tables.cpp unique_cases/prepare_get_all_with_case.cpp)
 
 
 if(SQLITE_ORM_OMITS_CODECVT)

tests/operators/bitwise.cpp

@@ -0,0 +1,50 @@
+#include <sqlite_orm/sqlite_orm.h>
+#include <catch2/catch.hpp>
+
+using namespace sqlite_orm;
+
+TEST_CASE("bitwise operators") {
+    struct Entry {
+        int lhs = 0;
+        int rhs = 0;
+    };
+    auto storage =
+        make_storage({}, make_table("entries", make_column("lhs", &Entry::lhs), make_column("rhs", &Entry::rhs)));
+    storage.sync_schema();
+
+    {
+        auto rows = storage.select(bitwise_or(60, 13));
+        REQUIRE(rows == std::vector<int>{61});
+    }
+    {
+        auto rows = storage.select(bitwise_and(60, 13));
+        REQUIRE(rows == std::vector<int>{12});
+    }
+    {
+        auto rows = storage.select(bitwise_shift_left(60, 2));
+        REQUIRE(rows == std::vector<int>{240});
+    }
+    {
+        auto rows = storage.select(bitwise_shift_right(60, 2));
+        REQUIRE(rows == std::vector<int>{15});
+    }
+    storage.insert(Entry{60, 13});
+    {
+        auto rows = storage.select(bitwise_or(&Entry::lhs, &Entry::rhs));
+        REQUIRE(rows == std::vector<int>{61});
+    }
+    {
+        auto rows = storage.select(bitwise_and(&Entry::lhs, &Entry::rhs));
+        REQUIRE(rows == std::vector<int>{12});
+    }
+    storage.remove_all<Entry>();
+    storage.insert(Entry{60, 2});
+    {
+        auto rows = storage.select(bitwise_shift_left(&Entry::lhs, &Entry::rhs));
+        REQUIRE(rows == std::vector<int>{240});
+    }
+    {
+        auto rows = storage.select(bitwise_shift_right(&Entry::lhs, &Entry::rhs));
+        REQUIRE(rows == std::vector<int>{15});
+    }
+}