Skip to content

fix: teradata adapter + resultset #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ErwonB wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: teradata adapter + resultset #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 28 additions & 31 deletions sqlit/domains/connections/providers/teradata/adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
ColumnInfo,
CursorBasedAdapter,
IndexInfo,
SequenceInfo,
TableInfo,
TriggerInfo,
)
Expand Down Expand Up @@ -49,10 +48,6 @@ def supports_cross_database_queries(self) -> bool:
def supports_stored_procedures(self) -> bool:
return True

@property
def supports_sequences(self) -> bool:
return True

def apply_database_override(self, config: ConnectionConfig, database: str) -> ConnectionConfig:
"""Apply a default database for unqualified queries."""
if not database:
Expand Down Expand Up @@ -91,8 +86,9 @@ def connect(self, config: ConnectionConfig) -> Any:
def get_databases(self, conn: Any) -> list[str]:
cursor = conn.cursor()
cursor.execute(
"lock row for access "
"SELECT DatabaseName FROM DBC.DatabasesV "
"WHERE DatabaseKind IN ('D', 'U') "
"WHERE dbkind IN ('D', 'U') "
"ORDER BY DatabaseName"
)
return [row[0] for row in cursor.fetchall()]
Expand All @@ -101,13 +97,15 @@ def get_tables(self, conn: Any, database: str | None = None) -> list[TableInfo]:
cursor = conn.cursor()
if database:
cursor.execute(
"lock row for access "
"SELECT DatabaseName, TableName FROM DBC.TablesV "
"WHERE TableKind = 'T' AND DatabaseName = ? "
"ORDER BY TableName",
(database,),
)
else:
cursor.execute(
"lock row for access "
"SELECT DatabaseName, TableName FROM DBC.TablesV "
"WHERE TableKind = 'T' "
"ORDER BY DatabaseName, TableName"
Expand All @@ -118,13 +116,15 @@ def get_views(self, conn: Any, database: str | None = None) -> list[TableInfo]:
cursor = conn.cursor()
if database:
cursor.execute(
"lock row for access "
"SELECT DatabaseName, TableName FROM DBC.TablesV "
"WHERE TableKind = 'V' AND DatabaseName = ? "
"ORDER BY TableName",
(database,),
)
else:
cursor.execute(
"lock row for access "
"SELECT DatabaseName, TableName FROM DBC.TablesV "
"WHERE TableKind = 'V' "
"ORDER BY DatabaseName, TableName"
Expand All @@ -142,21 +142,21 @@ def get_columns(
pk_columns: set[str] = set()
try:
cursor.execute(
"SELECT ic.ColumnName "
"FROM DBC.IndexConstraintsV c "
"JOIN DBC.IndexColumnsV ic "
" ON c.DatabaseName = ic.DatabaseName "
" AND c.TableName = ic.TableName "
" AND c.IndexNumber = ic.IndexNumber "
"WHERE c.ConstraintType = 'P' "
"AND c.DatabaseName = ? AND c.TableName = ?",
"lock row for access "
"select "
"COLUMNNAME "
"from DBC.INDICESV "
"where DATABASENAME = ? "
"and TABLENAME = ? "
"and INDEXTYPE = 'P' ",
(schema_name, table),
)
pk_columns = {row[0] for row in cursor.fetchall()}
except Exception:
pk_columns = set()

cursor.execute(
"lock row for access "
"SELECT ColumnName, ColumnType FROM DBC.ColumnsV "
"WHERE DatabaseName = ? AND TableName = ? "
"ORDER BY ColumnId",
Expand All @@ -171,13 +171,15 @@ def get_procedures(self, conn: Any, database: str | None = None) -> list[str]:
cursor = conn.cursor()
if database:
cursor.execute(
"lock row for access "
"SELECT TableName FROM DBC.TablesV "
"WHERE TableKind = 'P' AND DatabaseName = ? "
"ORDER BY TableName",
(database,),
)
else:
cursor.execute(
"lock row for access "
"SELECT TableName FROM DBC.TablesV "
"WHERE TableKind = 'P' "
"ORDER BY TableName"
Expand All @@ -188,13 +190,15 @@ def get_indexes(self, conn: Any, database: str | None = None) -> list[IndexInfo]
cursor = conn.cursor()
if database:
cursor.execute(
"lock row for access "
"SELECT IndexName, TableName, UniqueFlag FROM DBC.IndicesV "
"WHERE DatabaseName = ? "
"ORDER BY TableName, IndexName",
(database,),
)
else:
cursor.execute(
"lock row for access "
"SELECT IndexName, TableName, UniqueFlag FROM DBC.IndicesV "
"ORDER BY DatabaseName, TableName, IndexName"
)
Expand All @@ -207,33 +211,26 @@ def get_triggers(self, conn: Any, database: str | None = None) -> list[TriggerIn
cursor = conn.cursor()
if database:
cursor.execute(
"lock row for access "
"SELECT TriggerName, TableName FROM DBC.TriggersV "
"WHERE DatabaseName = ? "
"ORDER BY TableName, TriggerName",
(database,),
)
else:
cursor.execute(
"lock row for access "
"SELECT TriggerName, TableName FROM DBC.TriggersV "
"ORDER BY DatabaseName, TableName, TriggerName"
)
return [TriggerInfo(name=row[0], table_name=row[1]) for row in cursor.fetchall()]

def get_sequences(self, conn: Any, database: str | None = None) -> list[SequenceInfo]:
cursor = conn.cursor()
if database:
cursor.execute(
"SELECT SequenceName FROM DBC.SequencesV "
"WHERE DatabaseName = ? "
"ORDER BY SequenceName",
(database,),
)
else:
cursor.execute(
"SELECT SequenceName FROM DBC.SequencesV "
"ORDER BY DatabaseName, SequenceName"
)
return [SequenceInfo(name=row[0]) for row in cursor.fetchall()]
def get_sequences(self, conn: Any, database: str | None = None) -> list[str]:
"""Teradata does not support standalone sequences.

Auto-increment behaviour is provided by IDENTITY columns instead.
"""
return []

def quote_identifier(self, name: str) -> str:
escaped = name.replace('"', '""')
Expand All @@ -242,5 +239,5 @@ def quote_identifier(self, name: str) -> str:
def build_select_query(self, table: str, limit: int, database: str | None = None, schema: str | None = None) -> str:
schema_name = schema or database
if schema_name:
return f'SELECT TOP {limit} * FROM "{schema_name}"."{table}"'
return f'SELECT TOP {limit} * FROM "{table}"'
return f'lock row for access select top {limit} * from "{schema_name}"."{table}"'
return f'lock row for access select top {limit} * from "{table}"'
20 changes: 13 additions & 7 deletions sqlit/domains/query/app/query_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,10 @@ class KeywordQueryAnalyzer:
def classify(self, query: str) -> QueryKind:
"""Classify query based on keyword of the last statement.

For multi-statement queries like 'BEGIN; INSERT...; SELECT * FROM t;',
we check the last statement to determine if results should be returned.
Uses the same splitting logic as multi_statement.split_statements.
Enhanced for Teradata:
- Supports SEL (Teradata abbreviation for SELECT)
- Supports HELP statements
- Handles LOCKING ... SELECT patterns (common in Teradata)
"""
from sqlit.domains.query.editing.comments import (
is_comment_line,
Expand All @@ -87,17 +88,22 @@ def classify(self, query: str) -> QueryKind:
for stmt in reversed(statements):
if is_comment_only_statement(stmt):
continue
# Found a statement with actual SQL - get first non-comment line
# Get first non-comment line
lines = [line.strip() for line in stmt.split("\n") if line.strip()]
non_comment_lines = [line for line in lines if not is_comment_line(line)]
if non_comment_lines:
first_line = non_comment_lines[0].upper()
first_word = first_line.split()[0] if first_line else ""
first_line_upper = non_comment_lines[0].upper()

# Teradata-specific patterns (word-boundary aware)
if re.search(r"\b(SELECT|WITH|SHOW|DESCRIBE|EXPLAIN|PRAGMA|SEL|HELP)\b", first_line_upper):
return QueryKind.RETURNS_ROWS

# Fallback to original first-word check
first_word = first_line_upper.split()[0] if first_line_upper else ""
return QueryKind.RETURNS_ROWS if first_word in SELECT_KEYWORDS else QueryKind.NON_QUERY

return QueryKind.NON_QUERY


class DialectQueryAnalyzer:
def __init__(self, dialect: Any, fallback: QueryAnalyzer | None = None) -> None:
self._dialect = dialect
Expand Down