Skip to content

Commit ab7e9de

Browse files
committed
update
1 parent 8e714fd commit ab7e9de

1 file changed

Lines changed: 12 additions & 2 deletions

File tree

wren-ai-service/src/core/engine.py

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
from typing import Any, Dict, Optional, Tuple
55

66
import aiohttp
7+
import sqlparse
78
from pydantic import BaseModel
89
from sqlglot.tokens import Token, Tokenizer, TokenType
910

@@ -50,8 +51,17 @@ def remove_limit_statement(sql: str) -> str:
5051

5152

5253
def squish_sql(sql: str) -> str:
53-
# normalize line endings, then collapse all whitespace runs to a single space
54-
return re.sub(r"\s+", " ", sql.replace("\r\n", "\n").replace("\r", "\n")).strip()
54+
return (
55+
sqlparse.format(
56+
sql,
57+
strip_comments=False,
58+
reindent=False, # don't add newlines/indent
59+
keyword_case=None, # don't change case
60+
)
61+
.replace("\n", " ")
62+
.replace("\r", " ")
63+
.strip()
64+
)
5565

5666

5767
def add_quotes(sql: str) -> Tuple[str, str]:

0 commit comments

Comments
 (0)