sqlframe 3.13.3__py3-none-any.whl → 3.13.4__py3-none-any.whl

sqlframe/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '3.13.3'
-__version_tuple__ = version_tuple = (3, 13, 3)
+__version__ = version = '3.13.4'
+__version_tuple__ = version_tuple = (3, 13, 4)

sqlframe/base/dataframe.py

@@ -481,6 +481,7 @@ class BaseDataFrame(t.Generic[SESSION, WRITER, NA, STAT, GROUP_DATA]):
                     cte = cte.transform(replace_id_value, replaced_cte_names)  # type: ignore
                 if cte.alias_or_name in existing_cte_counts:
                     existing_cte_counts[cte.alias_or_name] += 10
+                    # Add unique where filter to ensure that the hash of the CTE is unique
                     cte.set(
                         "this",
                         cte.this.where(
@@ -502,6 +503,7 @@ class BaseDataFrame(t.Generic[SESSION, WRITER, NA, STAT, GROUP_DATA]):
                             new_cte_alias, dialect=self.session.input_dialect, into=exp.TableAlias
                         ),
                     )
+                    existing_cte_counts[new_cte_alias] = 0
                 existing_ctes.append(cte)
         else:
             existing_ctes = ctes
@@ -755,15 +757,20 @@ class BaseDataFrame(t.Generic[SESSION, WRITER, NA, STAT, GROUP_DATA]):
                 ]
                 cte_names_in_join = [x.this for x in join_table_identifiers]
                 # If we have columns that resolve to multiple CTE expressions then we want to use each CTE left-to-right
-                # and therefore we allow multiple columns with the same name in the result. This matches the behavior
-                # of Spark.
+                # (or right to left if a right join) and therefore we allow multiple columns with the same
+                # name in the result. This matches the behavior of Spark.
                 resolved_column_position: t.Dict[exp.Column, int] = {
                     col.copy(): -1 for col in ambiguous_cols
                 }
                 for ambiguous_col in ambiguous_cols:
+                    ctes = (
+                        list(reversed(self.expression.ctes))
+                        if self.expression.args["joins"][0].args.get("side", "") == "right"
+                        else self.expression.ctes
+                    )
                     ctes_with_column = [
                         cte
-                        for cte in self.expression.ctes
+                        for cte in ctes
                         if cte.alias_or_name in cte_names_in_join
                         and ambiguous_col.alias_or_name in cte.this.named_selects
                     ]

{sqlframe-3.13.3.dist-info → sqlframe-3.13.4.dist-info}/METADATA

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

{sqlframe-3.13.3.dist-info → sqlframe-3.13.4.dist-info}/RECORD

@@ -1,10 +1,10 @@
 sqlframe/__init__.py,sha256=wfqm98eLoLid9oV_FzzpG5loKC6LxOhj2lXpfN7SARo,3138
-sqlframe/_version.py,sha256=_uZxcbQuQ0yJZqsBIcuycE0BUozIDNCyjFPeAZ7W1Ek,413
+sqlframe/_version.py,sha256=7_6ZiCN2IEbqvGolC1tvkUZXIMID8-9wKt9GAmhPeyU,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=wRghgieYAA51aw4WuFQWOvl0TFOToZbBhBuIamEzxx4,18011
-sqlframe/base/dataframe.py,sha256=bnF8SYIDhSFPYKchGakRG_oWqgZ-66jKZsdcqUSqCDE,74940
+sqlframe/base/dataframe.py,sha256=Z_ao91TOoOMtyc32VwK5lXaH_-grchMEgk-V4fDBsRQ,75363
 sqlframe/base/decorators.py,sha256=P56cgs8DANxGRIwVs5uOMnDy-BlXZZYMbf4fdnkpWPI,1889
 sqlframe/base/exceptions.py,sha256=9Uwvqn2eAkDpqm4BrRgbL61qM-GMCbJEMAW8otxO46s,370
 sqlframe/base/function_alternatives.py,sha256=8kDCh1cOXtdCcBPYBQ8byXxRAZvphS9N8GDs4txBzGg,52544
@@ -119,8 +119,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.13.3.dist-info/LICENSE,sha256=VZu79YgW780qxaFJMr0t5ZgbOYEh04xWoxaWOaqIGWk,1068
-sqlframe-3.13.3.dist-info/METADATA,sha256=eC3F1wnqViGgocYV5HspArMrR-eX1qu5txOdbDqMurc,8970
-sqlframe-3.13.3.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-sqlframe-3.13.3.dist-info/top_level.txt,sha256=T0_RpoygaZSF6heeWwIDQgaP0varUdSK1pzjeJZRjM8,9
-sqlframe-3.13.3.dist-info/RECORD,,
+sqlframe-3.13.4.dist-info/LICENSE,sha256=VZu79YgW780qxaFJMr0t5ZgbOYEh04xWoxaWOaqIGWk,1068
+sqlframe-3.13.4.dist-info/METADATA,sha256=l3ePEWivSaLRcSXkbArcgj3_ENj6eU1WT_b3XifqndA,8970
+sqlframe-3.13.4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+sqlframe-3.13.4.dist-info/top_level.txt,sha256=T0_RpoygaZSF6heeWwIDQgaP0varUdSK1pzjeJZRjM8,9
+sqlframe-3.13.4.dist-info/RECORD,,