sqlframe 2.2.0__py3-none-any.whl → 2.4.0__py3-none-any.whl

sqlframe/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.2.0'
-__version_tuple__ = version_tuple = (2, 2, 0)
+__version__ = version = '2.4.0'
+__version_tuple__ = version_tuple = (2, 4, 0)

sqlframe/base/column.py

@@ -339,7 +339,9 @@ class Column:
         return Column(new_expression)
 
     def cast(
-        self, dataType: t.Union[str, DataType], dialect: t.Optional[t.Union[str, Dialect]] = None
+        self,
+        dataType: t.Union[str, DataType, exp.DataType, exp.DataType.Type],
+        dialect: t.Optional[t.Union[str, Dialect]] = None,
     ) -> Column:
         from sqlframe.base.session import _BaseSession
 

sqlframe/base/function_alternatives.py

@@ -1593,7 +1593,7 @@ def try_to_timestamp_pgtemp(col: ColumnOrName, format: t.Optional[ColumnOrName]
 def typeof_pg_typeof(col: ColumnOrName) -> Column:
     return (
         Column.invoke_anonymous_function(col, "pg_typeof")
-        .cast("regtype", dialect="postgres")
+        .cast(expression.DataType.build("regtype", dialect="postgres"))
         .cast("text")
     )
 
@@ -1603,6 +1603,29 @@ def typeof_from_variant(col: ColumnOrName) -> Column:
     return Column.invoke_anonymous_function(col, "TYPEOF")
 
 
+def regexp_replace_global_option(
+    str: ColumnOrName, pattern: str, replacement: str, position: t.Optional[int] = None
+) -> Column:
+    lit = get_func_from_session("lit")
+
+    if position is not None:
+        return Column.invoke_expression_over_column(
+            str,
+            expression.RegexpReplace,
+            expression=lit(pattern),
+            replacement=lit(replacement),
+            position=lit(position),
+            modifiers=lit("g"),
+        )
+    return Column.invoke_expression_over_column(
+        str,
+        expression.RegexpReplace,
+        expression=lit(pattern),
+        replacement=lit(replacement),
+        modifiers=lit("g"),
+    )
+
+
 def _is_string_using_typeof_varchar(col: ColumnOrName) -> Column:
     typeof = get_func_from_session("typeof")
     lit = get_func_from_session("lit")

sqlframe/duckdb/functions.py

@@ -52,4 +52,5 @@ from sqlframe.base.function_alternatives import (  # noqa
     array_append_list_append as array_append,
     endswith_with_underscore as endswith,
     last_day_with_cast as last_day,
+    regexp_replace_global_option as regexp_replace,
 )

sqlframe/duckdb/functions.pyi

@@ -28,6 +28,7 @@ from sqlframe.base.function_alternatives import (  # noqa
     sequence_from_generate_series as sequence,
     try_element_at_zero_based as try_element_at,
     to_unix_timestamp_include_default_format as to_unix_timestamp,
+    regexp_replace_global_option as regexp_replace,
 )
 from sqlframe.base.functions import (
     abs as abs,
@@ -156,7 +157,6 @@ from sqlframe.base.functions import (
     rank as rank,
     regexp_extract as regexp_extract,
     regexp_like as regexp_like,
-    regexp_replace as regexp_replace,
     repeat as repeat,
     reverse as reverse,
     right as right,

sqlframe/postgres/functions.py

@@ -69,4 +69,5 @@ from sqlframe.base.function_alternatives import (  # noqa
     _is_string_using_typeof_char_varying as _is_string,
     endswith_using_like as endswith,
     last_day_with_cast as last_day,
+    regexp_replace_global_option as regexp_replace,
 )

sqlframe/postgres/functions.pyi

@@ -47,6 +47,7 @@ from sqlframe.base.function_alternatives import (  # noqa
     right_cast_len as right,
     position_cast_start as position,
     try_element_at_zero_based as try_element_at,
+    regexp_replace_global_option as regexp_replace,
 )
 from sqlframe.base.functions import (
     abs as abs,
@@ -148,7 +149,6 @@ from sqlframe.base.functions import (
     radians as radians,
     rank as rank,
     regexp_like as regexp_like,
-    regexp_replace as regexp_replace,
     repeat as repeat,
     reverse as reverse,
     rlike as rlike,

{sqlframe-2.2.0.dist-info → sqlframe-2.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sqlframe
-Version: 2.2.0
+Version: 2.4.0
 Summary: Turning PySpark Into a Universal DataFrame API
 Home-page: https://github.com/eakmanrq/sqlframe
 Author: Ryan Eakman
@@ -17,8 +17,8 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: prettytable (<3.11.0)
-Requires-Dist: sqlglot (<25.11,>=24.0.0)
+Requires-Dist: prettytable (<3.11.1)
+Requires-Dist: sqlglot (<25.17,>=24.0.0)
 Requires-Dist: typing-extensions (<5,>=4.8)
 Provides-Extra: bigquery
 Requires-Dist: google-cloud-bigquery-storage (<3,>=2) ; extra == 'bigquery'
@@ -26,7 +26,7 @@ Requires-Dist: google-cloud-bigquery[pandas] (<4,>=3) ; extra == 'bigquery'
 Provides-Extra: dev
 Requires-Dist: duckdb (<1.1,>=0.9) ; extra == 'dev'
 Requires-Dist: mypy (<1.12,>=1.10.0) ; extra == 'dev'
-Requires-Dist: openai (<1.41,>=1.30) ; extra == 'dev'
+Requires-Dist: openai (<1.43,>=1.30) ; extra == 'dev'
 Requires-Dist: pandas-stubs (<3,>=2) ; extra == 'dev'
 Requires-Dist: pandas (<3,>=2) ; extra == 'dev'
 Requires-Dist: psycopg (<4,>=3.1) ; extra == 'dev'
@@ -35,7 +35,7 @@ Requires-Dist: pyspark (<3.6,>=2) ; extra == 'dev'
 Requires-Dist: pytest-postgresql (<7,>=6) ; extra == 'dev'
 Requires-Dist: pytest-xdist (<3.7,>=3.6) ; extra == 'dev'
 Requires-Dist: pytest (<8.4,>=8.2.0) ; extra == 'dev'
-Requires-Dist: ruff (<0.6,>=0.4.4) ; extra == 'dev'
+Requires-Dist: ruff (<0.7,>=0.4.4) ; extra == 'dev'
 Requires-Dist: types-psycopg2 (<3,>=2.9) ; extra == 'dev'
 Requires-Dist: pre-commit (>=3.5) ; (python_version == "3.8") and extra == 'dev'
 Requires-Dist: pre-commit (<3.9,>=3.7) ; (python_version >= "3.9") and extra == 'dev'
@@ -49,7 +49,7 @@ Provides-Extra: duckdb
 Requires-Dist: duckdb (<1.1,>=0.9) ; extra == 'duckdb'
 Requires-Dist: pandas (<3,>=2) ; extra == 'duckdb'
 Provides-Extra: openai
-Requires-Dist: openai (<1.41,>=1.30) ; extra == 'openai'
+Requires-Dist: openai (<1.43,>=1.30) ; extra == 'openai'
 Provides-Extra: pandas
 Requires-Dist: pandas (<3,>=2) ; extra == 'pandas'
 Provides-Extra: postgres

{sqlframe-2.2.0.dist-info → sqlframe-2.4.0.dist-info}/RECORD

@@ -1,13 +1,13 @@
 sqlframe/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sqlframe/_version.py,sha256=pbL_Q6fDSZl5UbKP04ZFdzrJpd1PO1gH7IwJCwLV7mk,411
+sqlframe/_version.py,sha256=NXpAHvzuYHxlLDJV0489874frLu4dA2joFw1iHLLrOg,411
 sqlframe/base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sqlframe/base/_typing.py,sha256=b2clI5HI1zEZKB_3Msx3FeAJQyft44ubUifJwQRVXyQ,1298
 sqlframe/base/catalog.py,sha256=SzFQalTWdhWzxUY-4ut1f9TfOECp_JmJEgNPfrRKCe0,38457
-sqlframe/base/column.py,sha256=csci74Cdi7S7xpyAUfX6QVvlPDe4uR-S8Ejb50uCIfI,17698
+sqlframe/base/column.py,sha256=C2xj6OHMsJbEgjbI-m5HuIvqHYt2DbbUtCjssKpplNk,17748
 sqlframe/base/dataframe.py,sha256=CHoSK7g9ceuX_4c8yL3nbq1nb15dGt2g_W0UBlBA-Nc,71132
 sqlframe/base/decorators.py,sha256=Jy4bf8MhZ-AJ6CWTj59bBJRqamtLbPC0USUMFrY6g0w,449
 sqlframe/base/exceptions.py,sha256=9Uwvqn2eAkDpqm4BrRgbL61qM-GMCbJEMAW8otxO46s,370
-sqlframe/base/function_alternatives.py,sha256=VpBE1-p4_WifKoqeLJbZQFZ5MWJhNAEYCiQ2eE3hAOk,50015
+sqlframe/base/function_alternatives.py,sha256=IxNBqplehkAEkpzA625Dif-9Xyi4Hrho81A9U262rV0,50714
 sqlframe/base/functions.py,sha256=2dDfPepAuQvLcxwaZbj9qJeEeiqOaYJDI3vPoZXoM1Q,189959
 sqlframe/base/group.py,sha256=TES9CleVmH3x-0X-tqmuUKfCKSWjH5vg1aU3R6dDmFc,4059
 sqlframe/base/normalize.py,sha256=nXAJ5CwxVf4DV0GsH-q1w0p8gmjSMlv96k_ez1eVul8,3880
@@ -39,8 +39,8 @@ sqlframe/duckdb/__init__.py,sha256=t85TA3ufZtL1weQNFmEs8itCSwbJFtw03-p0GT4XGf8,6
 sqlframe/duckdb/catalog.py,sha256=YYYVmetLUaJOdObKw4AJ7L0P-msshkta4xHlcZQ9zEA,4795
 sqlframe/duckdb/column.py,sha256=wkEPcp3xVsH5nC3kpacXqNkRv9htPtBgt-0uFRxIRNs,56
 sqlframe/duckdb/dataframe.py,sha256=QYFFj6a2uYpJUGB-s0MEX2z7HgjfPbL6ZKI4BFjVI6o,1394
-sqlframe/duckdb/functions.py,sha256=ZCmiHegr7484nNmTycxI9f5pDIDhIV3m5zTFK4hMD4Q,1868
-sqlframe/duckdb/functions.pyi,sha256=nU-6a2cfLDkuMCdYrNRLfa6-i8Aa0CxQQ1nLT6roIdI,5813
+sqlframe/duckdb/functions.py,sha256=Ee8o6YFtRdEiq0jNLXxgu5lcbc7Tsg0-lK6oRyxdcjo,1920
+sqlframe/duckdb/functions.pyi,sha256=Qn6j4zwwuBsh6q9341dR3Z5kpeRsgvM4u6Bb6FekKrI,5827
 sqlframe/duckdb/group.py,sha256=IkhbW42Ng1U5YT3FkIdiB4zBqRkW4QyTb-1detY1e_4,383
 sqlframe/duckdb/readwriter.py,sha256=0qZcARQoWYlx9P2m0uS2vuMj_tG_ka4NhHzg7qdaR3I,4597
 sqlframe/duckdb/session.py,sha256=dj8kOTklBHKTyFGc3UwbgFlloPnfIDUf1Sh4uaO1hSg,2340
@@ -51,8 +51,8 @@ sqlframe/postgres/__init__.py,sha256=Sz_MtgV_oh_QhfZTC7iKM07ICUmNcJEDV0kEkSW9ZKU
 sqlframe/postgres/catalog.py,sha256=9XVXXDW04mY_KmeB52NsCny8n0evqdDCBxhGH1Xce6s,8956
 sqlframe/postgres/column.py,sha256=E1tUa62Y5HajkhgFuebU9zohrGyieudcHzTT8gfalio,40
 sqlframe/postgres/dataframe.py,sha256=f-w6UHxZtmeZ5oMbaqJaZ8FrYeOhzyveNlZOK57ke0k,1289
-sqlframe/postgres/functions.py,sha256=ZWfb2sX3ZplT-tBsrsaXDc9lPzXoE-8ZflzP_FUfwDs,2584
-sqlframe/postgres/functions.pyi,sha256=um-qE2g9iPs0-53vJ46lArbfvDqAbFIwrxLJgcrPM_8,5536
+sqlframe/postgres/functions.py,sha256=iujyPmI6frOCD7pymgBby89DezPHm8dmt75sebhzRaw,2636
+sqlframe/postgres/functions.pyi,sha256=9s7W5QPZXPKqxY6XpkxLCHmC5sp1PkJg1LywgpWTz-k,5550
 sqlframe/postgres/group.py,sha256=KUXeSFKWTSH9yCRJAhW85OvjZaG6Zr4In9LR_ie3yGU,391
 sqlframe/postgres/readwriter.py,sha256=L1e3yKXzFVNR_W5s1DHaWol7G8x7l4jcZ5sLGualyMk,870
 sqlframe/postgres/session.py,sha256=LkM35-ADkIh2OSNT6HRVfJ8jLOoFlrdgkSSVhFGMYRc,2495
@@ -107,8 +107,8 @@ sqlframe/standalone/udf.py,sha256=azmgtUjHNIPs0WMVNId05SHwiYn41MKVBhKXsQJ5dmY,27
 sqlframe/standalone/window.py,sha256=6GKPzuxeSapJakBaKBeT9VpED1ACdjggDv9JRILDyV0,35
 sqlframe/testing/__init__.py,sha256=VVCosQhitU74A3NnE52O4mNtGZONapuEXcc20QmSlnQ,132
 sqlframe/testing/utils.py,sha256=9DDYVuocO7tygee3RaajuJNZ24sJwf_LY556kKg7kTw,13011
-sqlframe-2.2.0.dist-info/LICENSE,sha256=VZu79YgW780qxaFJMr0t5ZgbOYEh04xWoxaWOaqIGWk,1068
-sqlframe-2.2.0.dist-info/METADATA,sha256=pqYUjHrpBUzW9MSavQAH-9bj6lQceMd3UPhWrbEP2Ew,7812
-sqlframe-2.2.0.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-sqlframe-2.2.0.dist-info/top_level.txt,sha256=T0_RpoygaZSF6heeWwIDQgaP0varUdSK1pzjeJZRjM8,9
-sqlframe-2.2.0.dist-info/RECORD,,
+sqlframe-2.4.0.dist-info/LICENSE,sha256=VZu79YgW780qxaFJMr0t5ZgbOYEh04xWoxaWOaqIGWk,1068
+sqlframe-2.4.0.dist-info/METADATA,sha256=dfjbBh14A6aUdyiaO4H-rqMVNyChQ7TgncCAwPjjcrQ,7812
+sqlframe-2.4.0.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+sqlframe-2.4.0.dist-info/top_level.txt,sha256=T0_RpoygaZSF6heeWwIDQgaP0varUdSK1pzjeJZRjM8,9
+sqlframe-2.4.0.dist-info/RECORD,,