A reactive notebook for Python — run reproducible experiments, query with SQL, execute as a script, deploy as an app, and version with git. Stored as pure Python. All in a modern, AI-native editor.
Python artificial-intelligencedagdata-sciencedata-visualizationdataflowdeveloper-toolsmachine-learningnotebookspipelinepythonreactivesqlweb-app
more duckdb data types, use sets instead (#7326)
Shahmir Varqhab5a520cb84ce
diff --git a/marimo/_data/get_datasets.py b/marimo/_data/get_datasets.pyindex 816c66605a..0cef58f3a4 100644--- a/marimo/_data/get_datasets.py+++ b/marimo/_data/get_datasets.py@@ -453,62 +453,98 @@ def _get_duckdb_database_names(return []+_INTEGER_TYPES = {+ "tinyint",+ "smallint",+ "integer",+ "bigint",+ "hugeint",+ "integral",+ "long",+ "short",+ "signed",+ "oid",+ "varint",+ "int",+ "int1",+ "int2",+ "int4",+ "int8",+ "int16",+ "int32",+ "int64",+ "int128",+ "ubigint",+ "uhugeint",+ "usmallint",+ "utinyint",+}+_NUMERIC_TYPES = {"float", "real", "double", "decimal", "numeric", "dec"}+_BOOLEAN_TYPES = {"boolean", "bool", "logical"}+_STRING_TYPES = {+ "varchar",+ "char",+ "bpchar",+ "text",+ "string",+ "blob",+ "uuid",+ "guid",+ "nvarchar",+}+_TIME_TYPES = {"time", "time with time zone", "timetz"}+_DATETIME_TYPES = {"datetime", "interval"}+_BINARY_TYPES = {"bit", "bitstring", "binary", "varbinary", "bytea"}+_UNKNOWN_TYPES = {+ "row",+ "geometry",+ # Null type (can occur when attaching databases or with unknown column types)+ "null",+ '"null"',+}++def _db_type_to_data_type(db_type: str) -> DataType:"""Convert a DuckDB type to a Marimo data type.Reference: https://duckdb.org/docs/stable/sql/data_types/overview+ Latest types: https://github.com/marimo-team/codemirror-sql/blob/caa7c664135988b634f55a3e57a1327a5ffeede2/src/dialects/duckdb/duckdb.ts"""db_type = db_type.lower()- # Numeric types- if db_type in [- "tinyint",- "smallint",- "integer",- "bigint",- "hugeint",- "utinyint",- "usmallint",- "uinteger",- "ubigint",- "uhugeint",- ]:++ # Check for exact matches first, then patterns++ if db_type in _INTEGER_TYPES or db_type.startswith("uint"):return "integer"+if (- db_type- in [- "float",- "real",- "double",- "decimal",- "numeric",- ]+ db_type in _NUMERIC_TYPESor db_type.startswith("decimal")or db_type.startswith("float")):return "number"- # Boolean type- if db_type == "boolean":++ if db_type in _BOOLEAN_TYPES:return "boolean"- # String types- if db_type in [- "varchar",- "char",- "bpchar",- "text",- "string",- "blob",- "uuid",- ]:++ if db_type in _STRING_TYPES:return "string"- # Date and Time types+if db_type == "date":return "date"- if db_type in ["time", "time with time zone"]:+ if db_type in _TIME_TYPES:return "time"- if db_type in ["datetime", "interval"] or db_type.startswith("timestamp"):+ if db_type in _DATETIME_TYPES or db_type.startswith("timestamp"):return "datetime"++ # Binary types (represented as string)+ if db_type in _BINARY_TYPES:+ return "string"++ # Enum types (represented as string)+ if db_type == "enum" or db_type.startswith("enum"):+ return "string"+# Nested types- if "[" in db_type and "]" in db_type:- return "unknown"if (db_type.startswith("union")or db_type.startswith("map")@@ -516,20 +552,13 @@ def _db_type_to_data_type(db_type: str) -> DataType:or db_type.startswith("list")or db_type.startswith("array")or db_type.startswith("json")+ or ("[" in db_type and "]" in db_type)):return "unknown"- # Special types- if db_type == "bit":- return "string" # Representing bit as string- if db_type == "enum" or db_type.startswith("enum"):- return "string" # Representing enum as string- # Geometry types- if db_type == "geometry":- return "unknown"- # Null type (can occur when attaching databases or with unknown column types)- if db_type == "null" or db_type == '"null"':++ # Other special types+ if db_type in _UNKNOWN_TYPES:return "unknown"LOGGER.warning("Unknown DuckDB type: %s", db_type)- # Unknown typereturn "unknown"diff --git a/tests/_data/test_get_datasets.py b/tests/_data/test_get_datasets.pyindex 6852c7f717..b3ca5023a8 100644--- a/tests/_data/test_get_datasets.py+++ b/tests/_data/test_get_datasets.py@@ -628,23 +628,54 @@ def test_db_type_to_data_type_various() -> None:# Integer typesassert _db_type_to_data_type("integer") == "integer"assert _db_type_to_data_type("bigint") == "integer"+ assert _db_type_to_data_type("int128") == "integer"+ assert _db_type_to_data_type("integral") == "integer"+ assert _db_type_to_data_type("long") == "integer"+ assert _db_type_to_data_type("short") == "integer"+ assert _db_type_to_data_type("signed") == "integer"+ assert _db_type_to_data_type("oid") == "integer"+ assert _db_type_to_data_type("varint") == "integer"++ # Unsigned integers+ assert _db_type_to_data_type("utinyint") == "integer"+ assert _db_type_to_data_type("usmallint") == "integer"+ assert _db_type_to_data_type("uinteger") == "integer"+ assert _db_type_to_data_type("ubigint") == "integer"+ assert _db_type_to_data_type("uhugeint") == "integer"+ assert _db_type_to_data_type("uint128") == "integer"# Numeric typesassert _db_type_to_data_type("float") == "number"assert _db_type_to_data_type("double") == "number"+ assert _db_type_to_data_type("float4") == "number"+ assert _db_type_to_data_type("dec") == "number"+ assert _db_type_to_data_type("decimal") == "number"# String typesassert _db_type_to_data_type("varchar") == "string"assert _db_type_to_data_type("text") == "string"+ assert _db_type_to_data_type("blob") == "string"+ assert _db_type_to_data_type("guid") == "string"+ assert _db_type_to_data_type("nvarchar") == "string"++ # Binary types (represented as string)+ assert _db_type_to_data_type("binary") == "string"+ assert _db_type_to_data_type("varbinary") == "string"+ assert _db_type_to_data_type("bytea") == "string"# Booleanassert _db_type_to_data_type("boolean") == "boolean"+ assert _db_type_to_data_type("bool") == "boolean"+ assert _db_type_to_data_type("logical") == "boolean"# Date/Timeassert _db_type_to_data_type("date") == "date"assert _db_type_to_data_type("timestamp") == "datetime"+ assert _db_type_to_data_type("timestamptz") == "datetime"+ assert _db_type_to_data_type("timetz") == "time"# Special typesassert _db_type_to_data_type("geometry") == "unknown"assert _db_type_to_data_type("null") == "unknown"assert _db_type_to_data_type("json") == "unknown"+ assert _db_type_to_data_type("row") == "unknown"