Skip to content

Commit b42d003

Browse files
committed
Only return if there is an error
1 parent 2411f46 commit b42d003

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

mysql_kernel/kernel.py

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ def use_db(self, query):
115115

116116
def do_execute(self, code, silent, store_history=True, user_expressions=None, allow_stdin=False):
117117
self.silent = silent
118+
res = {}
118119
output = ''
119120
if not code.strip():
120121
return self.ok()
@@ -139,21 +140,21 @@ def do_execute(self, code, silent, store_history=True, user_expressions=None, al
139140

140141

141142
elif l.startswith('create database '):
142-
return self.create_db(v)
143+
res = self.create_db(v)
143144
elif l.startswith('drop database '):
144-
return self.drop_db(v)
145+
res = self.drop_db(v)
145146
elif l.startswith('create table '):
146-
return self.create_table(v)
147+
res = self.create_table(v)
147148
elif l.startswith('drop table '):
148-
return self.drop_table(v)
149+
res = self.drop_table(v)
149150
elif l.startswith('delete '):
150-
return self.delete(v)
151+
res = self.delete(v)
151152
elif l.startswith('alter table '):
152-
return self.alter_table(v)
153+
res = self.alter_table(v)
153154
elif l.startswith('use '):
154-
return self.use_db(v)
155+
res = self.use_db(v)
155156
elif l.startswith('insert into '):
156-
return self.insert_into(v)
157+
res = self.insert_into(v)
157158
else:
158159
if self.engine:
159160
v = re.sub('(?<!%)%(?!%)', '%%', v)
@@ -182,6 +183,8 @@ def do_execute(self, code, silent, store_history=True, user_expressions=None, al
182183
else:
183184
output = 'Unable to connect to Mysql server. Check that the server is running.'
184185
self.output(output, plain_text = results_raw if results_raw else output)
186+
if 'status' in res.keys() and res['status'] == 'error':
187+
return res
185188
return self.ok()
186189
except Exception as e:
187190
return self.handle_error(e)

0 commit comments

Comments
 (0)