sqlframe 3.2.0__tar.gz → 3.3.1__tar.gz

{sqlframe-3.2.0 → sqlframe-3.3.1}/PKG-INFO

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

{sqlframe-3.2.0 → sqlframe-3.3.1}/setup.py

@@ -20,7 +20,7 @@ setup(
     python_requires=">=3.8",
     install_requires=[
         "prettytable<3.11.1",
-        "sqlglot>=24.0.0,<25.19",
+        "sqlglot>=24.0.0,<25.23",
         "typing_extensions>=4.8,<5",
     ],
     extras_require={
@@ -29,10 +29,10 @@ setup(
             "google-cloud-bigquery-storage>=2,<3",
         ],
         "dev": [
-            "duckdb>=0.9,<1.1",
+            "duckdb>=0.9,<1.2",
             "findspark>=2,<3",
             "mypy>=1.10.0,<1.12",
-            "openai>=1.30,<1.44",
+            "openai>=1.30,<1.48",
             "pandas>=2,<3",
             "pandas-stubs>=2,<3",
             "psycopg>=3.1,<4",
@@ -54,11 +54,11 @@ setup(
             "pymdown-extensions",
         ],
         "duckdb": [
-            "duckdb>=0.9,<1.1",
+            "duckdb>=0.9,<1.2",
             "pandas>=2,<3",
         ],
         "openai": [
-            "openai>=1.30,<1.44",
+            "openai>=1.30,<1.48",
         ],
         "pandas": [
             "pandas>=2,<3",

{sqlframe-3.2.0 → sqlframe-3.3.1}/sqlframe/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '3.2.0'
-__version_tuple__ = version_tuple = (3, 2, 0)
+__version__ = version = '3.3.1'
+__version_tuple__ = version_tuple = (3, 3, 1)

{sqlframe-3.2.0 → sqlframe-3.3.1}/sqlframe/base/dataframe.py

@@ -1627,7 +1627,11 @@ class _BaseDataFrame(t.Generic[SESSION, WRITER, NA, STAT, GROUP_DATA]):
 
     def createOrReplaceTempView(self, name: str) -> None:
         name = normalize_string(name, from_dialect="input")
-        self.session.temp_views[name] = self.copy()._convert_leaf_to_cte()
+        df = self.copy()._convert_leaf_to_cte()
+        self.session.temp_views[name] = df
+        self.session.catalog.add_table(
+            name, [x.alias_or_name for x in self._get_outer_select_columns(df.expression)]
+        )
 
     def count(self) -> int:
         if not self.session._has_connection:

{sqlframe-3.2.0 → sqlframe-3.3.1}/sqlframe/base/functions.py

@@ -2052,7 +2052,7 @@ def cardinality(col: ColumnOrName) -> Column:
 
 @meta()
 def char(col: ColumnOrName) -> Column:
-    return Column.invoke_expression_over_column(col, expression.Chr)
+    return Column(expression.Chr(expressions=Column.ensure_col(col).expression))
 
 
 @meta(unsupported_engines="*")
@@ -2703,7 +2703,7 @@ def inline(col: ColumnOrName) -> Column:
     |  3|  4|
     +---+---+
     """
-    return Column.invoke_anonymous_function(col, "inline")
+    return Column.invoke_expression_over_column(col, expression.Inline)
 
 
 @meta(unsupported_engines="*")

{sqlframe-3.2.0 → sqlframe-3.3.1}/sqlframe/base/session.py

@@ -391,7 +391,11 @@ class _BaseSession(t.Generic[CATALOG, READER, WRITER, DF, CONN, UDF_REGISTRATION
         )
         if qualify:
             expression = qualify_func(
-                expression, dialect=dialect, quote_identifiers=False, identify=False
+                expression,
+                dialect=dialect,
+                quote_identifiers=False,
+                identify=False,
+                schema=self.catalog._schema,
             )
         if self.temp_views:
             replacement_mapping = {}

{sqlframe-3.2.0 → sqlframe-3.3.1}/sqlframe/base/util.py

@@ -306,7 +306,6 @@ def quote_preserving_alias_or_name(col: t.Union[exp.Column, exp.Alias]) -> str:
 def sqlglot_to_spark(sqlglot_dtype: exp.DataType) -> types.DataType:
     from sqlframe.base import types
 
-    sqlglot_to_spark
     primitive_mapping = {
         exp.DataType.Type.VARCHAR: types.VarcharType,
         exp.DataType.Type.CHAR: types.CharType,
@@ -325,6 +324,7 @@ def sqlglot_to_spark(sqlglot_dtype: exp.DataType) -> types.DataType:
         exp.DataType.Type.TIMESTAMPLTZ: types.TimestampType,
         exp.DataType.Type.TIMESTAMPNTZ: types.TimestampType,
         exp.DataType.Type.DATE: types.DateType,
+        exp.DataType.Type.JSON: types.StringType,
     }
     if sqlglot_dtype.this in primitive_mapping:
         pyspark_class = primitive_mapping[sqlglot_dtype.this]

{sqlframe-3.2.0 → sqlframe-3.3.1}/sqlframe/duckdb/readwriter.py

@@ -93,6 +93,8 @@ class DuckDBDataFrameReader(_BaseDataFrameReader["DuckDBSession", "DuckDBDataFra
         else:
             from_clause = f"'{path}'"
         df = self.session.sql(exp.select(*select_columns).from_(from_clause), qualify=False)
+        if select_columns == [exp.Star()]:
+            return self.load(path=path, format=format, schema=df.schema, **options)
         self.session._last_loaded_file = path  # type: ignore
         return df
 

{sqlframe-3.2.0 → sqlframe-3.3.1}/sqlframe/duckdb/session.py

@@ -54,8 +54,14 @@ class DuckDBSession(
 
     @classmethod
     def _try_get_map(cls, value: t.Any) -> t.Optional[t.Dict[str, t.Any]]:
-        if value and isinstance(value, dict) and "key" in value and "value" in value:
-            return dict(zip(value["key"], value["value"]))
+        if value and isinstance(value, dict):
+            # DuckDB < 1.1.0 support
+            if "key" in value and "value" in value:
+                return dict(zip(value["key"], value["value"]))
+            # DuckDB >= 1.1.0 support
+            # If a key is not a string then it must not represent a column and therefore must be a map
+            if len([k for k in value if not isinstance(k, str)]) > 0:
+                return value
         return None
 
     def _execute(self, sql: str) -> None:

{sqlframe-3.2.0 → sqlframe-3.3.1}/sqlframe/spark/catalog.py

@@ -569,7 +569,9 @@ class SparkCatalog(
         return [
             Table(
                 name=normalize_string(x.name, from_dialect="execution", to_dialect="output"),
-                catalog=normalize_string(x.catalog, from_dialect="execution", to_dialect="output"),
+                catalog=normalize_string(x.catalog, from_dialect="execution", to_dialect="output")
+                if x.catalog
+                else None,
                 namespace=[
                     normalize_string(y, from_dialect="execution", to_dialect="output")
                     for y in x.namespace

{sqlframe-3.2.0 → sqlframe-3.3.1}/sqlframe.egg-info/PKG-INFO

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

{sqlframe-3.2.0 → sqlframe-3.3.1}/sqlframe.egg-info/SOURCES.txt

@@ -185,6 +185,105 @@ tests/fixtures/employee_delta/part-00008-89ccad8d-df73-4ad5-8850-82ef3884db60-c0
 tests/fixtures/employee_delta/part-00010-812b3382-8c7f-4c4e-9bcd-09ce8664f6e0-c000.snappy.parquet
 tests/fixtures/employee_delta/_delta_log/.00000000000000000000.json.crc
 tests/fixtures/employee_delta/_delta_log/00000000000000000000.json
+tests/fixtures/tpcds/tpcds1.sql
+tests/fixtures/tpcds/tpcds10.sql
+tests/fixtures/tpcds/tpcds11.sql
+tests/fixtures/tpcds/tpcds12.sql
+tests/fixtures/tpcds/tpcds13.sql
+tests/fixtures/tpcds/tpcds14.sql
+tests/fixtures/tpcds/tpcds15.sql
+tests/fixtures/tpcds/tpcds16.sql
+tests/fixtures/tpcds/tpcds17.sql
+tests/fixtures/tpcds/tpcds18.sql
+tests/fixtures/tpcds/tpcds19.sql
+tests/fixtures/tpcds/tpcds2.sql
+tests/fixtures/tpcds/tpcds20.sql
+tests/fixtures/tpcds/tpcds21.sql
+tests/fixtures/tpcds/tpcds22.sql
+tests/fixtures/tpcds/tpcds23.sql
+tests/fixtures/tpcds/tpcds24.sql
+tests/fixtures/tpcds/tpcds25.sql
+tests/fixtures/tpcds/tpcds26.sql
+tests/fixtures/tpcds/tpcds27.sql
+tests/fixtures/tpcds/tpcds28.sql
+tests/fixtures/tpcds/tpcds29.sql
+tests/fixtures/tpcds/tpcds3.sql
+tests/fixtures/tpcds/tpcds30.sql
+tests/fixtures/tpcds/tpcds31.sql
+tests/fixtures/tpcds/tpcds32.sql
+tests/fixtures/tpcds/tpcds33.sql
+tests/fixtures/tpcds/tpcds34.sql
+tests/fixtures/tpcds/tpcds35.sql
+tests/fixtures/tpcds/tpcds36.sql
+tests/fixtures/tpcds/tpcds37.sql
+tests/fixtures/tpcds/tpcds38.sql
+tests/fixtures/tpcds/tpcds39.sql
+tests/fixtures/tpcds/tpcds4.sql
+tests/fixtures/tpcds/tpcds40.sql
+tests/fixtures/tpcds/tpcds41.sql
+tests/fixtures/tpcds/tpcds42.sql
+tests/fixtures/tpcds/tpcds43.sql
+tests/fixtures/tpcds/tpcds44.sql
+tests/fixtures/tpcds/tpcds45.sql
+tests/fixtures/tpcds/tpcds46.sql
+tests/fixtures/tpcds/tpcds47.sql
+tests/fixtures/tpcds/tpcds48.sql
+tests/fixtures/tpcds/tpcds49.sql
+tests/fixtures/tpcds/tpcds5.sql
+tests/fixtures/tpcds/tpcds50.sql
+tests/fixtures/tpcds/tpcds51.sql
+tests/fixtures/tpcds/tpcds52.sql
+tests/fixtures/tpcds/tpcds53.sql
+tests/fixtures/tpcds/tpcds54.sql
+tests/fixtures/tpcds/tpcds55.sql
+tests/fixtures/tpcds/tpcds56.sql
+tests/fixtures/tpcds/tpcds57.sql
+tests/fixtures/tpcds/tpcds58.sql
+tests/fixtures/tpcds/tpcds59.sql
+tests/fixtures/tpcds/tpcds6.sql
+tests/fixtures/tpcds/tpcds60.sql
+tests/fixtures/tpcds/tpcds61.sql
+tests/fixtures/tpcds/tpcds62.sql
+tests/fixtures/tpcds/tpcds63.sql
+tests/fixtures/tpcds/tpcds64.sql
+tests/fixtures/tpcds/tpcds65.sql
+tests/fixtures/tpcds/tpcds66.sql
+tests/fixtures/tpcds/tpcds67.sql
+tests/fixtures/tpcds/tpcds68.sql
+tests/fixtures/tpcds/tpcds69.sql
+tests/fixtures/tpcds/tpcds7.sql
+tests/fixtures/tpcds/tpcds70.sql
+tests/fixtures/tpcds/tpcds71.sql
+tests/fixtures/tpcds/tpcds72.sql
+tests/fixtures/tpcds/tpcds73.sql
+tests/fixtures/tpcds/tpcds74.sql
+tests/fixtures/tpcds/tpcds75.sql
+tests/fixtures/tpcds/tpcds76.sql
+tests/fixtures/tpcds/tpcds77.sql
+tests/fixtures/tpcds/tpcds78.sql
+tests/fixtures/tpcds/tpcds79.sql
+tests/fixtures/tpcds/tpcds8.sql
+tests/fixtures/tpcds/tpcds80.sql
+tests/fixtures/tpcds/tpcds81.sql
+tests/fixtures/tpcds/tpcds82.sql
+tests/fixtures/tpcds/tpcds83.sql
+tests/fixtures/tpcds/tpcds84.sql
+tests/fixtures/tpcds/tpcds85.sql
+tests/fixtures/tpcds/tpcds86.sql
+tests/fixtures/tpcds/tpcds87.sql
+tests/fixtures/tpcds/tpcds88.sql
+tests/fixtures/tpcds/tpcds89.sql
+tests/fixtures/tpcds/tpcds9.sql
+tests/fixtures/tpcds/tpcds90.sql
+tests/fixtures/tpcds/tpcds91.sql
+tests/fixtures/tpcds/tpcds92.sql
+tests/fixtures/tpcds/tpcds93.sql
+tests/fixtures/tpcds/tpcds94.sql
+tests/fixtures/tpcds/tpcds95.sql
+tests/fixtures/tpcds/tpcds96.sql
+tests/fixtures/tpcds/tpcds97.sql
+tests/fixtures/tpcds/tpcds98.sql
+tests/fixtures/tpcds/tpcds99.sql
 tests/integration/__init__.py
 tests/integration/fixtures.py
 tests/integration/test_int_dataframe.py
@@ -210,6 +309,7 @@ tests/integration/engines/duck/test_duckdb_dataframe.py
 tests/integration/engines/duck/test_duckdb_reader.py
 tests/integration/engines/duck/test_duckdb_session.py
 tests/integration/engines/duck/test_duckdb_udf.py
+tests/integration/engines/duck/test_tpcds.py
 tests/integration/engines/postgres/__init__.py
 tests/integration/engines/postgres/test_postgres_activate.py
 tests/integration/engines/postgres/test_postgres_catalog.py

{sqlframe-3.2.0 → sqlframe-3.3.1}/sqlframe.egg-info/requires.txt

@@ -1,5 +1,5 @@
 prettytable<3.11.1
-sqlglot<25.19,>=24.0.0
+sqlglot<25.23,>=24.0.0
 typing_extensions<5,>=4.8
 
 [bigquery]
@@ -7,10 +7,10 @@ google-cloud-bigquery-storage<3,>=2
 google-cloud-bigquery[pandas]<4,>=3
 
 [dev]
-duckdb<1.1,>=0.9
+duckdb<1.2,>=0.9
 findspark<3,>=2
 mypy<1.12,>=1.10.0
-openai<1.44,>=1.30
+openai<1.48,>=1.30
 pandas-stubs<3,>=2
 pandas<3,>=2
 psycopg<4,>=3.1
@@ -36,11 +36,11 @@ mkdocs==1.4.2
 pymdown-extensions
 
 [duckdb]
-duckdb<1.1,>=0.9
+duckdb<1.2,>=0.9
 pandas<3,>=2
 
 [openai]
-openai<1.44,>=1.30
+openai<1.48,>=1.30
 
 [pandas]
 pandas<3,>=2

{sqlframe-3.2.0 → sqlframe-3.3.1}/tests/common_fixtures.py

@@ -2,12 +2,15 @@ from __future__ import annotations
 
 import os
 import typing as t
+from pathlib import Path
 
+import duckdb
 import pytest
 from pyspark import SparkConf
 from pyspark.sql import SparkSession as PySparkSession
 from pytest_postgresql.janitor import DatabaseJanitor
 
+from sqlframe.base.session import _BaseSession
 from sqlframe.bigquery.session import BigQuerySession
 from sqlframe.duckdb.session import DuckDBSession
 from sqlframe.postgres.session import PostgresSession
@@ -28,8 +31,57 @@ if t.TYPE_CHECKING:
     from tests.types import EmployeeData
 
 
+def load_tpcds(paths: t.List[Path], session: t.Union[_BaseSession, PySparkSession]):
+    for path in paths:
+        table_name = path.name
+        session.read.parquet(str(path / "*.parquet")).createOrReplaceTempView(table_name)
+
+
 @pytest.fixture(scope="session")
-def pyspark_session(tmp_path_factory) -> PySparkSession:
+def gen_tpcds(tmp_path_factory) -> t.List[Path]:
+    path_root = tmp_path_factory.mktemp("tpcds")
+    results = []
+    tables = [
+        "web_site",
+        "web_sales",
+        "web_returns",
+        "web_page",
+        "warehouse",
+        "time_dim",
+        "store_sales",
+        "store_returns",
+        "store",
+        "ship_mode",
+        "reason",
+        "promotion",
+        "item",
+        "inventory",
+        "income_band",
+        "household_demographics",
+        "date_dim",
+        "customer_demographics",
+        "customer_address",
+        "customer",
+        "catalog_sales",
+        "catalog_returns",
+        "catalog_page",
+        "call_center",
+    ]
+    con = duckdb.connect()
+    con.sql("CALL dsdgen(sf=0.01)")
+    for table in tables:
+        path = path_root / table
+        path.mkdir(parents=True)
+        con.sql(
+            f"COPY (SELECT * FROM {table}) TO '{path}' (FORMAT PARQUET, PER_THREAD_OUTPUT TRUE)"
+        )
+        results.append(path)
+    con.close()
+    return results
+
+
+@pytest.fixture(scope="session")
+def pyspark_session(tmp_path_factory, gen_tpcds: t.List[Path]) -> PySparkSession:
     data_dir = tmp_path_factory.mktemp("spark_connection")
     derby_dir = tmp_path_factory.mktemp("derby")
     spark = (
@@ -49,6 +101,7 @@ def pyspark_session(tmp_path_factory) -> PySparkSession:
     spark.sql("CREATE TABLE db1.table1 (id INTEGER, name STRING)")
     spark.catalog.registerFunction("add", lambda x, y: x + y)
     spark.catalog.setCurrentDatabase("db1")
+    load_tpcds(gen_tpcds, spark)
     return spark
 
 
@@ -64,11 +117,7 @@ def spark_session(pyspark_session: PySparkSession) -> SparkSession:
 
 @pytest.fixture(scope="function")
 def duckdb_session() -> DuckDBSession:
-    from duckdb import connect
-
-    # https://github.com/duckdb/duckdb/issues/11404
-    connection = connect()
-    connection.sql("set TimeZone = 'UTC'")
+    connection = duckdb.connect(config={"TimeZone": "UTC"})
     return DuckDBSession(conn=connection)
 
 

sqlframe-3.3.1/tests/fixtures/tpcds/tpcds1.sql

@@ -0,0 +1,23 @@
+WITH  customer_total_return  AS
+    (SELECT  sr_customer_sk  AS  ctr_customer_sk,
+                    sr_store_sk  AS  ctr_store_sk,
+                    sum(sr_return_amt)  AS  ctr_total_return
+      FROM  store_returns,
+                date_dim
+      WHERE  sr_returned_date_sk  =  d_date_sk
+          AND  d_year  =  2000
+      GROUP  BY  sr_customer_sk,
+                        sr_store_sk)
+SELECT  c_customer_id
+FROM  customer_total_return  ctr1,
+          store,
+          customer
+WHERE  ctr1.ctr_total_return  >
+        (SELECT  avg(ctr_total_return)*1.2
+          FROM  customer_total_return  ctr2
+          WHERE  ctr1.ctr_store_sk  =  ctr2.ctr_store_sk)
+    AND  s_store_sk  =  ctr1.ctr_store_sk
+    AND  s_state  =  'TN'
+    AND  ctr1.ctr_customer_sk  =  c_customer_sk
+ORDER  BY  c_customer_id
+LIMIT  100;

sqlframe-3.3.1/tests/fixtures/tpcds/tpcds10.sql

@@ -0,0 +1,65 @@
+SELECT  cd_gender,
+              cd_marital_status,
+              cd_education_status,
+              count(*)  cnt1,
+              cd_purchase_estimate,
+              count(*)  cnt2,
+              cd_credit_rating,
+              count(*)  cnt3,
+              cd_dep_count,
+              count(*)  cnt4,
+              cd_dep_employed_count,
+              count(*)  cnt5,
+              cd_dep_college_count,
+              count(*)  cnt6
+FROM  customer  c,
+          customer_address  ca,
+          customer_demographics
+WHERE  c.c_current_addr_sk  =  ca.ca_address_sk
+    AND  ca_county  IN  ('Rush  County',
+                                        'Toole  County',
+                                        'Jefferson  County',
+                                        'Dona  Ana  County',
+                                        'La  Porte  County')
+    AND  cd_demo_sk  =  c.c_current_cdemo_sk
+    AND  EXISTS
+        (SELECT  *
+          FROM  store_sales,
+                    date_dim
+          WHERE  c.c_customer_sk  =  ss_customer_sk
+              AND  ss_sold_date_sk  =  d_date_sk
+              AND  d_year  =  2002
+              AND  d_moy  BETWEEN  1  AND  1+3)
+    AND  (EXISTS
+                  (SELECT  *
+                    FROM  web_sales,
+                              date_dim
+                    WHERE  c.c_customer_sk  =  ws_bill_customer_sk
+                        AND  ws_sold_date_sk  =  d_date_sk
+                        AND  d_year  =  2002
+                        AND  d_moy  BETWEEN  1  AND  1+3)
+              OR  EXISTS
+                  (SELECT  *
+                    FROM  catalog_sales,
+                              date_dim
+                    WHERE  c.c_customer_sk  =  cs_ship_customer_sk
+                        AND  cs_sold_date_sk  =  d_date_sk
+                        AND  d_year  =  2002
+                        AND  d_moy  BETWEEN  1  AND  1+3))
+GROUP  BY  cd_gender,
+                  cd_marital_status,
+                  cd_education_status,
+                  cd_purchase_estimate,
+                  cd_credit_rating,
+                  cd_dep_count,
+                  cd_dep_employed_count,
+                  cd_dep_college_count
+ORDER  BY  cd_gender,
+                  cd_marital_status,
+                  cd_education_status,
+                  cd_purchase_estimate,
+                  cd_credit_rating,
+                  cd_dep_count,
+                  cd_dep_employed_count,
+                  cd_dep_college_count
+LIMIT  100;

sqlframe-3.3.1/tests/fixtures/tpcds/tpcds11.sql

@@ -0,0 +1,80 @@
+WITH  year_total  AS
+    (SELECT  c_customer_id  customer_id,
+                    c_first_name  customer_first_name,
+                    c_last_name  customer_last_name,
+                    c_preferred_cust_flag  customer_preferred_cust_flag,
+                    c_birth_country  customer_birth_country,
+                    c_login  customer_login,
+                    c_email_address  customer_email_address,
+                    d_year  dyear,
+                    sum(ss_ext_list_price-ss_ext_discount_amt)  year_total,
+                    's'  sale_type
+      FROM  customer,
+                store_sales,
+                date_dim
+      WHERE  c_customer_sk  =  ss_customer_sk
+          AND  ss_sold_date_sk  =  d_date_sk
+      GROUP  BY  c_customer_id,
+                        c_first_name,
+                        c_last_name,
+                        c_preferred_cust_flag,
+                        c_birth_country,
+                        c_login,
+                        c_email_address,
+                        d_year
+      UNION  ALL  SELECT  c_customer_id  customer_id,
+                                        c_first_name  customer_first_name,
+                                        c_last_name  customer_last_name,
+                                        c_preferred_cust_flag  customer_preferred_cust_flag,
+                                        c_birth_country  customer_birth_country,
+                                        c_login  customer_login,
+                                        c_email_address  customer_email_address,
+                                        d_year  dyear,
+                                        sum(ws_ext_list_price-ws_ext_discount_amt)  year_total,
+                                        'w'  sale_type
+      FROM  customer,
+                web_sales,
+                date_dim
+      WHERE  c_customer_sk  =  ws_bill_customer_sk
+          AND  ws_sold_date_sk  =  d_date_sk
+      GROUP  BY  c_customer_id,
+                        c_first_name,
+                        c_last_name,
+                        c_preferred_cust_flag,
+                        c_birth_country,
+                        c_login,
+                        c_email_address,
+                        d_year)
+SELECT  t_s_secyear.customer_id,
+              t_s_secyear.customer_first_name,
+              t_s_secyear.customer_last_name,
+              t_s_secyear.customer_preferred_cust_flag
+FROM  year_total  t_s_firstyear,
+          year_total  t_s_secyear,
+          year_total  t_w_firstyear,
+          year_total  t_w_secyear
+WHERE  t_s_secyear.customer_id  =  t_s_firstyear.customer_id
+    AND  t_s_firstyear.customer_id  =  t_w_secyear.customer_id
+    AND  t_s_firstyear.customer_id  =  t_w_firstyear.customer_id
+    AND  t_s_firstyear.sale_type  =  's'
+    AND  t_w_firstyear.sale_type  =  'w'
+    AND  t_s_secyear.sale_type  =  's'
+    AND  t_w_secyear.sale_type  =  'w'
+    AND  t_s_firstyear.dyear  =  2001
+    AND  t_s_secyear.dyear  =  2001+1
+    AND  t_w_firstyear.dyear  =  2001
+    AND  t_w_secyear.dyear  =  2001+1
+    AND  t_s_firstyear.year_total  >  0
+    AND  t_w_firstyear.year_total  >  0
+    AND  CASE
+                    WHEN  t_w_firstyear.year_total  >  0  THEN  (t_w_secyear.year_total*1.0000)  /  t_w_firstyear.year_total
+                    ELSE  0.0
+            END  >  CASE
+                                WHEN  t_s_firstyear.year_total  >  0  THEN  (t_s_secyear.year_total*1.0000)  /  t_s_firstyear.year_total
+                                ELSE  0.0
+                        END
+ORDER  BY  t_s_secyear.customer_id  NULLS  FIRST,
+                  t_s_secyear.customer_first_name  NULLS  FIRST,
+                  t_s_secyear.customer_last_name  NULLS  FIRST,
+                  t_s_secyear.customer_preferred_cust_flag  NULLS  FIRST
+LIMIT  100;

sqlframe-3.3.1/tests/fixtures/tpcds/tpcds12.sql

@@ -0,0 +1,27 @@
+SELECT  i_item_id,
+              i_item_desc,
+              i_category,
+              i_class,
+              i_current_price,
+              sum(ws_ext_sales_price)  AS  itemrevenue,
+              sum(ws_ext_sales_price)*100.0000/sum(sum(ws_ext_sales_price))  OVER  (PARTITION  BY  i_class)  AS  revenueratio
+FROM  web_sales,
+          item,
+          date_dim
+WHERE  ws_item_sk  =  i_item_sk
+    AND  i_category  IN  ('Sports',
+                                          'Books',
+                                          'Home')
+    AND  ws_sold_date_sk  =  d_date_sk
+    AND  d_date  BETWEEN  cast('1999-02-22'  AS  date)  AND  cast('1999-03-24'  AS  date)
+GROUP  BY  i_item_id,
+                  i_item_desc,
+                  i_category,
+                  i_class,
+                  i_current_price
+ORDER  BY  i_category,
+                  i_class,
+                  i_item_id,
+                  i_item_desc,
+                  revenueratio
+LIMIT  100;

sqlframe-3.3.1/tests/fixtures/tpcds/tpcds13.sql

@@ -0,0 +1,41 @@
+SELECT  avg(ss_quantity)  avg1,
+              avg(ss_ext_sales_price)  avg2,
+              avg(ss_ext_wholesale_cost)  avg3,
+              sum(ss_ext_wholesale_cost)
+FROM  store_sales  ,
+          store  ,
+          customer_demographics  ,
+          household_demographics  ,
+          customer_address  ,
+          date_dim
+WHERE  s_store_sk  =  ss_store_sk
+    AND  ss_sold_date_sk  =  d_date_sk
+    AND  d_year  =  2001  and((ss_hdemo_sk=hd_demo_sk
+                                                  AND  cd_demo_sk  =  ss_cdemo_sk
+                                                  AND  cd_marital_status  =  'M'
+                                                  AND  cd_education_status  =  'Advanced  Degree'
+                                                  AND  ss_sales_price  BETWEEN  100.00  AND  150.00
+                                                  AND  hd_dep_count  =  3)
+                                                OR  (ss_hdemo_sk=hd_demo_sk
+                                                        AND  cd_demo_sk  =  ss_cdemo_sk
+                                                        AND  cd_marital_status  =  'S'
+                                                        AND  cd_education_status  =  'College'
+                                                        AND  ss_sales_price  BETWEEN  50.00  AND  100.00
+                                                        AND  hd_dep_count  =  1  )
+                                                OR  (ss_hdemo_sk=hd_demo_sk
+                                                        AND  cd_demo_sk  =  ss_cdemo_sk
+                                                        AND  cd_marital_status  =  'W'
+                                                        AND  cd_education_status  =  '2  yr  Degree'
+                                                        AND  ss_sales_price  BETWEEN  150.00  AND  200.00
+                                                        AND  hd_dep_count  =  1))  and((ss_addr_sk  =  ca_address_sk
+                                                                                                                AND  ca_country  =  'United  States'
+                                                                                                                AND  ca_state  IN  ('TX',  'OH',  'TX')
+                                                                                                                AND  ss_net_profit  BETWEEN  100  AND  200)
+                                                                                                              OR  (ss_addr_sk  =  ca_address_sk
+                                                                                                                      AND  ca_country  =  'United  States'
+                                                                                                                      AND  ca_state  IN  ('OR',  'NM',  'KY')
+                                                                                                                      AND  ss_net_profit  BETWEEN  150  AND  300)
+                                                                                                              OR  (ss_addr_sk  =  ca_address_sk
+                                                                                                                      AND  ca_country  =  'United  States'
+                                                                                                                      AND  ca_state  IN  ('VA',  'TX',  'MS')
+                                                                                                                      AND  ss_net_profit  BETWEEN  50  AND  250));