more fixes for reg-ex constraints

Author: rpiazza

stix2/datastore/relational_db/database_backends/database_backend_base.py

@@ -1,6 +1,6 @@
 from typing import Any
 
-from sqlalchemy import Boolean, Float, Integer, Text, create_engine
+from sqlalchemy import Boolean, Float, Integer, String, Text, create_engine
 from sqlalchemy_utils import create_database, database_exists, drop_database
 
 from stix2.base import (
@@ -88,7 +88,7 @@ def determine_sql_type_for_integer_property():  # noqa: F811
 
     @staticmethod
     def determine_sql_type_for_reference_property():  # noqa: F811
-        return Text
+        return String(255)
 
     @staticmethod
     def determine_sql_type_for_string_property():  # noqa: F811
@@ -100,7 +100,7 @@ def determine_sql_type_for_key_as_int():  # noqa: F811
 
     @staticmethod
     def determine_sql_type_for_key_as_id():  # noqa: F811
-        return Text
+        return String(255)
 
     # =========================================================================
     # Other methods

stix2/datastore/relational_db/database_backends/postgres_backend.py

@@ -63,6 +63,18 @@ def determine_sql_type_for_hex_property():  # noqa: F811
         # return LargeBinary
         return PostgresBackend.determine_sql_type_for_string_property()
 
+    @staticmethod
+    def determine_sql_type_for_reference_property():  # noqa: F811
+        return Text
+
+    @staticmethod
+    def determine_sql_type_for_string_property():  # noqa: F811
+        return Text
+
+    @staticmethod
+    def determine_sql_type_for_key_as_id():  # noqa: F811
+        return Text
+
     @staticmethod
     def determine_sql_type_for_timestamp_property():  # noqa: F811
         return TIMESTAMP(timezone=True)

stix2/datastore/relational_db/relational_db_testing.py

@@ -288,8 +288,8 @@ def test_dictionary():
 
 def main():
     store = RelationalDBStore(
-        #PostgresBackend("postgresql://localhost/stix-data-sink", force_recreate=True),
-        SQLiteBackend("sqlite:///stix-data-sink.db", force_recreate=True),
+        PostgresBackend("postgresql://localhost/stix-data-sink", force_recreate=True),
+        #SQLiteBackend("sqlite:///stix-data-sink.db", force_recreate=True),
         True,
         None,
         True,

stix2/datastore/relational_db/table_creation.py

@@ -162,7 +162,7 @@ def create_kill_chain_phases_table(name, metadata, db_backend, schema_name, tabl
 def create_granular_markings_table(metadata, db_backend, sco_or_sdo):
     schema_name = db_backend.schema_for_core()
     tables = list()
-    reg_ex = f"'^marking-definition--[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$'" # noqa: E131
+    reg_ex = "'^marking-definition--[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$'" # noqa: E131
     columns = [
         Column(
             "id",