Skip to content

Commit 30ae1d7

Browse files
author
Ghislain Fourny
committed
Fix issues with dataframe output.
1 parent d2ebb5a commit 30ae1d7

2 files changed

Lines changed: 24 additions & 9 deletions

File tree

src/jsoniq/jars/rumbledb-2.0.0.jar

1.78 KB
Binary file not shown.

src/jsoniqmagic/magic.py

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,20 @@ def run(self, line, cell=None, timed=False):
7070
try:
7171
df = response.df();
7272
except Py4JJavaError as e:
73-
print(e.java_exception.getMessage())
73+
if rumble.getRumbleConf().getShowErrorInfo() :
74+
raise e;
75+
else:
76+
print(e.java_exception.getMessage())
7477
return
7578
except Exception as e:
76-
print("Query unsuccessful.")
77-
print("Usual reasons: firewall, misconfigured proxy.")
78-
print("Error message:")
79-
print(e.args[0])
80-
return
79+
if rumble.getRumbleConf().getShowErrorInfo() :
80+
raise e;
81+
else:
82+
print("Query unsuccessful.")
83+
print("Usual reasons: firewall, misconfigured proxy.")
84+
print("Error message:")
85+
print(e.args[0])
86+
return
8187
except:
8288
print("Query unsuccessful.")
8389
print("Usual reasons: firewall, misconfigured proxy.")
@@ -89,7 +95,10 @@ def run(self, line, cell=None, timed=False):
8995
try:
9096
pdf = response.pdf()
9197
except Py4JJavaError as e:
92-
print(e.java_exception.getMessage())
98+
if rumble.getRumbleConf().getShowErrorInfo() :
99+
raise e;
100+
else:
101+
print(e.java_exception.getMessage())
93102
return
94103
except Exception as e:
95104
print("Query unsuccessful.")
@@ -109,7 +118,10 @@ def run(self, line, cell=None, timed=False):
109118
try:
110119
response.applyPUL()
111120
except Py4JJavaError as e:
112-
print(e.java_exception.getMessage())
121+
if rumble.getRumbleConf().getShowErrorInfo() :
122+
raise e;
123+
else:
124+
print(e.java_exception.getMessage())
113125
return
114126
except Exception as e:
115127
print("Query unsuccessful.")
@@ -129,7 +141,10 @@ def run(self, line, cell=None, timed=False):
129141
try:
130142
capplusone = response.take(rumble.getRumbleConf().getResultSizeCap() + 1)
131143
except Py4JJavaError as e:
132-
print(e.java_exception.getMessage())
144+
if rumble.getRumbleConf().getShowErrorInfo() :
145+
raise e;
146+
else:
147+
print(e.java_exception.getMessage())
133148
return
134149
except Exception as e:
135150
print("Query unsuccessful.")

0 commit comments

Comments
 (0)