Chore: upgrade to sqlglot 11.6 and clean up example project paths

Author: tobymao

examples/sushi/models/items.py

@@ -4,9 +4,9 @@
 
 import numpy as np
 import pandas as pd
+from helper import iter_dates  # type: ignore
 from sqlglot.expressions import to_column
 
-from examples.sushi.helper import iter_dates
 from sqlmesh import ExecutionContext, model
 from sqlmesh.core.model import IncrementalByTimeRangeKind
 from sqlmesh.utils.date import to_ds

examples/sushi/models/order_items.py

@@ -4,9 +4,9 @@
 
 import numpy as np
 import pandas as pd
+from helper import iter_dates  # type: ignore
 from sqlglot.expressions import to_column
 
-from examples.sushi.helper import iter_dates
 from sqlmesh import ExecutionContext, model
 from sqlmesh.core.model import IncrementalByTimeRangeKind
 from sqlmesh.utils.date import to_ds

examples/sushi/models/orders.py

@@ -3,8 +3,8 @@
 from datetime import datetime, timedelta
 
 import pandas as pd
+from helper import iter_dates  # type: ignore
 
-from examples.sushi.helper import iter_dates
 from sqlmesh import ExecutionContext, model
 from sqlmesh.core.model import IncrementalByTimeRangeKind
 from sqlmesh.utils.date import to_ds

examples/wursthall/models/db/order_f.py

@@ -4,8 +4,8 @@
 
 import numpy as np
 import pandas as pd
+from models.src.shared import DATA_START_DATE_STR, set_seed  # type: ignore
 
-from examples.wursthall.models.src.shared import DATA_START_DATE_STR, set_seed
 from sqlmesh import ExecutionContext, model
 from sqlmesh.core.model import IncrementalByTimeRangeKind, TimeColumn
 from sqlmesh.utils.date import to_ds

examples/wursthall/models/src/customer_details.py

@@ -5,12 +5,8 @@
 
 import pandas as pd
 from faker import Faker
+from models.src.shared import DATA_START_DATE_STR, iter_dates, set_seed  # type: ignore
 
-from examples.wursthall.models.src.shared import (
-    DATA_START_DATE_STR,
-    iter_dates,
-    set_seed,
-)
 from sqlmesh import model
 from sqlmesh.core.model import IncrementalByTimeRangeKind, TimeColumn
 

examples/wursthall/models/src/order_item_details.py

@@ -6,12 +6,8 @@
 import numpy as np
 import pandas as pd
 from faker import Faker
+from models.src.shared import DATA_START_DATE_STR, iter_dates, set_seed  # type: ignore
 
-from examples.wursthall.models.src.shared import (
-    DATA_START_DATE_STR,
-    iter_dates,
-    set_seed,
-)
 from sqlmesh import ExecutionContext, model
 from sqlmesh.core.model import IncrementalByTimeRangeKind, TimeColumn
 from sqlmesh.utils.date import to_ds

setup.py

@@ -43,7 +43,7 @@
         "requests",
         "rich",
         "ruamel.yaml",
-        "sqlglot~=11.5.7",
+        "sqlglot~=11.6.1",
         "fsspec",
     ],
     extras_require={

sqlmesh/core/dialect.py

@@ -418,16 +418,11 @@ def parse(sql: str, default_dialect: str | None = None) -> t.List[exp.Expression
             chunks[-1][0].append(token)
 
     expressions: t.List[exp.Expression] = []
-    sql_lines = None
 
     for chunk, is_jinja in chunks:
         if is_jinja:
             start, *_, end = chunk
-            sql_lines = sql_lines or sql.split("\n")
-            lines = sql_lines[start.line - 1 : end.line]
-            lines[0] = lines[0][start.col - 1 :]
-            lines[-1] = lines[-1][: end.col + len(end.text) - 1]
-            segment = "\n".join(lines)
+            segment = sql[start.start : end.end + 1]
             variables = [
                 exp.Literal.string(var)
                 for var in find_undeclared_variables(ENVIRONMENT.parse(segment))