balki/pgweb
1
0
Fork 0
Code Pull Requests Activity

use a different query to fetch materialized view structure

Browse Source
This commit is contained in:
Dan Sosedoff
2016-01-17 15:00:33 -06:00
parent 84f1bd95e7
commit 3167d96cfc
6 changed files with 75 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/api/api.go
View File

@@ -151,7 +151,15 @@ func GetSchemas(c *gin.Context) {
}
func GetTable(c *gin.Context) {
res, err := DB(c).Table(c.Params.ByName("table"))
var res *client.Result
var err error
if c.Request.FormValue("type") == "materialized_view" {
res, err = DB(c).MaterializedView(c.Params.ByName("table"))
} else {
res, err = DB(c).Table(c.Params.ByName("table"))
}
serveResult(res, err, c)
}

4
pkg/client/client.go
View File

@@ -107,6 +107,10 @@ func (client *Client) Table(table string) (*Result, error) {
return client.query(statements.PG_TABLE_SCHEMA, schema, table)
}
func (client *Client) MaterializedView(name string) (*Result, error) {
return client.query(statements.PG_MATERIALIZED_VIEW_SCHEMA, name)
}
func (client *Client) TableRows(table string, opts RowsOptions) (*Result, error) {
schema, table := getSchemaAndTable(table)
sql := fmt.Sprintf(`SELECT * FROM "%s"."%s"`, schema, table)

8
pkg/client/result.go
View File

@@ -25,10 +25,10 @@ type Result struct {
}
type Objects struct {
Tables []string `json:"tables"`
Views []string `json:"views"`
MaterializedViews []string `json:"materialized_views"`
Sequences []string `json:"sequences"`
Tables []string `json:"table"`
Views []string `json:"view"`
MaterializedViews []string `json:"materialized_view"`
Sequences []string `json:"sequence"`
}
// Due to big int number limitations in javascript, numbers should be encoded

6
pkg/data/bindata.go
View File

File diff suppressed because one or more lines are too long

17
pkg/statements/sql.go
View File

@@ -92,6 +92,23 @@ WHERE
// ---------------------------------------------------------------------------
PG_MATERIALIZED_VIEW_SCHEMA = `
SELECT
attname as column_name,
atttypid::regtype AS data_type,
(case when attnotnull IS TRUE then 'NO' else 'YES' end) as is_nullable,
null as character_maximum_length,
null as character_set_catalog,
null as column_default
FROM
pg_attribute
WHERE
attrelid = $1::regclass AND
attnum > 0 AND
NOT attisdropped`
// ---------------------------------------------------------------------------
PG_ACTIVITY = `
SELECT
datname,

71
static/js/app.js
View File

@@ -2,7 +2,7 @@ var editor = null;
var connected = false;
var bookmarks = {};
var default_rows_limit = 100;
var currentTable = null;
var currentObject = null;
var filterOptions = {
"equal": "= 'DATA'",
@@ -76,16 +76,16 @@ function apiCall(method, path, params, cb) {
});
}
function getObjects(cb) { apiCall("get", "/objects", {}, cb); }
function getTables(cb) { apiCall("get", "/tables", {}, cb); }
function getTableRows(table, opts, cb) { apiCall("get", "/tables/" + table + "/rows", opts, cb); }
function getTableStructure(table, cb) { apiCall("get", "/tables/" + table, {}, cb); }
function getTableIndexes(table, cb) { apiCall("get", "/tables/" + table + "/indexes", {}, cb); }
function getTableConstraints(table, cb) { apiCall("get", "/tables/" + table + "/constraints", {}, cb); }
function getHistory(cb) { apiCall("get", "/history", {}, cb); }
function getBookmarks(cb) { apiCall("get", "/bookmarks", {}, cb); }
function executeQuery(query, cb) { apiCall("post", "/query", { query: query }, cb); }
function explainQuery(query, cb) { apiCall("post", "/explain", { query: query }, cb); }
function getObjects(cb) { apiCall("get", "/objects", {}, cb); }
function getTables(cb) { apiCall("get", "/tables", {}, cb); }
function getTableRows(table, opts, cb) { apiCall("get", "/tables/" + table + "/rows", opts, cb); }
function getTableStructure(table, opts, cb) { apiCall("get", "/tables/" + table, opts, cb); }
function getTableIndexes(table, cb) { apiCall("get", "/tables/" + table + "/indexes", {}, cb); }
function getTableConstraints(table, cb) { apiCall("get", "/tables/" + table + "/constraints", {}, cb); }
function getHistory(cb) { apiCall("get", "/history", {}, cb); }
function getBookmarks(cb) { apiCall("get", "/bookmarks", {}, cb); }
function executeQuery(query, cb) { apiCall("post", "/query", { query: query }, cb); }
function explainQuery(query, cb) { apiCall("post", "/explain", { query: query }, cb); }
function encodeQuery(query) {
return window.btoa(query);
@@ -95,17 +95,17 @@ function buildSchemaSection(name, objects) {
var section = "";
var titles = {
"tables": "Tables",
"views": "Views",
"materialized_views": "Materialized Views",
"sequences": "Sequences"
"table": "Tables",
"view": "Views",
"materialized_view": "Materialized Views",
"sequence": "Sequences"
};
var icons = {
"tables": '<i class="fa fa-table"></i>',
"views": '<i class="fa fa-table"></i>',
"materialized_views": '<i class="fa fa-table"></i>',
"sequences": '<i class="fa fa-circle-o"></i>'
"table": '<i class="fa fa-table"></i>',
"view": '<i class="fa fa-table"></i>',
"materialized_view": '<i class="fa fa-table"></i>',
"sequence": '<i class="fa fa-circle-o"></i>'
};
var klass = "";
@@ -115,11 +115,11 @@ function buildSchemaSection(name, objects) {
section += "<div class='schema-name'><i class='fa fa-folder-o'></i><i class='fa fa-folder-open-o'></i> " + name + "</div>";
section += "<div class='schema-container'>";
for (group of ["tables", "views", "materialized_views", "sequences"]) {
for (group of ["table", "view", "materialized_view", "sequence"]) {
if (objects[group].length == 0) continue;
group_klass = "";
if (name == "public" && group == "tables") group_klass = "expanded";
if (name == "public" && group == "table") group_klass = "expanded";
section += "<div class='schema-group " + group_klass + "'>";
section += "<div class='schema-group-title'><i class='fa fa-chevron-right'></i><i class='fa fa-chevron-down'></i> " + titles[group] + " (" + objects[group].length + ")</div>";
@@ -167,8 +167,8 @@ function unescapeHtml(str){
return e.childNodes.length === 0 ? "" : e.childNodes[0].nodeValue;
}
function getCurrentTable() {
return currentTable;
function getCurrentObject() {
return currentObject || { name: "", type: "" };
}
function resetTable() {
@@ -280,7 +280,7 @@ function showQueryHistory() {
}
function showTableIndexes() {
var name = getCurrentTable();
var name = getCurrentObject().name;
if (name.length == 0) {
alert("Please select a table!");
@@ -298,7 +298,7 @@ function showTableIndexes() {
}
function showTableConstraints() {
var name = getCurrentTable();
var name = getCurrentObject().name;
if (name.length == 0) {
alert("Please select a table!");
@@ -316,7 +316,7 @@ function showTableConstraints() {
}
function showTableInfo() {
var name = getCurrentTable();
var name = getCurrentObject().name;
if (name.length == 0) {
alert("Please select a table!");
@@ -332,7 +332,7 @@ function showTableInfo() {
$("#table_encoding").text("Unknown");
});
buildTableFilters(name);
buildTableFilters(name, getCurrentObject().type);
}
function updatePaginator(pagination) {
@@ -367,7 +367,7 @@ function updatePaginator(pagination) {
}
function showTableContent(sortColumn, sortOrder) {
var name = getCurrentTable();
var name = getCurrentObject().name;
if (name.length == 0) {
alert("Please select a table!");
@@ -409,7 +409,7 @@ function showTableContent(sortColumn, sortOrder) {
}
function showTableStructure() {
var name = getCurrentTable();
var name = getCurrentObject().name;
if (name.length == 0) {
alert("Please select a table!");
@@ -421,7 +421,9 @@ function showTableStructure() {
$("#input").hide();
$("#body").prop("class", "full");
getTableStructure(name, function(data) {
console.log(getCurrentObject());
getTableStructure(name, { type: getCurrentObject().type }, function(data) {
buildTable(data);
$("#results").addClass("no-crop");
});
@@ -539,8 +541,8 @@ function exportTo(format) {
win.focus();
}
function buildTableFilters(name) {
getTableStructure(name, function(data) {
function buildTableFilters(name, type) {
getTableStructure(name, { type: type }, function(data) {
if (data.rows.length == 0) {
$("#pagination .filters").hide();
}
@@ -733,7 +735,10 @@ $(document).ready(function() {
});
$("#objects").on("click", "li", function(e) {
currentTable = $(this).data("id");
currentObject = {
name: $(this).data("id"),
type: $(this).data("type")
};
$("#objects li").removeClass("active");
$(this).addClass("active");