detail Extra HTML describing the error
'''
def __init__(self, descr='', detail=''):
- super().__init__('Warning when executing SQL',
- '', descr=descr, detail=detail)
+ super().__init__('Notice', '', descr=descr, detail=detail)
<%inherit file="${sql_base_mak}" />
<%block name="action_success">
- <p><em class="success">Executed SQL without errors</em>,
+ <p><em class="success">No errors</em>,
from a file<em class="success">!</em>
</p>
% if sql:
</tr>
</%def>
-<%def name="sql_error()">
- <p>${caller.body()}</p>
-</%def>
-
<%def name="render_results()">
<%
if not result_rows:
<%def name="result_form(tab_index)">
<form action="" enctype="multipart/form-data" method="post">
<div>
- <self:hidden_vars>
- <input type="hidden"
- name="sql"
- value="${sql}"
- />
- </self:hidden_vars>
</div>
-
- <p>
- <input value="SQL" tabindex="${tab_index.val}" type="submit" />
- <% tab_index.inc() %>
- </p>
</form>
</%def>
+
<script>
window.name='${self.sql_results_target()}';
+ function open_sql_edit() {
+ window.open(
+ '${request.route_path("pgwui_sql_edit")|n}',
+ 'sql_edit',
+ 'popup=true,width=800,height=600').focus();
+ };
+ % if havecreds:
+ open_sql_edit();
+ % endif
</script>
<%def name="submit(tab_index)">
% if not havecreds:
<input value="Login" tabindex="${tab_index.val}" type="submit" />
- <% tab_index.inc() %>
% else:
- <%parent:submit tab_index="${tab_index}" />
- % endif
-</%def>
-
-<%def name="sql_row(tab_index)">
- % if havecreds:
- <%parent:sql_row tab_index="${tab_index}" />
+ <button type="button" tabindex="${tab_index.val}"
+ onclick="open_sql_edit();"
+ >New SQL Input Window</button>
% endif
+ <% tab_index.inc() %>
</%def>
<% tab_index = self.attr.TabIndex() %>
-% if result_rows:
- ${render_results()}
- ${result_form(tab_index)}
-% else:
- ${self.main_form(tab_index)}
-% endif
+${render_results()}
+${self.main_form(tab_index)}
type="text/css" />
</%block>
-<%def name="submit(tab_index)">
- <input value="Execute" tabindex="${tab_index.val}" type="submit" />
- <% tab_index.inc() %>
-</%def>
-
-<%def name="sql_row(tab_index)">
- <tr>
- <%self.lib:td_label for_id="sql_id">SQL</%self.lib:td_label>
- <td><button type="button" tabindex="${tab_index.val}"
- onclick="window.open(
- '${request.route_path("pgwui_sql_edit")|n}',
- 'sql_edit',
- 'popup=true,width=800,height=600')"
- >Show In Window</button></td>
- <% tab_index.inc() %>
- </tr>
- <tr>
- <%self.lib:td_input tab_index="${tab_index}" colspan="2">
- <textarea name="sql"
- class="sqltext"
- tabindex="${tab_index.val}"
- id="sql_id">${sql}</textarea>
- </%self.lib:td_input>
- </tr>
-</%def>
-
-<%def name="table_rows(tab_index)">
- <%parent:table_rows tab_index="${tab_index}" args="tab_index">
- ## A blank table row for spacing
- <tr class="verticalgap"><td/><td/></tr>
- ${self.sql_row(tab_index)}
- </%parent:table_rows>
-</%def>
-
<%doc>
<%block name="hidden_vars">
<%parent:hidden_vars>
SQL Entry Window
</%block>
+<%def name="sql_row(tab_index)">
+ <tr>
+ <%self.lib:td_input tab_index="${tab_index}" colspan="2">
+ <textarea name="sql"
+ class="sqltext"
+ tabindex="${tab_index.val}"
+ id="sql_id">${sql}</textarea>
+ </%self.lib:td_input>
+ </tr>
+</%def>
+
+<%def name="table_rows(tab_index)">
+ <%parent:table_rows tab_index="${tab_index}" args="tab_index">
+ ## A blank table row for spacing
+ <tr class="verticalgap"><td/><td/></tr>
+ ${self.sql_row(tab_index)}
+ </%parent:table_rows>
+</%def>
+
+<%def name="submit(tab_index)">
+ <input value="Execute" tabindex="${tab_index.val}" type="submit" />
+ <% tab_index.inc() %>
+</%def>
+
<% tab_index = self.attr.TabIndex() %>
${self.main_form(tab_index, target=self.sql_results_target(),
action=request.route_path('pgwui_sql'))}
cur = self.cur
self.execute(cur, self.uf['sql'])
if cur.statusmessage is None:
- raise sql_ex.NoStatementsError(
- descr=('There seem to be no SQL statements, or at least no'
- ' results'))
+ raise sql_ex.NoStatementsError(descr='No SQL statements executed')
sql_results = self.sql_results
nextset = True