Skip to content

Commit

Permalink
improving the sql view
Browse files Browse the repository at this point in the history
  • Loading branch information
mistercrunch committed Feb 4, 2016
1 parent 98ba323 commit 61b3a85
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion panoramix/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ def query_bkp(

@property
def sql_url(self):
return self.database.sql_url + "?table_id=" + str(self.id)
return self.database.sql_url + "?table_name=" + str(self.table_name)

@property
def sql_link(self):
Expand Down
8 changes: 3 additions & 5 deletions panoramix/templates/panoramix/sql.html
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@
<h2>db: [{{ db }}]</h2>
<div class="row interactions">
<div class="col-xs-7 fillheight">
<input type="hidden" id="database_id" value="{{ database_id }}">
<input type="hidden" id="database_id" value="{{ db.id }}">
<button class="btn btn-primary" id="run">Run!</button>
<button class="btn btn-default" id="create_view">Create View</button>
</div>
<div class="col-xs-5 fillheight">
<select id="dbtable">
{% for t in tables %}
<option value="{{ t }}"
{{ "selected" if t == table }}>
{{ "selected" if t == table_name else '' }}>
{{ t }}
</option>
{% endfor %}
Expand All @@ -75,9 +75,7 @@ <h2>db: [{{ db }}]</h2>
<textarea id="sql" class="fillup"></textarea>
</div>
<div class="col-xs-5 fillheight">
<div class="metadata fillup bordered">
Tables
</div>
<div class="metadata fillup bordered"></div>
</div>
</div>
<div id="interactive">
Expand Down
7 changes: 4 additions & 3 deletions panoramix/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -565,11 +565,12 @@ def sql(self, database_id):
models.Database).filter_by(id=database_id).first()
engine = mydb.get_sqla_engine()
tables = engine.table_names()

table_name=request.args.get('table_name')
return self.render_template(
"panoramix/sql.html",
database_id=database_id,
table_id=request.args.get('table_id'),
tables=tables,
table_name=table_name,
db=mydb)

@has_access
Expand Down Expand Up @@ -598,7 +599,7 @@ def select_star(self, database_id, table_name):
models.Database).filter_by(id=database_id).first()
t = mydb.get_table(table_name)
fields = ", ".join(
[c.name for c in t.get_columns()] or "*")
[c.name for c in t.columns] or "*")
s = "SELECT\n{fields}\nFROM {table_name}".format(**locals())
return self.render_template(
"panoramix/ajah.html",
Expand Down

0 comments on commit 61b3a85

Please sign in to comment.