sqlframe 3.17.1__py3-none-any.whl → 3.18.1__py3-none-any.whl

sqlframe/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '3.17.1'
-__version_tuple__ = version_tuple = (3, 17, 1)
+__version__ = version = '3.18.1'
+__version_tuple__ = version_tuple = (3, 18, 1)

sqlframe/base/dataframe.py

@@ -23,7 +23,6 @@ from sqlglot import lineage as sqlglot_lineage
 from sqlglot.helper import ensure_list, flatten, object_to_dict, seq_get
 from sqlglot.optimizer.pushdown_projections import pushdown_projections
 from sqlglot.optimizer.qualify import qualify
-from sqlglot.optimizer.qualify_columns import quote_identifiers
 
 from sqlframe.base.catalog import Column as CatalogColumn
 from sqlframe.base.operations import Operation, operation
@@ -616,6 +615,7 @@ class BaseDataFrame(t.Generic[SESSION, WRITER, NA, STAT, GROUP_DATA]):
         self,
         optimize: bool = True,
         openai_config: t.Optional[t.Union[t.Dict[str, t.Any], OpenAIConfig]] = None,
+        quote_identifiers: bool = True,
     ) -> t.List[exp.Expression]:
         df = self._resolve_pending_hints()
         select_expressions = df._get_select_expressions()
@@ -644,7 +644,7 @@ class BaseDataFrame(t.Generic[SESSION, WRITER, NA, STAT, GROUP_DATA]):
             if optimize:
                 select_expression = t.cast(
                     exp.Select,
-                    self.session._optimize(select_expression),
+                    self.session._optimize(select_expression, quote_identifiers=quote_identifiers),
                 )
             elif openai_config:
                 qualify(
@@ -713,8 +713,9 @@ class BaseDataFrame(t.Generic[SESSION, WRITER, NA, STAT, GROUP_DATA]):
         dialect: DialectType = ...,
         optimize: bool = ...,
         pretty: bool = ...,
+        quote_identifiers: bool = ...,
         *,
-        as_list: t.Literal[False],
+        as_list: t.Literal[False] = False,
         **kwargs: t.Any,
     ) -> str: ...
 
@@ -724,6 +725,7 @@ class BaseDataFrame(t.Generic[SESSION, WRITER, NA, STAT, GROUP_DATA]):
         dialect: DialectType = ...,
         optimize: bool = ...,
         pretty: bool = ...,
+        quote_identifiers: bool = ...,
         *,
         as_list: t.Literal[True],
         **kwargs: t.Any,
@@ -734,14 +736,23 @@ class BaseDataFrame(t.Generic[SESSION, WRITER, NA, STAT, GROUP_DATA]):
         dialect: DialectType = None,
         optimize: bool = True,
         pretty: bool = True,
+        quote_identifiers: bool = True,
         openai_config: t.Optional[t.Union[t.Dict[str, t.Any], OpenAIConfig]] = None,
         as_list: bool = False,
         **kwargs,
     ) -> t.Union[str, t.List[str]]:
         dialect = Dialect.get_or_raise(dialect) if dialect else self.session.output_dialect
         results = []
-        for expression in self._get_expressions(optimize=optimize, openai_config=openai_config):
-            sql = self.session._to_sql(expression, dialect=dialect, pretty=pretty, **kwargs)
+        for expression in self._get_expressions(
+            optimize=optimize, openai_config=openai_config, quote_identifiers=quote_identifiers
+        ):
+            sql = self.session._to_sql(
+                expression,
+                dialect=dialect,
+                pretty=pretty,
+                quote_identifiers=quote_identifiers,
+                **kwargs,
+            )
             if openai_config:
                 assert isinstance(openai_config, OpenAIConfig)
                 verify_openai_installed()
@@ -1055,7 +1066,7 @@ class BaseDataFrame(t.Generic[SESSION, WRITER, NA, STAT, GROUP_DATA]):
                         left_col.sql(dialect=self.session.input_dialect),
                         right_col.sql(dialect=self.session.input_dialect),
                     ).alias(left_col.alias_or_name)
-                    if how == "full"
+                    if join_type == "full outer"
                     else left_col.alias_or_name
                     for left_col, right_col in join_column_pairs
                 ]

sqlframe/base/session.py

@@ -16,6 +16,7 @@ from sqlglot import Dialect, exp
 from sqlglot.dialects.dialect import DialectType, NormalizationStrategy
 from sqlglot.expressions import parse_identifier
 from sqlglot.helper import ensure_list, seq_get
+from sqlglot.optimizer import RULES as OPTIMIZER_RULES
 from sqlglot.optimizer import optimize
 from sqlglot.optimizer.normalize_identifiers import normalize_identifiers
 from sqlglot.optimizer.qualify import qualify as qualify_func
@@ -556,6 +557,7 @@ class _BaseSession(t.Generic[CATALOG, READER, WRITER, DF, TABLE, CONN, UDF_REGIS
         dialect: DialectType = None,
         quote_identifiers: bool = True,
         pretty: bool = False,
+        **kwargs,
     ) -> str:
         return normalize_string(
             sql,
@@ -574,9 +576,19 @@ class _BaseSession(t.Generic[CATALOG, READER, WRITER, DF, TABLE, CONN, UDF_REGIS
     ) -> exp.Expression:
         dialect = dialect or self.input_dialect
         normalize_identifiers(expression, dialect=dialect)
+        rules = list(OPTIMIZER_RULES)
         if quote_identifiers:
             quote_identifiers_func(expression, dialect=dialect)
-        return optimize(expression, dialect=dialect, schema=self.catalog._schema, infer_schema=True)
+        else:
+            rules.remove(quote_identifiers_func)
+        return optimize(
+            expression,
+            dialect=dialect,
+            schema=self.catalog._schema,
+            infer_schema=True,
+            quote_identifiers=quote_identifiers,
+            rules=rules,  # type: ignore
+        )
 
     def _execute(self, sql: str) -> None:
         self._cur.execute(sql)

{sqlframe-3.17.1.dist-info → sqlframe-3.18.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sqlframe
-Version: 3.17.1
+Version: 3.18.1
 Summary: Turning PySpark Into a Universal DataFrame API
 Home-page: https://github.com/eakmanrq/sqlframe
 Author: Ryan Eakman

{sqlframe-3.17.1.dist-info → sqlframe-3.18.1.dist-info}/RECORD

@@ -1,10 +1,10 @@
 sqlframe/__init__.py,sha256=wfqm98eLoLid9oV_FzzpG5loKC6LxOhj2lXpfN7SARo,3138
-sqlframe/_version.py,sha256=c661E5W7jBk0KLcY4zPGbS19JVM6PufmNidbT4Hw5Ok,413
+sqlframe/_version.py,sha256=JmEzWKZLlLojC8WbH3nhT4nosf_YSBJc7WQO-Nt017Q,413
 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=oHVwkSWABO3ZlAbgBShsxSSlgbI06BOup5XJrRhgqJI,18097
-sqlframe/base/dataframe.py,sha256=KcB9HhnXuPojHOpksvYwmgIwcXUD6g9--EEvEBytDuY,79010
+sqlframe/base/dataframe.py,sha256=mKXbIKYiKH5mh6qj0Dg7L_znmCL85q9kHlmHtCW4kJ4,79352
 sqlframe/base/decorators.py,sha256=ms-CvDOIW3T8IVB9VqDmLwAiaEsqXLYRXEqVQaxktiM,1890
 sqlframe/base/exceptions.py,sha256=9Uwvqn2eAkDpqm4BrRgbL61qM-GMCbJEMAW8otxO46s,370
 sqlframe/base/function_alternatives.py,sha256=NV31IaEhVYmfUSWetAEFISAvLzs2DxQ7bp-iMNgj0hQ,53786
@@ -13,7 +13,7 @@ sqlframe/base/group.py,sha256=fsyG5990_Pd7gFPjTFrH9IEoAquL_wEkVpIlBAIkZJU,4091
 sqlframe/base/normalize.py,sha256=nXAJ5CwxVf4DV0GsH-q1w0p8gmjSMlv96k_ez1eVul8,3880
 sqlframe/base/operations.py,sha256=xSPw74e59wYvNd6U1AlwziNCTG6Aftrbl4SybN9u9VE,3450
 sqlframe/base/readerwriter.py,sha256=w8926cqIrXF7NGHiINw5UHzP_3xpjsqbijTBTzycBRM,26605
-sqlframe/base/session.py,sha256=gvg_yZaivR0N6Kyo3tiUitoTc9NSYekGp0-x-fPhAqA,26967
+sqlframe/base/session.py,sha256=aSp83JXEW_zEMfe1JxPFcjqq2yUThwYboCnk0LqhUko,27290
 sqlframe/base/table.py,sha256=rCeh1W5SWbtEVfkLAUiexzrZwNgmZeptLEmLcM1ABkE,6961
 sqlframe/base/transforms.py,sha256=y0j3SGDz3XCmNGrvassk1S-owllUWfkHyMgZlY6SFO4,467
 sqlframe/base/types.py,sha256=iBNk9bpFtb2NBIogYS8i7OlQZMRvpR6XxqzBebsjQDU,12280
@@ -129,8 +129,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=PFsGZpwNUE_4-g_f43_vstTqsK0AQ2lBneb5Eb6NkFo,13008
-sqlframe-3.17.1.dist-info/LICENSE,sha256=VZu79YgW780qxaFJMr0t5ZgbOYEh04xWoxaWOaqIGWk,1068
-sqlframe-3.17.1.dist-info/METADATA,sha256=7YgdpN6-xqFqBAQlqR5V8IaeByzgFlcW9aQl1fG8Ey0,8970
-sqlframe-3.17.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-sqlframe-3.17.1.dist-info/top_level.txt,sha256=T0_RpoygaZSF6heeWwIDQgaP0varUdSK1pzjeJZRjM8,9
-sqlframe-3.17.1.dist-info/RECORD,,
+sqlframe-3.18.1.dist-info/LICENSE,sha256=VZu79YgW780qxaFJMr0t5ZgbOYEh04xWoxaWOaqIGWk,1068
+sqlframe-3.18.1.dist-info/METADATA,sha256=4WPETWw1JyvNuEWecY3n3KbkMcU1nDtgRkdzXKxKoBU,8970
+sqlframe-3.18.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+sqlframe-3.18.1.dist-info/top_level.txt,sha256=T0_RpoygaZSF6heeWwIDQgaP0varUdSK1pzjeJZRjM8,9
+sqlframe-3.18.1.dist-info/RECORD,,