Skip to content

Commit ad2b014

Browse files
committed
order of fields in row corrected
1 parent 335fc0c commit ad2b014

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

src/databricks/sql/client.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
ParamEscaper,
2323
inject_parameters,
2424
transform_paramstyle,
25+
ArrowQueue,
26+
ColumnQueue
2527
)
2628
from databricks.sql.parameters.native import (
2729
DbsqlParameterBase,
@@ -1135,11 +1137,11 @@ def _fill_results_buffer(self):
11351137
def _convert_columnar_table(self, table):
11361138
column_names = [c[0] for c in self.description]
11371139
ResultRow = Row(*column_names)
1138-
1140+
print("Table\n",table)
11391141
result = []
11401142
for row_index in range(len(table[0])):
11411143
curr_row = []
1142-
for col_index in range(len(table)-1, -1, -1):
1144+
for col_index in range(len(table)):
11431145
curr_row.append(table[col_index][row_index])
11441146
result.append(ResultRow(*curr_row))
11451147

@@ -1246,10 +1248,11 @@ def fetchall(self) -> List[Row]:
12461248
"""
12471249
Fetch all (remaining) rows of a query result, returning them as a list of rows.
12481250
"""
1251+
if isinstance(self.results, ColumnQueue):
1252+
return self._convert_columnar_table(self.fetchall_columnar())
1253+
else:
1254+
return self._convert_arrow_table(self.fetchall_arrow())
12491255

1250-
return self._convert_columnar_table(self.fetchall_columnar())
1251-
1252-
return self._convert_arrow_table(self.fetchall_arrow())
12531256

12541257
def fetchmany(self, size: int) -> List[Row]:
12551258
"""

0 commit comments

Comments
 (0)