Fix integer constraint

.github/workflows/python-ci-tests.yml

@@ -6,15 +6,15 @@ on: [push, pull_request]
 env:
   POSTGRES_USER: postgres
   POSTGRES_PASSWORD: postgres
-  POSTGRES_DB: postgres
+  POSTGRES_DB: stix
 
 jobs:
   test-job:
     runs-on: ubuntu-latest
 
     services:
       postgres:
-        image: postgres:11
+        image: postgres
         # Provide the password for postgres
         env:
           POSTGRES_USER: postgres
@@ -34,9 +34,9 @@ jobs:
 
     name: Python ${{ matrix.python-version }} Build
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4.2.2
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5.4.0
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install and update essential dependencies
@@ -48,7 +48,7 @@ jobs:
       run: |
         tox
     - name: Upload coverage information to Codecov
-      uses: codecov/codecov-action@v4.2.0
+      uses: codecov/codecov-action@v5.4.0
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         fail_ci_if_error: false # optional (default = false)

stix2/datastore/relational_db/database_backends/database_backend_base.py

@@ -71,6 +71,9 @@ def determine_sql_type_for_hex_property():  # noqa: F811
     def determine_sql_type_for_timestamp_property():  # noqa: F811
         pass
 
+    def create_regex_constraint_clause(self, column_name, pattern):
+        pass
+
     # ------------------------------------------------------------------
     # Common SQL types for STIX property classes
 
@@ -127,6 +130,20 @@ def array_allowed():
     def create_regex_constraint_expression(self, column_name, pattern):
         return CheckConstraint(self.create_regex_constraint_clause(column_name, pattern))
 
+    @staticmethod
+    def check_for_none(val):
+        return val is None
+
+    def create_min_max_constraint_expression(self, int_property, column_name):
+        if not self.check_for_none(int_property.min) and not self.check_for_none(int_property.max):
+            return CheckConstraint(f"{column_name} >= {int_property.min} and {column_name} <= {int_property.max}")
+        elif not self.check_for_none(int_property.min):
+            return CheckConstraint(f"{column_name} >= {int_property.min}")
+        elif not self.check_for_none(int_property.max):
+            return CheckConstraint(f"{column_name} <= {int_property.max}")
+        else:
+            return None
+
     def create_regex_constraint_and_expression(self, clause1, clause2):
         return (
             CheckConstraint(
@@ -139,7 +156,9 @@ def process_value_for_insert(self, stix_type, value):
         sql_type = stix_type.determine_sql_type(self)
         if sql_type == self.determine_sql_type_for_timestamp_property() and isinstance(value, STIXdatetime):
             return value.strftime("%Y-%m-%dT%H:%M:%S.%fZ")
-        elif sql_type == self.determine_sql_type_for_hex_property() and isinstance(stix_type, HexProperty):
+        elif sql_type == self.determine_sql_type_for_hex_property() and isinstance(stix_type, HexProperty) and \
+                sql_type is not Text:
+            # make sure it isn't represented as Text
             return bytes.fromhex(value)
         else:
             return value

stix2/datastore/relational_db/input_creation.py

@@ -69,7 +69,6 @@ def generate_insert_for_dictionary_list(table, next_id, value):
 
 @add_method(DictionaryProperty)
 def generate_insert_information(self, dictionary_name, stix_object, **kwargs):  # noqa: F811
-    bindings = dict()
     data_sink = kwargs.get("data_sink")
     table_name = kwargs.get("table_name")
     schema_name = kwargs.get("schema_name")
@@ -103,23 +102,37 @@ def generate_insert_information(self, dictionary_name, stix_object, **kwargs):
                     ]
                     child_table_inserts = generate_insert_for_dictionary_list(table_child, next_id, value)
                     value = next_id
+                    stix_type = IntegerProperty()
+                else:
+                    contained_type = valid_types[0].contained
+                    stix_type = ListProperty(contained_type)
+                    value = [data_sink.db_backend.process_value_for_insert(contained_type, x) for x in value]
             else:
                 value_binding = "value"
+                stix_type = StringProperty()
         elif isinstance(value, int) and is_valid_type(IntegerProperty, valid_types):
             value_binding = "integer_value"
+            stix_type = IntegerProperty()
         elif isinstance(value, str) and is_valid_type(StringProperty, valid_types):
             value_binding = "string_value"
+            stix_type = StringProperty()
         elif isinstance(value, bool) and is_valid_type(BooleanProperty, valid_types):
             value_binding = "boolean_value"
+            stix_type = BooleanProperty()
         elif isinstance(value, float) and is_valid_type(FloatProperty, valid_types):
             value_binding = "float_value"
+            stix_type = FloatProperty()
         elif isinstance(value, STIXdatetime) and is_valid_type(TimestampProperty, valid_types):
             value_binding = "timestamp_value"
+            stix_type = TimestampProperty()
         else:
             value_binding = "string_value"
+            stix_type = StringProperty()
 
         bindings["name"] = name
-        bindings[value_binding] = value
+        bindings[value_binding] = data_sink.db_backend.process_value_for_insert(stix_type, value)
+
+
 
         insert_statements.append(insert(table).values(bindings))
 
@@ -285,11 +298,7 @@ def generate_insert_information(   # noqa: F811
         return insert_statements
     else:
         if db_backend.array_allowed():
-            if isinstance(self.contained, HexProperty):
-                return {name: [data_sink.db_backend.process_value_for_insert(self.contained, x) for x in stix_object[name]]}
-            else:
-                return {name: stix_object[name]}
-
+            return {name: [data_sink.db_backend.process_value_for_insert(self.contained, x) for x in stix_object[name]]}
         else:
             insert_statements = list()
             table = data_sink.tables_dictionary[