Business intelligence made simple
Added schema to table preview for Postgres and Redshift - closes #220
Andrew Kanef2d9c9607ef2
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 112ac5ad..210a2da9 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -1,5 +1,6 @@## 2.2.0 [unreleased]+- Added schema to table preview for Postgres and Redshift- Fixed bug with Slack notifications not sending- Dropped support for Rails 4.2diff --git a/app/views/blazer/queries/_form.html.erb b/app/views/blazer/queries/_form.html.erbindex c7e1cfd0..a0e5223b 100644--- a/app/views/blazer/queries/_form.html.erb+++ b/app/views/blazer/queries/_form.html.erb@@ -132,7 +132,12 @@this.tablesXhr = $.getJSON(Routes.tables_queries_path({data_source: this.dataSource}), function(data) {var newOptions = []for (var i = 0; i < data.length; i++) {- newOptions.push({text: data[i], value: data[i]})+ var table = data[i]+ if (typeof table === "object") {+ newOptions.push({text: table.table, value: table.value})+ } else {+ newOptions.push({text: table, value: table})+ }}selectize.clearOptions()selectize.addOption(newOptions)diff --git a/app/views/blazer/queries/schema.html.erb b/app/views/blazer/queries/schema.html.erbindex 31f32f3f..be3b2897 100644--- a/app/views/blazer/queries/schema.html.erb+++ b/app/views/blazer/queries/schema.html.erb@@ -13,10 +13,7 @@<thead><tr><th colspan="2">- <%= table[:table] %>- <% if table[:schema] != "public" %>- <span class="text-muted" style="font-weight: normal;"><%= table[:schema] %></span>- <% end %>+ <% if table[:schema] != "public" %><%= table[:schema] %>.<% end %><%= table[:table] %></th></tr></thead>diff --git a/lib/blazer/adapters/sql_adapter.rb b/lib/blazer/adapters/sql_adapter.rbindex 563a35b3..f44ef8e3 100644--- a/lib/blazer/adapters/sql_adapter.rb+++ b/lib/blazer/adapters/sql_adapter.rb@@ -40,19 +40,36 @@ module Blazerenddef tables- result = data_source.run_statement(connection_model.send(:sanitize_sql_array, ["SELECT table_name FROM information_schema.tables WHERE table_schema IN (?) ORDER BY table_name", schemas]), refresh_cache: true)- result.rows.map(&:first)+ sql = add_schemas("SELECT table_schema, table_name FROM information_schema.tables")++ result = data_source.run_statement(sql, refresh_cache: true)+ if postgresql? || redshift?+ result.rows.sort_by { |r| [r[0] == default_schema ? "" : r[0], r[1]] }.map do |row|+ table =+ if row[0] == default_schema+ row[1]+ else+ "#{row[0]}.#{row[1]}"+ end++ {+ table: table,+ value: connection_model.connection.quote_table_name(table)+ }+ end+ else+ result.rows.map(&:second).sort+ endenddef schema- result = data_source.run_statement(connection_model.send(:sanitize_sql_array, ["SELECT table_schema, table_name, column_name, data_type, ordinal_position FROM information_schema.columns WHERE table_schema IN (?) ORDER BY 1, 2", schemas]))- result.rows.group_by { |r| [r[0], r[1]] }.map { |k, vs| {schema: k[0], table: k[1], columns: vs.sort_by { |v| v[2] }.map { |v| {name: v[2], data_type: v[3]} }} }+ sql = add_schemas("SELECT table_schema, table_name, column_name, data_type, ordinal_position FROM information_schema.columns")+ result = data_source.run_statement(sql)+ result.rows.group_by { |r| [r[0], r[1]] }.map { |k, vs| {schema: k[0], table: k[1], columns: vs.sort_by { |v| v[2] }.map { |v| {name: v[2], data_type: v[3]} }} }.sort_by { |t| [t[:schema] == default_schema ? "" : t[:schema], t[:table]] }enddef preview_statement- if postgresql?- "SELECT * FROM \"{table}\" LIMIT 10"- elsif sqlserver?+ if sqlserver?"SELECT TOP (10) * FROM {table}"else"SELECT * FROM {table} LIMIT 10"@@ -136,18 +153,28 @@ module Blazerconnection_model.connection.adapter_name rescue nilend- def schemas- settings["schemas"] || [connection_model.connection_config[:schema] || default_schema]+ def default_schema+ @default_schema ||= begin+ if postgresql? || redshift?+ "public"+ elsif sqlserver?+ "dbo"+ else+ connection_model.connection_config[:database]+ end+ endend- def default_schema- if postgresql? || redshift?- "public"- elsif sqlserver?- "dbo"+ def add_schemas(query)+ if settings["schemas"]+ where = "table_schema IN (?)"+ schemas = settings["schemas"]else- connection_model.connection_config[:database]+ where = "table_schema NOT IN (?)"+ schemas = ["information_schema"]+ schemas << "pg_catalog" if postgresql? || redshift?end+ connection_model.send(:sanitize_sql_array, ["#{query} WHERE #{where}", schemas])enddef set_timeout(timeout)