singlestoredb 1.12.4__py3-none-any.whl → 1.13.0__py3-none-any.whl

singlestoredb/functions/dtypes.py

@@ -1,11 +1,11 @@
 #!/usr/bin/env python3
+import base64
 import datetime
 import decimal
 import re
 from typing import Any
 from typing import Callable
 from typing import Optional
-from typing import Tuple
 from typing import Union
 
 from ..converters import converters
@@ -20,6 +20,11 @@ from ..utils.dtypes import PYARROW_TYPE_MAP  # noqa
 DataType = Union[str, Callable[..., Any]]
 
 
+class SQLString(str):
+    """SQL string type."""
+    name: Optional[str] = None
+
+
 class NULL:
     """NULL (for use in default values)."""
     pass
@@ -101,7 +106,7 @@ def bytestr(x: Any) -> Optional[bytes]:
         return x
     if isinstance(x, bytes):
         return x
-    return bytes.fromhex(x)
+    return base64.b64decode(x)
 
 
 PYTHON_CONVERTERS = {
@@ -194,7 +199,12 @@ def _bool(x: Optional[bool] = None) -> Optional[bool]:
     return bool(x)
 
 
-def BOOL(*, nullable: bool = True, default: Optional[bool] = None) -> str:
+def BOOL(
+    *,
+    nullable: bool = True,
+    default: Optional[bool] = None,
+    name: Optional[str] = None,
+) -> SQLString:
     """
     BOOL type specification.
 
@@ -204,16 +214,25 @@ def BOOL(*, nullable: bool = True, default: Optional[bool] = None) -> str:
         Can the value be NULL?
     default : bool, optional
         Default value
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
-    return 'BOOL' + _modifiers(nullable=nullable, default=_bool(default))
+    out = SQLString('BOOL' + _modifiers(nullable=nullable, default=_bool(default)))
+    out.name = name
+    return out
 
 
-def BOOLEAN(*, nullable: bool = True, default: Optional[bool] = None) -> str:
+def BOOLEAN(
+    *,
+    nullable: bool = True,
+    default: Optional[bool] = None,
+    name: Optional[str] = None,
+) -> SQLString:
     """
     BOOLEAN type specification.
 
@@ -223,16 +242,25 @@ def BOOLEAN(*, nullable: bool = True, default: Optional[bool] = None) -> str:
         Can the value be NULL?
     default : bool, optional
         Default value
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
-    return 'BOOLEAN' + _modifiers(nullable=nullable, default=_bool(default))
+    out = SQLString('BOOLEAN' + _modifiers(nullable=nullable, default=_bool(default)))
+    out.name = name
+    return out
 
 
-def BIT(*, nullable: bool = True, default: Optional[int] = None) -> str:
+def BIT(
+    *,
+    nullable: bool = True,
+    default: Optional[int] = None,
+    name: Optional[str] = None,
+) -> SQLString:
     """
     BIT type specification.
 
@@ -242,13 +270,17 @@ def BIT(*, nullable: bool = True, default: Optional[int] = None) -> str:
         Can the value be NULL?
     default : int, optional
         Default value
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
-    return 'BIT' + _modifiers(nullable=nullable, default=default)
+    out = SQLString('BIT' + _modifiers(nullable=nullable, default=default))
+    out.name = name
+    return out
 
 
 def TINYINT(
@@ -257,7 +289,8 @@ def TINYINT(
     nullable: bool = True,
     default: Optional[int] = None,
     unsigned: bool = False,
-) -> str:
+    name: Optional[str] = None,
+) -> SQLString:
     """
     TINYINT type specification.
 
@@ -271,14 +304,20 @@ def TINYINT(
         Default value
     unsigned : bool, optional
         Is the int unsigned?
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
     out = f'TINYINT({display_width})' if display_width else 'TINYINT'
-    return out + _modifiers(nullable=nullable, default=default, unsigned=unsigned)
+    out = SQLString(
+        out + _modifiers(nullable=nullable, default=default, unsigned=unsigned),
+    )
+    out.name = name
+    return out
 
 
 def TINYINT_UNSIGNED(
@@ -286,7 +325,8 @@ def TINYINT_UNSIGNED(
     *,
     nullable: bool = True,
     default: Optional[int] = None,
-) -> str:
+    name: Optional[str] = None,
+) -> SQLString:
     """
     TINYINT UNSIGNED type specification.
 
@@ -298,14 +338,18 @@ def TINYINT_UNSIGNED(
         Can the value be NULL?
     default : int, optional
         Default value
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
     out = f'TINYINT({display_width})' if display_width else 'TINYINT'
-    return out + _modifiers(nullable=nullable, default=default, unsigned=True)
+    out = SQLString(out + _modifiers(nullable=nullable, default=default, unsigned=True))
+    out.name = name
+    return out
 
 
 def SMALLINT(
@@ -314,7 +358,8 @@ def SMALLINT(
     nullable: bool = True,
     default: Optional[int] = None,
     unsigned: bool = False,
-) -> str:
+    name: Optional[str] = None,
+) -> SQLString:
     """
     SMALLINT type specification.
 
@@ -328,14 +373,20 @@ def SMALLINT(
         Default value
     unsigned : bool, optional
         Is the int unsigned?
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
     out = f'SMALLINT({display_width})' if display_width else 'SMALLINT'
-    return out + _modifiers(nullable=nullable, default=default, unsigned=unsigned)
+    out = SQLString(
+        out + _modifiers(nullable=nullable, default=default, unsigned=unsigned),
+    )
+    out.name = name
+    return out
 
 
 def SMALLINT_UNSIGNED(
@@ -343,7 +394,8 @@ def SMALLINT_UNSIGNED(
     *,
     nullable: bool = True,
     default: Optional[int] = None,
-) -> str:
+    name: Optional[str] = None,
+) -> SQLString:
     """
     SMALLINT UNSIGNED type specification.
 
@@ -355,14 +407,18 @@ def SMALLINT_UNSIGNED(
         Can the value be NULL?
     default : int, optional
         Default value
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
     out = f'SMALLINT({display_width})' if display_width else 'SMALLINT'
-    return out + _modifiers(nullable=nullable, default=default, unsigned=True)
+    out = SQLString(out + _modifiers(nullable=nullable, default=default, unsigned=True))
+    out.name = name
+    return out
 
 
 def MEDIUMINT(
@@ -371,7 +427,8 @@ def MEDIUMINT(
     nullable: bool = True,
     default: Optional[int] = None,
     unsigned: bool = False,
-) -> str:
+    name: Optional[str] = None,
+) -> SQLString:
     """
     MEDIUMINT type specification.
 
@@ -385,14 +442,20 @@ def MEDIUMINT(
         Default value
     unsigned : bool, optional
         Is the int unsigned?
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
     out = f'MEDIUMINT({display_width})' if display_width else 'MEDIUMINT'
-    return out + _modifiers(nullable=nullable, default=default, unsigned=unsigned)
+    out = SQLString(
+        out + _modifiers(nullable=nullable, default=default, unsigned=unsigned),
+    )
+    out.name = name
+    return out
 
 
 def MEDIUMINT_UNSIGNED(
@@ -400,7 +463,8 @@ def MEDIUMINT_UNSIGNED(
     *,
     nullable: bool = True,
     default: Optional[int] = None,
-) -> str:
+    name: Optional[str] = None,
+) -> SQLString:
     """
     MEDIUMINT UNSIGNED type specification.
 
@@ -412,14 +476,18 @@ def MEDIUMINT_UNSIGNED(
         Can the value be NULL?
     default : int, optional
         Default value
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
     out = f'MEDIUMINT({display_width})' if display_width else 'MEDIUMINT'
-    return out + _modifiers(nullable=nullable, default=default, unsigned=True)
+    out = SQLString(out + _modifiers(nullable=nullable, default=default, unsigned=True))
+    out.name = name
+    return out
 
 
 def INT(
@@ -428,7 +496,8 @@ def INT(
     nullable: bool = True,
     default: Optional[int] = None,
     unsigned: bool = False,
-) -> str:
+    name: Optional[str] = None,
+) -> SQLString:
     """
     INT type specification.
 
@@ -442,14 +511,20 @@ def INT(
         Default value
     unsigned : bool, optional
         Is the int unsigned?
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
     out = f'INT({display_width})' if display_width else 'INT'
-    return out + _modifiers(nullable=nullable, default=default, unsigned=unsigned)
+    out = SQLString(
+        out + _modifiers(nullable=nullable, default=default, unsigned=unsigned),
+    )
+    out.name = name
+    return out
 
 
 def INT_UNSIGNED(
@@ -457,7 +532,8 @@ def INT_UNSIGNED(
     *,
     nullable: bool = True,
     default: Optional[int] = None,
-) -> str:
+    name: Optional[str] = None,
+) -> SQLString:
     """
     INT UNSIGNED type specification.
 
@@ -469,14 +545,18 @@ def INT_UNSIGNED(
         Can the value be NULL?
     default : int, optional
         Default value
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
     out = f'INT({display_width})' if display_width else 'INT'
-    return out + _modifiers(nullable=nullable, default=default, unsigned=True)
+    out = SQLString(out + _modifiers(nullable=nullable, default=default, unsigned=True))
+    out.name = name
+    return out
 
 
 def INTEGER(
@@ -485,7 +565,8 @@ def INTEGER(
     nullable: bool = True,
     default: Optional[int] = None,
     unsigned: bool = False,
-) -> str:
+    name: Optional[str] = None,
+) -> SQLString:
     """
     INTEGER type specification.
 
@@ -499,14 +580,20 @@ def INTEGER(
         Default value
     unsigned : bool, optional
         Is the int unsigned?
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
     out = f'INTEGER({display_width})' if display_width else 'INTEGER'
-    return out + _modifiers(nullable=nullable, default=default, unsigned=unsigned)
+    out = SQLString(
+        out + _modifiers(nullable=nullable, default=default, unsigned=unsigned),
+    )
+    out.name = name
+    return out
 
 
 def INTEGER_UNSIGNED(
@@ -514,7 +601,8 @@ def INTEGER_UNSIGNED(
     *,
     nullable: bool = True,
     default: Optional[int] = None,
-) -> str:
+    name: Optional[str] = None,
+) -> SQLString:
     """
     INTEGER UNSIGNED type specification.
 
@@ -526,14 +614,18 @@ def INTEGER_UNSIGNED(
         Can the value be NULL?
     default : int, optional
         Default value
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
     out = f'INTEGER({display_width})' if display_width else 'INTEGER'
-    return out + _modifiers(nullable=nullable, default=default, unsigned=True)
+    out = SQLString(out + _modifiers(nullable=nullable, default=default, unsigned=True))
+    out.name = name
+    return out
 
 
 def BIGINT(
@@ -542,7 +634,8 @@ def BIGINT(
     nullable: bool = True,
     default: Optional[int] = None,
     unsigned: bool = False,
-) -> str:
+    name: Optional[str] = None,
+) -> SQLString:
     """
     BIGINT type specification.
 
@@ -556,14 +649,20 @@ def BIGINT(
         Default value
     unsigned : bool, optional
         Is the int unsigned?
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
     out = f'BIGINT({display_width})' if display_width else 'BIGINT'
-    return out + _modifiers(nullable=nullable, default=default, unsigned=unsigned)
+    out = SQLString(
+        out + _modifiers(nullable=nullable, default=default, unsigned=unsigned),
+    )
+    out.name = name
+    return out
 
 
 def BIGINT_UNSIGNED(
@@ -571,7 +670,8 @@ def BIGINT_UNSIGNED(
     *,
     nullable: bool = True,
     default: Optional[int] = None,
-) -> str:
+    name: Optional[str] = None,
+) -> SQLString:
     """
     BIGINT UNSIGNED type specification.
 
@@ -583,14 +683,18 @@ def BIGINT_UNSIGNED(
         Can the value be NULL?
     default : int, optional
         Default value
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
     out = f'BIGINT({int(display_width)})' if display_width else 'BIGINT'
-    return out + _modifiers(nullable=nullable, default=default, unsigned=True)
+    out = SQLString(out + _modifiers(nullable=nullable, default=default, unsigned=True))
+    out.name = name
+    return out
 
 
 def FLOAT(
@@ -598,7 +702,8 @@ def FLOAT(
     *,
     nullable: bool = True,
     default: Optional[float] = None,
-) -> str:
+    name: Optional[str] = None,
+) -> SQLString:
     """
     FLOAT type specification.
 
@@ -610,14 +715,18 @@ def FLOAT(
         Can the value be NULL?
     default : float, optional
         Default value
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
     out = f'FLOAT({int(display_decimals)})' if display_decimals else 'FLOAT'
-    return out + _modifiers(nullable=nullable, default=default)
+    out = SQLString(out + _modifiers(nullable=nullable, default=default))
+    out.name = name
+    return out
 
 
 def DOUBLE(
@@ -625,7 +734,8 @@ def DOUBLE(
     *,
     nullable: bool = True,
     default: Optional[float] = None,
-) -> str:
+    name: Optional[str] = None,
+) -> SQLString:
     """
     DOUBLE type specification.
 
@@ -637,14 +747,18 @@ def DOUBLE(
         Can the value be NULL?
     default : float, optional
         Default value
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
     out = f'DOUBLE({int(display_decimals)})' if display_decimals else 'DOUBLE'
-    return out + _modifiers(nullable=nullable, default=default)
+    out = SQLString(out + _modifiers(nullable=nullable, default=default))
+    out.name = name
+    return out
 
 
 def REAL(
@@ -652,7 +766,8 @@ def REAL(
     *,
     nullable: bool = True,
     default: Optional[float] = None,
-) -> str:
+    name: Optional[str] = None,
+) -> SQLString:
     """
     REAL type specification.
 
@@ -664,14 +779,18 @@ def REAL(
         Can the value be NULL?
     default : float, optional
         Default value
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
     out = f'REAL({int(display_decimals)})' if display_decimals else 'REAL'
-    return out + _modifiers(nullable=nullable, default=default)
+    out = SQLString(out + _modifiers(nullable=nullable, default=default))
+    out.name = name
+    return out
 
 
 def DECIMAL(
@@ -680,7 +799,8 @@ def DECIMAL(
     *,
     nullable: bool = True,
     default: Optional[Union[str, decimal.Decimal]] = None,
-) -> str:
+    name: Optional[str] = None,
+) -> SQLString:
     """
     DECIMAL type specification.
 
@@ -694,14 +814,20 @@ def DECIMAL(
         Can the value be NULL?
     default : str or decimal.Decimal, optional
         Default value
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
-    return f'DECIMAL({int(precision)}, {int(scale)})' + \
-           _modifiers(nullable=nullable, default=default)
+    out = SQLString(
+        f'DECIMAL({int(precision)}, {int(scale)})' +
+        _modifiers(nullable=nullable, default=default),
+    )
+    out.name = name
+    return out
 
 
 def DEC(
@@ -710,7 +836,8 @@ def DEC(
     *,
     nullable: bool = True,
     default: Optional[Union[str, decimal.Decimal]] = None,
-) -> str:
+    name: Optional[str] = None,
+) -> SQLString:
     """
     DEC type specification.
 
@@ -724,14 +851,20 @@ def DEC(
         Can the value be NULL?
     default : str or decimal.Decimal, optional
         Default value
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
-    return f'DEC({int(precision)}, {int(scale)})' + \
-           _modifiers(nullable=nullable, default=default)
+    out = SQLString(
+        f'DEC({int(precision)}, {int(scale)})' +
+        _modifiers(nullable=nullable, default=default),
+    )
+    out.name = name
+    return out
 
 
 def FIXED(
@@ -740,7 +873,8 @@ def FIXED(
     *,
     nullable: bool = True,
     default: Optional[Union[str, decimal.Decimal]] = None,
-) -> str:
+    name: Optional[str] = None,
+) -> SQLString:
     """
     FIXED type specification.
 
@@ -754,14 +888,20 @@ def FIXED(
         Can the value be NULL?
     default : str or decimal.Decimal, optional
         Default value
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
-    return f'FIXED({int(precision)}, {int(scale)})' + \
-           _modifiers(nullable=nullable, default=default)
+    out = SQLString(
+        f'FIXED({int(precision)}, {int(scale)})' +
+        _modifiers(nullable=nullable, default=default),
+    )
+    out.name = name
+    return out
 
 
 def NUMERIC(
@@ -770,7 +910,8 @@ def NUMERIC(
     *,
     nullable: bool = True,
     default: Optional[Union[str, decimal.Decimal]] = None,
-) -> str:
+    name: Optional[str] = None,
+) -> SQLString:
     """
     NUMERIC type specification.
 
@@ -784,21 +925,28 @@ def NUMERIC(
         Can the value be NULL?
     default : str or decimal.Decimal, optional
         Default value
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
-    return f'NUMERIC({int(precision)}, {int(scale)})' + \
-           _modifiers(nullable=nullable, default=default)
+    out = SQLString(
+        f'NUMERIC({int(precision)}, {int(scale)})' +
+        _modifiers(nullable=nullable, default=default),
+    )
+    out.name = name
+    return out
 
 
 def DATE(
     *,
     nullable: bool = True,
     default: Optional[Union[str, datetime.date]] = None,
-) -> str:
+    name: Optional[str] = None,
+) -> SQLString:
     """
     DATE type specification.
 
@@ -808,13 +956,17 @@ def DATE(
         Can the value be NULL?
     default : str or datetime.date, optional
         Default value
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
-    return 'DATE' + _modifiers(nullable=nullable, default=default)
+    out = SQLString('DATE' + _modifiers(nullable=nullable, default=default))
+    out.name = name
+    return out
 
 
 def TIME(
@@ -822,7 +974,8 @@ def TIME(
     *,
     nullable: bool = True,
     default: Optional[Union[str, datetime.timedelta]] = None,
-) -> str:
+    name: Optional[str] = None,
+) -> SQLString:
     """
     TIME type specification.
 
@@ -834,14 +987,18 @@ def TIME(
         Can the value be NULL?
     default : str or datetime.timedelta, optional
         Default value
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
     out = f'TIME({int(precision)})' if precision else 'TIME'
-    return out + _modifiers(nullable=nullable, default=default)
+    out = SQLString(out + _modifiers(nullable=nullable, default=default))
+    out.name = name
+    return out
 
 
 def DATETIME(
@@ -849,7 +1006,8 @@ def DATETIME(
     *,
     nullable: bool = True,
     default: Optional[Union[str, datetime.datetime]] = None,
-) -> str:
+    name: Optional[str] = None,
+) -> SQLString:
     """
     DATETIME type specification.
 
@@ -861,14 +1019,18 @@ def DATETIME(
         Can the value be NULL?
     default : str or datetime.datetime, optional
         Default value
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
     out = f'DATETIME({int(precision)})' if precision else 'DATETIME'
-    return out + _modifiers(nullable=nullable, default=default)
+    out = SQLString(out + _modifiers(nullable=nullable, default=default))
+    out.name = name
+    return out
 
 
 def TIMESTAMP(
@@ -876,7 +1038,8 @@ def TIMESTAMP(
     *,
     nullable: bool = True,
     default: Optional[Union[str, datetime.datetime]] = None,
-) -> str:
+    name: Optional[str] = None,
+) -> SQLString:
     """
     TIMESTAMP type specification.
 
@@ -888,17 +1051,26 @@ def TIMESTAMP(
         Can the value be NULL?
     default : str or datetime.datetime, optional
         Default value
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
     out = f'TIMESTAMP({int(precision)})' if precision else 'TIMESTAMP'
-    return out + _modifiers(nullable=nullable, default=default)
+    out = SQLString(out + _modifiers(nullable=nullable, default=default))
+    out.name = name
+    return out
 
 
-def YEAR(*, nullable: bool = True, default: Optional[int] = None) -> str:
+def YEAR(
+    *,
+    nullable: bool = True,
+    default: Optional[int] = None,
+    name: Optional[str] = None,
+) -> SQLString:
     """
     YEAR type specification.
 
@@ -908,13 +1080,17 @@ def YEAR(*, nullable: bool = True, default: Optional[int] = None) -> str:
         Can the value be NULL?
     default : int, optional
         Default value
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
-    return 'YEAR' + _modifiers(nullable=nullable, default=default)
+    out = SQLString('YEAR' + _modifiers(nullable=nullable, default=default))
+    out.name = name
+    return out
 
 
 def CHAR(
@@ -924,7 +1100,8 @@ def CHAR(
     default: Optional[str] = None,
     collate: Optional[str] = None,
     charset: Optional[str] = None,
-) -> str:
+    name: Optional[str] = None,
+) -> SQLString:
     """
     CHAR type specification.
 
@@ -940,17 +1117,23 @@ def CHAR(
         Collation
     charset : str, optional
         Character set
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
     out = f'CHAR({int(length)})' if length else 'CHAR'
-    return out + _modifiers(
-        nullable=nullable, default=default,
-        collate=collate, charset=charset,
+    out = SQLString(
+        out + _modifiers(
+            nullable=nullable, default=default,
+            collate=collate, charset=charset,
+        ),
     )
+    out.name = name
+    return out
 
 
 def VARCHAR(
@@ -960,7 +1143,8 @@ def VARCHAR(
     default: Optional[str] = None,
     collate: Optional[str] = None,
     charset: Optional[str] = None,
-) -> str:
+    name: Optional[str] = None,
+) -> SQLString:
     """
     VARCHAR type specification.
 
@@ -976,17 +1160,23 @@ def VARCHAR(
         Collation
     charset : str, optional
         Character set
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
     out = f'VARCHAR({int(length)})' if length else 'VARCHAR'
-    return out + _modifiers(
-        nullable=nullable, default=default,
-        collate=collate, charset=charset,
+    out = SQLString(
+        out + _modifiers(
+            nullable=nullable, default=default,
+            collate=collate, charset=charset,
+        ),
     )
+    out.name = name
+    return out
 
 
 def LONGTEXT(
@@ -996,7 +1186,8 @@ def LONGTEXT(
     default: Optional[str] = None,
     collate: Optional[str] = None,
     charset: Optional[str] = None,
-) -> str:
+    name: Optional[str] = None,
+) -> SQLString:
     """
     LONGTEXT type specification.
 
@@ -1012,17 +1203,23 @@ def LONGTEXT(
         Collation
     charset : str, optional
         Character set
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
     out = f'LONGTEXT({int(length)})' if length else 'LONGTEXT'
-    return out + _modifiers(
-        nullable=nullable, default=default,
-        collate=collate, charset=charset,
+    out = SQLString(
+        out + _modifiers(
+            nullable=nullable, default=default,
+            collate=collate, charset=charset,
+        ),
     )
+    out.name = name
+    return out
 
 
 def MEDIUMTEXT(
@@ -1032,7 +1229,8 @@ def MEDIUMTEXT(
     default: Optional[str] = None,
     collate: Optional[str] = None,
     charset: Optional[str] = None,
-) -> str:
+    name: Optional[str] = None,
+) -> SQLString:
     """
     MEDIUMTEXT type specification.
 
@@ -1048,17 +1246,23 @@ def MEDIUMTEXT(
         Collation
     charset : str, optional
         Character set
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
     out = f'MEDIUMTEXT({int(length)})' if length else 'MEDIUMTEXT'
-    return out + _modifiers(
-        nullable=nullable, default=default,
-        collate=collate, charset=charset,
+    out = SQLString(
+        out + _modifiers(
+            nullable=nullable, default=default,
+            collate=collate, charset=charset,
+        ),
     )
+    out.name = name
+    return out
 
 
 def TEXT(
@@ -1068,7 +1272,8 @@ def TEXT(
     default: Optional[str] = None,
     collate: Optional[str] = None,
     charset: Optional[str] = None,
-) -> str:
+    name: Optional[str] = None,
+) -> SQLString:
     """
     TEXT type specification.
 
@@ -1084,17 +1289,23 @@ def TEXT(
         Collation
     charset : str, optional
         Character set
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
     out = f'TEXT({int(length)})' if length else 'TEXT'
-    return out + _modifiers(
-        nullable=nullable, default=default,
-        collate=collate, charset=charset,
+    out = SQLString(
+        out + _modifiers(
+            nullable=nullable, default=default,
+            collate=collate, charset=charset,
+        ),
     )
+    out.name = name
+    return out
 
 
 def TINYTEXT(
@@ -1104,7 +1315,8 @@ def TINYTEXT(
     default: Optional[str] = None,
     collate: Optional[str] = None,
     charset: Optional[str] = None,
-) -> str:
+    name: Optional[str] = None,
+) -> SQLString:
     """
     TINYTEXT type specification.
 
@@ -1120,17 +1332,23 @@ def TINYTEXT(
         Collation
     charset : str, optional
         Character set
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
     out = f'TINYTEXT({int(length)})' if length else 'TINYTEXT'
-    return out + _modifiers(
-        nullable=nullable, default=default,
-        collate=collate, charset=charset,
+    out = SQLString(
+        out + _modifiers(
+            nullable=nullable, default=default,
+            collate=collate, charset=charset,
+        ),
     )
+    out.name = name
+    return out
 
 
 def BINARY(
@@ -1139,7 +1357,8 @@ def BINARY(
     nullable: bool = True,
     default: Optional[bytes] = None,
     collate: Optional[str] = None,
-) -> str:
+    name: Optional[str] = None,
+) -> SQLString:
     """
     BINARY type specification.
 
@@ -1153,16 +1372,22 @@ def BINARY(
         Default value
     collate : str, optional
         Collation
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
     out = f'BINARY({int(length)})' if length else 'BINARY'
-    return out + _modifiers(
-        nullable=nullable, default=default, collate=collate,
+    out = SQLString(
+        out + _modifiers(
+            nullable=nullable, default=default, collate=collate,
+        ),
     )
+    out.name = name
+    return out
 
 
 def VARBINARY(
@@ -1171,7 +1396,8 @@ def VARBINARY(
     nullable: bool = True,
     default: Optional[bytes] = None,
     collate: Optional[str] = None,
-) -> str:
+    name: Optional[str] = None,
+) -> SQLString:
     """
     VARBINARY type specification.
 
@@ -1185,16 +1411,22 @@ def VARBINARY(
         Default value
     collate : str, optional
         Collation
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
     out = f'VARBINARY({int(length)})' if length else 'VARBINARY'
-    return out + _modifiers(
-        nullable=nullable, default=default, collate=collate,
+    out = SQLString(
+        out + _modifiers(
+            nullable=nullable, default=default, collate=collate,
+        ),
     )
+    out.name = name
+    return out
 
 
 def LONGBLOB(
@@ -1203,7 +1435,8 @@ def LONGBLOB(
     nullable: bool = True,
     default: Optional[bytes] = None,
     collate: Optional[str] = None,
-) -> str:
+    name: Optional[str] = None,
+) -> SQLString:
     """
     LONGBLOB type specification.
 
@@ -1217,16 +1450,22 @@ def LONGBLOB(
         Default value
     collate : str, optional
         Collation
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
     out = f'LONGBLOB({int(length)})' if length else 'LONGBLOB'
-    return out + _modifiers(
-        nullable=nullable, default=default, collate=collate,
+    out = SQLString(
+        out + _modifiers(
+            nullable=nullable, default=default, collate=collate,
+        ),
     )
+    out.name = name
+    return out
 
 
 def MEDIUMBLOB(
@@ -1235,7 +1474,8 @@ def MEDIUMBLOB(
     nullable: bool = True,
     default: Optional[bytes] = None,
     collate: Optional[str] = None,
-) -> str:
+    name: Optional[str] = None,
+) -> SQLString:
     """
     MEDIUMBLOB type specification.
 
@@ -1249,16 +1489,22 @@ def MEDIUMBLOB(
         Default value
     collate : str, optional
         Collation
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
     out = f'MEDIUMBLOB({int(length)})' if length else 'MEDIUMBLOB'
-    return out + _modifiers(
-        nullable=nullable, default=default, collate=collate,
+    out = SQLString(
+        out + _modifiers(
+            nullable=nullable, default=default, collate=collate,
+        ),
     )
+    out.name = name
+    return out
 
 
 def BLOB(
@@ -1267,7 +1513,8 @@ def BLOB(
     nullable: bool = True,
     default: Optional[bytes] = None,
     collate: Optional[str] = None,
-) -> str:
+    name: Optional[str] = None,
+) -> SQLString:
     """
     BLOB type specification.
 
@@ -1281,16 +1528,22 @@ def BLOB(
         Default value
     collate : str, optional
         Collation
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
     out = f'BLOB({int(length)})' if length else 'BLOB'
-    return out + _modifiers(
-        nullable=nullable, default=default, collate=collate,
+    out = SQLString(
+        out + _modifiers(
+            nullable=nullable, default=default, collate=collate,
+        ),
     )
+    out.name = name
+    return out
 
 
 def TINYBLOB(
@@ -1299,7 +1552,8 @@ def TINYBLOB(
     nullable: bool = True,
     default: Optional[bytes] = None,
     collate: Optional[str] = None,
-) -> str:
+    name: Optional[str] = None,
+) -> SQLString:
     """
     TINYBLOB type specification.
 
@@ -1313,16 +1567,22 @@ def TINYBLOB(
         Default value
     collate : str, optional
         Collation
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
     out = f'TINYBLOB({int(length)})' if length else 'TINYBLOB'
-    return out + _modifiers(
-        nullable=nullable, default=default, collate=collate,
+    out = SQLString(
+        out + _modifiers(
+            nullable=nullable, default=default, collate=collate,
+        ),
     )
+    out.name = name
+    return out
 
 
 def JSON(
@@ -1332,7 +1592,8 @@ def JSON(
     default: Optional[str] = None,
     collate: Optional[str] = None,
     charset: Optional[str] = None,
-) -> str:
+    name: Optional[str] = None,
+) -> SQLString:
     """
     JSON type specification.
 
@@ -1348,20 +1609,31 @@ def JSON(
         Collation
     charset : str, optional
         Character set
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
     out = f'JSON({int(length)})' if length else 'JSON'
-    return out + _modifiers(
-        nullable=nullable, default=default,
-        collate=collate, charset=charset,
+    out = SQLString(
+        out + _modifiers(
+            nullable=nullable, default=default,
+            collate=collate, charset=charset,
+        ),
     )
+    out.name = name
+    return out
 
 
-def GEOGRAPHYPOINT(*, nullable: bool = True, default: Optional[str] = None) -> str:
+def GEOGRAPHYPOINT(
+    *,
+    nullable: bool = True,
+    default: Optional[str] = None,
+    name: Optional[str] = None,
+) -> SQLString:
     """
     GEOGRAPHYPOINT type specification.
 
@@ -1371,16 +1643,25 @@ def GEOGRAPHYPOINT(*, nullable: bool = True, default: Optional[str] = None) -> s
         Can the value be NULL?
     default : str, optional
         Default value
+    name : str, optional
+        Name of the column / parameter
 
     Returns
     -------
-    str
+    SQLString
 
     """
-    return 'GEOGRAPHYPOINT' + _modifiers(nullable=nullable, default=default)
+    out = SQLString('GEOGRAPHYPOINT' + _modifiers(nullable=nullable, default=default))
+    out.name = name
+    return out
 
 
-def GEOGRAPHY(*, nullable: bool = True, default: Optional[str] = None) -> str:
+def GEOGRAPHY(
+    *,
+    nullable: bool = True,
+    default: Optional[str] = None,
+    name: Optional[str] = None,
+) -> SQLString:
     """
     GEOGRAPHYPOINT type specification.
 
@@ -1396,51 +1677,117 @@ def GEOGRAPHY(*, nullable: bool = True, default: Optional[str] = None) -> str:
     str
 
     """
-    return 'GEOGRAPHY' + _modifiers(nullable=nullable, default=default)
-
-
-def RECORD(*args: Tuple[str, DataType], nullable: bool = True) -> str:
-    """
-    RECORD type specification.
-
-    Parameters
-    ----------
-    *args : Tuple[str, DataType]
-        Field specifications
-    nullable : bool, optional
-        Can the value be NULL?
-
-    Returns
-    -------
-    str
-
-    """
-    assert len(args) > 0
-    fields = []
-    for name, value in args:
-        if callable(value):
-            fields.append(f'{escape_name(name)} {value()}')
-        else:
-            fields.append(f'{escape_name(name)} {value}')
-    return f'RECORD({", ".join(fields)})' + _modifiers(nullable=nullable)
-
-
-def ARRAY(dtype: DataType, nullable: bool = True) -> str:
-    """
-    ARRAY type specification.
-
-    Parameters
-    ----------
-    dtype : DataType
-        The data type of the array elements
-    nullable : bool, optional
-        Can the value be NULL?
-
-    Returns
-    -------
-    str
-
-    """
-    if callable(dtype):
-        dtype = dtype()
-    return f'ARRAY({dtype})' + _modifiers(nullable=nullable)
+    out = SQLString('GEOGRAPHY' + _modifiers(nullable=nullable, default=default))
+    out.name = name
+    return out
+
+
+# def RECORD(
+#     *args: Tuple[str, DataType],
+#     nullable: bool = True,
+#     name: Optional[str] = None,
+# ) -> SQLString:
+#     """
+#     RECORD type specification.
+#
+#     Parameters
+#     ----------
+#     *args : Tuple[str, DataType]
+#         Field specifications
+#     nullable : bool, optional
+#         Can the value be NULL?
+#     name : str, optional
+#         Name of the column / parameter
+#
+#     Returns
+#     -------
+#     SQLString
+#
+#     """
+#     assert len(args) > 0
+#     fields = []
+#     for name, value in args:
+#         if callable(value):
+#             fields.append(f'{escape_name(name)} {value()}')
+#         else:
+#             fields.append(f'{escape_name(name)} {value}')
+#     out = SQLString(f'RECORD({", ".join(fields)})' + _modifiers(nullable=nullable))
+#     out.name = name
+#     return out
+
+
+# def ARRAY(
+#     dtype: DataType,
+#     nullable: bool = True,
+#     name: Optional[str] = None,
+# ) -> SQLString:
+#     """
+#     ARRAY type specification.
+#
+#     Parameters
+#     ----------
+#     dtype : DataType
+#         The data type of the array elements
+#     nullable : bool, optional
+#         Can the value be NULL?
+#     name : str, optional
+#         Name of the column / parameter
+#
+#     Returns
+#     -------
+#     SQLString
+#
+#     """
+#     if callable(dtype):
+#         dtype = dtype()
+#     out = SQLString(f'ARRAY({dtype})' + _modifiers(nullable=nullable))
+#     out.name = name
+#     return out
+
+
+# F32 = 'F32'
+# F64 = 'F64'
+# I8 = 'I8'
+# I16 = 'I16'
+# I32 = 'I32'
+# I64 = 'I64'
+
+
+# def VECTOR(
+#     length: int,
+#     element_type: str = F32,
+#     *,
+#     nullable: bool = True,
+#     default: Optional[bytes] = None,
+#     name: Optional[str] = None,
+# ) -> SQLString:
+#     """
+#     VECTOR type specification.
+#
+#     Parameters
+#     ----------
+#     n : int
+#         Number of elements in vector
+#     element_type : str, optional
+#         Type of the elements in the vector:
+#         F32, F64, I8, I16, I32, I64
+#     nullable : bool, optional
+#         Can the value be NULL?
+#     default : str, optional
+#         Default value
+#     name : str, optional
+#         Name of the column / parameter
+#
+#     Returns
+#     -------
+#     SQLString
+#
+#     """
+#     out = f'VECTOR({int(length)}, {element_type})'
+#     out = SQLString(
+#         out + _modifiers(
+#             nullable=nullable, default=default,
+#         ),
+#     )
+#     out.name = name
+#     return out