iceaxe 0.7.2__tar.gz → 0.8.0__tar.gz

{iceaxe-0.7.2/iceaxe.egg-info → iceaxe-0.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iceaxe
-Version: 0.7.2
+Version: 0.8.0
 Summary: A modern, fast ORM for Python.
 Author-email: Pierce Freeman <pierce@freeman.vc>
 Requires-Python: >=3.11

{iceaxe-0.7.2 → iceaxe-0.8.0}/iceaxe/__tests__/schemas/test_actions.py

@@ -262,6 +262,7 @@ async def test_add_column_any_type(
         (ColumnType.DECIMAL, ColumnType.NUMERIC),
         (ColumnType.SERIAL, ColumnType.INTEGER),
         (ColumnType.BIGSERIAL, ColumnType.BIGINT),
+        (ColumnType.SMALLSERIAL, ColumnType.SMALLINT),
         (ColumnType.CHAR, "character"),
         (ColumnType.TIME_WITHOUT_TIME_ZONE, "time without time zone"),
         (ColumnType.TIMESTAMP_WITHOUT_TIME_ZONE, "timestamp without time zone"),

{iceaxe-0.7.2 → iceaxe-0.8.0}/iceaxe/__tests__/schemas/test_db_memory_serializer.py

@@ -1523,3 +1523,49 @@ def test_multiple_primary_keys_warning():
         assert "multiple fields marked as primary_key=True" in warning_message
         assert "composite primary key constraint" in warning_message
         assert "Consider using only one primary key field" in warning_message
+
+
+def test_explicit_type_override(clear_all_database_objects):
+    """
+    Test that explicit_type parameter overrides automatic type inference.
+    """
+
+    class TestModel(TableBase):
+        id: int = Field(primary_key=True)
+        # This should be BIGINT instead of INTEGER due to explicit_type
+        big_number: int = Field(explicit_type=ColumnType.BIGINT)
+        # This should be TEXT instead of VARCHAR due to explicit_type
+        long_text: str = Field(explicit_type=ColumnType.TEXT)
+        # This should be JSONB instead of JSON due to explicit_type
+        data: dict = Field(is_json=True, explicit_type=ColumnType.JSONB)
+        # Normal field without explicit_type for comparison
+        normal_field: str = Field()
+
+    migrator = DatabaseMemorySerializer()
+    db_objects = list(migrator.delegate([TestModel]))
+
+    # Extract column definitions
+    columns = [obj for obj, _ in db_objects if isinstance(obj, DBColumn)]
+
+    # Find each column and verify the type
+    big_number_column = next(c for c in columns if c.column_name == "big_number")
+    assert big_number_column.column_type == ColumnType.BIGINT
+    assert not big_number_column.nullable
+
+    long_text_column = next(c for c in columns if c.column_name == "long_text")
+    assert long_text_column.column_type == ColumnType.TEXT
+    assert not long_text_column.nullable
+
+    data_column = next(c for c in columns if c.column_name == "data")
+    assert data_column.column_type == ColumnType.JSONB
+    assert not data_column.nullable
+
+    # Verify normal field still uses automatic inference
+    normal_field_column = next(c for c in columns if c.column_name == "normal_field")
+    assert normal_field_column.column_type == ColumnType.VARCHAR
+    assert not normal_field_column.nullable
+
+    # Verify the id field uses automatic inference (INTEGER)
+    id_column = next(c for c in columns if c.column_name == "id")
+    assert id_column.column_type == ColumnType.INTEGER
+    assert not id_column.nullable

{iceaxe-0.7.2 → iceaxe-0.8.0}/iceaxe/base.py

@@ -76,6 +76,7 @@ class DBModelMetaclass(_model_construction.ModelMetaclass):
                     index=False,
                     check_expression=None,
                     is_json=False,
+                    explicit_type=None,
                 )
                 for field, info in cls.model_fields.items()
             }

{iceaxe-0.7.2 → iceaxe-0.8.0}/iceaxe/field.py

@@ -19,6 +19,7 @@ from pydantic_core import PydanticUndefined
 from iceaxe.comparison import ComparisonBase
 from iceaxe.postgres import PostgresFieldBase
 from iceaxe.queries_str import QueryIdentifier, QueryLiteral
+from iceaxe.sql_types import ColumnType
 
 if TYPE_CHECKING:
     from iceaxe.base import TableBase
@@ -37,6 +38,7 @@ class DBFieldInputs(_FieldInfoInputs, total=False):
     index: bool
     check_expression: str | None
     is_json: bool
+    explicit_type: ColumnType | None
 
 
 class DBFieldInfo(FieldInfo):
@@ -97,6 +99,12 @@ class DBFieldInfo(FieldInfo):
     When True, the field's value will be JSON serialized before storage.
     """
 
+    explicit_type: ColumnType | None = None
+    """
+    Explicitly specify the SQL column type for this field.
+    When set, this type takes precedence over automatic type inference.
+    """
+
     def __init__(self, **kwargs: Unpack[DBFieldInputs]):
         """
         Initialize a new DBFieldInfo instance with the given field configuration.
@@ -119,6 +127,7 @@ class DBFieldInfo(FieldInfo):
         self.index = kwargs.pop("index", False)
         self.check_expression = kwargs.pop("check_expression", None)
         self.is_json = kwargs.pop("is_json", False)
+        self.explicit_type = kwargs.pop("explicit_type", None)
 
     @classmethod
     def extend_field(
@@ -131,6 +140,7 @@ class DBFieldInfo(FieldInfo):
         index: bool,
         check_expression: str | None,
         is_json: bool,
+        explicit_type: ColumnType | None,
     ):
         """
         Helper function to extend a Pydantic FieldInfo with database-specific attributes.
@@ -144,6 +154,7 @@ class DBFieldInfo(FieldInfo):
             index=index,
             check_expression=check_expression,
             is_json=is_json,
+            explicit_type=explicit_type,
             **field._attributes_set,  # type: ignore
         )
 
@@ -168,6 +179,7 @@ def __get_db_field(_: Callable[Concatenate[Any, P], Any] = PydanticField):  # ty
         index: bool = False,
         check_expression: str | None = None,
         is_json: bool = False,
+        explicit_type: ColumnType | None = None,
         default: Any = _Unset,
         default_factory: (
             Callable[[], Any] | Callable[[dict[str, Any]], Any] | None
@@ -192,6 +204,7 @@ def __get_db_field(_: Callable[Concatenate[Any, P], Any] = PydanticField):  # ty
                 index=index,
                 check_expression=check_expression,
                 is_json=is_json,
+                explicit_type=explicit_type,
             ),
         )
 

{iceaxe-0.7.2 → iceaxe-0.8.0}/iceaxe/schemas/db_memory_serializer.py

@@ -415,6 +415,12 @@ class DatabaseHandler:
         if info.annotation is None:
             raise ValueError(f"Annotation must be provided for {table.__name__}.{key}")
 
+        # If explicit_type is provided, use it directly as the preferred type
+        if info.explicit_type is not None:
+            return TypeDeclarationResponse(
+                primitive_type=info.explicit_type,
+            )
+
         annotation = remove_null_type(info.annotation)
 
         # Resolve the type of the column, if generic

{iceaxe-0.7.2 → iceaxe-0.8.0}/iceaxe/schemas/db_stubs.py

@@ -253,6 +253,10 @@ class DBColumn(DBColumnBase, DBObject["DBColumn"]):
         if isinstance(self.column_type, ColumnType):
             if self.column_type == ColumnType.INTEGER and self.autoincrement:
                 explicit_data_type = ColumnType.SERIAL
+            elif self.column_type == ColumnType.BIGINT and self.autoincrement:
+                explicit_data_type = ColumnType.BIGSERIAL
+            elif self.column_type == ColumnType.SMALLINT and self.autoincrement:
+                explicit_data_type = ColumnType.SMALLSERIAL
             else:
                 explicit_data_type = self.column_type
 

{iceaxe-0.7.2 → iceaxe-0.8.0}/iceaxe/session_optimized.c

@@ -1,4 +1,4 @@
-/* Generated by Cython 3.1.2 */
+/* Generated by Cython 3.1.3 */
 
 /* BEGIN: Cython Metadata
 {
@@ -27,8 +27,8 @@ END: Cython Metadata */
 #elif PY_VERSION_HEX < 0x03080000
     #error Cython requires Python 3.8+.
 #else
-#define __PYX_ABI_VERSION "3_1_2"
-#define CYTHON_HEX_VERSION 0x030102F0
+#define __PYX_ABI_VERSION "3_1_3"
+#define CYTHON_HEX_VERSION 0x030103F0
 #define CYTHON_FUTURE_DIVISION 1
 /* CModulePreamble */
 #include <stddef.h>
@@ -391,6 +391,9 @@ END: Cython Metadata */
     enum { __pyx_check_sizeof_voidp = 1 / (int)(SIZEOF_VOID_P == sizeof(void*)) };
   #endif
 #endif
+#ifndef CYTHON_LOCK_AND_GIL_DEADLOCK_AVOIDANCE_TIME
+  #define CYTHON_LOCK_AND_GIL_DEADLOCK_AVOIDANCE_TIME 100
+#endif
 #ifndef __has_attribute
   #define __has_attribute(x) 0
 #endif
@@ -2084,22 +2087,22 @@ static void __Pyx_RaiseArgtupleInvalid(const char* func_name, int exact,
 static int __Pyx__ArgTypeTest(PyObject *obj, PyTypeObject *type, const char *name, int exact);
 
 /* TypeImport.proto */
-#ifndef __PYX_HAVE_RT_ImportType_proto_3_1_2
-#define __PYX_HAVE_RT_ImportType_proto_3_1_2
+#ifndef __PYX_HAVE_RT_ImportType_proto_3_1_3
+#define __PYX_HAVE_RT_ImportType_proto_3_1_3
 #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
 #include <stdalign.h>
 #endif
 #if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) || __cplusplus >= 201103L
-#define __PYX_GET_STRUCT_ALIGNMENT_3_1_2(s) alignof(s)
+#define __PYX_GET_STRUCT_ALIGNMENT_3_1_3(s) alignof(s)
 #else
-#define __PYX_GET_STRUCT_ALIGNMENT_3_1_2(s) sizeof(void*)
+#define __PYX_GET_STRUCT_ALIGNMENT_3_1_3(s) sizeof(void*)
 #endif
-enum __Pyx_ImportType_CheckSize_3_1_2 {
-   __Pyx_ImportType_CheckSize_Error_3_1_2 = 0,
-   __Pyx_ImportType_CheckSize_Warn_3_1_2 = 1,
-   __Pyx_ImportType_CheckSize_Ignore_3_1_2 = 2
+enum __Pyx_ImportType_CheckSize_3_1_3 {
+   __Pyx_ImportType_CheckSize_Error_3_1_3 = 0,
+   __Pyx_ImportType_CheckSize_Warn_3_1_3 = 1,
+   __Pyx_ImportType_CheckSize_Ignore_3_1_3 = 2
 };
-static PyTypeObject *__Pyx_ImportType_3_1_2(PyObject* module, const char *module_name, const char *class_name, size_t size, size_t alignment, enum __Pyx_ImportType_CheckSize_3_1_2 check_size);
+static PyTypeObject *__Pyx_ImportType_3_1_3(PyObject* module, const char *module_name, const char *class_name, size_t size, size_t alignment, enum __Pyx_ImportType_CheckSize_3_1_3 check_size);
 #endif
 
 /* ListPack.proto */
@@ -5448,15 +5451,15 @@ static int __Pyx_modinit_type_import_code(__pyx_mstatetype *__pyx_mstate) {
   /*--- Type import code ---*/
   __pyx_t_1 = PyImport_ImportModule(__Pyx_BUILTIN_MODULE_NAME); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 9, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_mstate->__pyx_ptype_7cpython_4type_type = __Pyx_ImportType_3_1_2(__pyx_t_1, __Pyx_BUILTIN_MODULE_NAME, "type",
+  __pyx_mstate->__pyx_ptype_7cpython_4type_type = __Pyx_ImportType_3_1_3(__pyx_t_1, __Pyx_BUILTIN_MODULE_NAME, "type",
   #if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x050B0000
-  sizeof(PyTypeObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyTypeObject),
+  sizeof(PyTypeObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_3(PyTypeObject),
   #elif CYTHON_COMPILING_IN_LIMITED_API
   0, 0,
   #else
-  sizeof(PyHeapTypeObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyHeapTypeObject),
+  sizeof(PyHeapTypeObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_3(PyHeapTypeObject),
   #endif
-  __Pyx_ImportType_CheckSize_Warn_3_1_2); if (!__pyx_mstate->__pyx_ptype_7cpython_4type_type) __PYX_ERR(1, 9, __pyx_L1_error)
+  __Pyx_ImportType_CheckSize_Warn_3_1_3); if (!__pyx_mstate->__pyx_ptype_7cpython_4type_type) __PYX_ERR(1, 9, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __Pyx_RefNannyFinishContext();
   return 0;
@@ -6881,6 +6884,13 @@ try_unpack:
 
 /* PyObjectCallMethod0 */
 static PyObject* __Pyx_PyObject_CallMethod0(PyObject* obj, PyObject* method_name) {
+#if CYTHON_VECTORCALL && (__PYX_LIMITED_VERSION_HEX >= 0x030C0000 || (!CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX >= 0x03090000))
+    PyObject *args[1] = {obj};
+    (void) __Pyx_PyObject_GetMethod;
+    (void) __Pyx_PyObject_CallOneArg;
+    (void) __Pyx_PyObject_CallNoArg;
+    return PyObject_VectorcallMethod(method_name, args, 1 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
+#else
     PyObject *method = NULL, *result = NULL;
     int is_method = __Pyx_PyObject_GetMethod(obj, method_name, &method);
     if (likely(is_method)) {
@@ -6893,6 +6903,7 @@ static PyObject* __Pyx_PyObject_CallMethod0(PyObject* obj, PyObject* method_name
     Py_DECREF(method);
 bad:
     return result;
+#endif
 }
 
 /* RaiseNoneIterError */
@@ -8558,10 +8569,10 @@ static int __Pyx__ArgTypeTest(PyObject *obj, PyTypeObject *type, const char *nam
 }
 
 /* TypeImport */
-#ifndef __PYX_HAVE_RT_ImportType_3_1_2
-#define __PYX_HAVE_RT_ImportType_3_1_2
-static PyTypeObject *__Pyx_ImportType_3_1_2(PyObject *module, const char *module_name, const char *class_name,
-    size_t size, size_t alignment, enum __Pyx_ImportType_CheckSize_3_1_2 check_size)
+#ifndef __PYX_HAVE_RT_ImportType_3_1_3
+#define __PYX_HAVE_RT_ImportType_3_1_3
+static PyTypeObject *__Pyx_ImportType_3_1_3(PyObject *module, const char *module_name, const char *class_name,
+    size_t size, size_t alignment, enum __Pyx_ImportType_CheckSize_3_1_3 check_size)
 {
     PyObject *result = 0;
     Py_ssize_t basicsize;
@@ -8617,7 +8628,7 @@ static PyTypeObject *__Pyx_ImportType_3_1_2(PyObject *module, const char *module
             module_name, class_name, size, basicsize+itemsize);
         goto bad;
     }
-    if (check_size == __Pyx_ImportType_CheckSize_Error_3_1_2 &&
+    if (check_size == __Pyx_ImportType_CheckSize_Error_3_1_3 &&
             ((size_t)basicsize > size || (size_t)(basicsize + itemsize) < size)) {
         PyErr_Format(PyExc_ValueError,
             "%.200s.%.200s size changed, may indicate binary incompatibility. "
@@ -8625,7 +8636,7 @@ static PyTypeObject *__Pyx_ImportType_3_1_2(PyObject *module, const char *module
             module_name, class_name, size, basicsize, basicsize+itemsize);
         goto bad;
     }
-    else if (check_size == __Pyx_ImportType_CheckSize_Warn_3_1_2 && (size_t)basicsize > size) {
+    else if (check_size == __Pyx_ImportType_CheckSize_Warn_3_1_3 && (size_t)basicsize > size) {
         if (PyErr_WarnFormat(NULL, 0,
                 "%.200s.%.200s size changed, may indicate binary incompatibility. "
                 "Expected %zd from C header, got %zd from PyObject",
@@ -8830,6 +8841,7 @@ static int __Pyx_fix_up_extension_type_from_spec(PyType_Spec *spec, PyTypeObject
                     changed = 1;
                 }
 #endif  // CYTHON_METH_FASTCALL
+#if !CYTHON_COMPILING_IN_PYPY
                 else if (strcmp(memb->name, "__module__") == 0) {
                     PyObject *descr;
                     assert(memb->type == T_OBJECT);
@@ -8844,11 +8856,13 @@ static int __Pyx_fix_up_extension_type_from_spec(PyType_Spec *spec, PyTypeObject
                     }
                     changed = 1;
                 }
+#endif  // !CYTHON_COMPILING_IN_PYPY
             }
             memb++;
         }
     }
 #endif  // !CYTHON_COMPILING_IN_LIMITED_API
+#if !CYTHON_COMPILING_IN_PYPY
     slot = spec->slots;
     while (slot && slot->slot && slot->slot != Py_tp_getset)
         slot++;
@@ -8880,6 +8894,7 @@ static int __Pyx_fix_up_extension_type_from_spec(PyType_Spec *spec, PyTypeObject
             ++getset;
         }
     }
+#endif  // !CYTHON_COMPILING_IN_PYPY
     if (changed)
         PyType_Modified(type);
 #endif  // PY_VERSION_HEX > 0x030900B1
@@ -9012,7 +9027,7 @@ bad:
 }
 
 /* CommonTypesMetaclass */
-PyObject* __pyx_CommonTypesMetaclass_get_module(CYTHON_UNUSED PyObject *self, CYTHON_UNUSED void* context) {
+static PyObject* __pyx_CommonTypesMetaclass_get_module(CYTHON_UNUSED PyObject *self, CYTHON_UNUSED void* context) {
     return PyUnicode_FromString(__PYX_ABI_MODULE_NAME);
 }
 static PyGetSetDef __pyx_CommonTypesMetaclass_getset[] = {

{iceaxe-0.7.2 → iceaxe-0.8.0}/iceaxe/sql_types.py

@@ -23,6 +23,7 @@ class ColumnType(StrEnum):
     DOUBLE_PRECISION = "double precision"
     SERIAL = "serial"
     BIGSERIAL = "bigserial"
+    SMALLSERIAL = "smallserial"
 
     # Monetary Type
     MONEY = "money"

{iceaxe-0.7.2 → iceaxe-0.8.0/iceaxe.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iceaxe
-Version: 0.7.2
+Version: 0.8.0
 Summary: A modern, fast ORM for Python.
 Author-email: Pierce Freeman <pierce@freeman.vc>
 Requires-Python: >=3.11

{iceaxe-0.7.2 → iceaxe-0.8.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "iceaxe"
-version = "0.7.2"
+version = "0.8.0"
 description = "A modern, fast ORM for Python."
 readme = "README.md"
 requires-python = ">=3.11"