blazer 3.4.0 → 3.5.0

data/app/views/blazer/queries/home.html.erb

@@ -1,6 +1,6 @@
 <div id="queries">
   <div id="header">
-    <div class="pull-right" style="line-height: 34px;">
+    <div class="pull-right header-div">
       <% if blazer_user %>
         <%= link_to "All", root_path, class: !params[:filter] ? "active" : nil, style: "margin-right: 40px;" %>
 
@@ -28,7 +28,7 @@
         </ul>
       </div>
     </div>
-    <input type="text" v-model="searchTerm" placeholder="Start typing a query, dashboard, or person" style="width: 300px; display: inline-block;" v-focus class="search form-control" />
+    <input id="search" type="text" placeholder="Start typing a query, dashboard, or person" class="search form-control" autofocus />
   </div>
 
   <table class="table">
@@ -36,134 +36,133 @@
       <tr>
         <th>Name</th>
         <% if Blazer.user_class %>
-          <th style="width: 20%; text-align: right;">Mastermind</th>
+          <th class="user-header">Mastermind</th>
         <% end%>
       </tr>
     </thead>
-    <tbody class="list" v-cloak>
-      <tr v-for="query in visibleItems">
-        <td>
-          <a :href="itemPath(query)" :class="{ dashboard: query.dashboard }">{{ query.name }}</a>
-          <span class="vars">{{ query.vars }}</span>
-        </td>
-        <% if Blazer.user_class %>
-          <td class="creator">{{ query.creator }}</td>
-        <% end %>
-      </tr>
-    </tbody>
+    <tbody id="items" class="list"></tbody>
   </table>
 
-  <p v-if="more" class="text-muted">Loading...</p>
+  <p id="loading" class="text-muted hide">Loading...</p>
 </div>
 
 <%= javascript_tag nonce: true do %>
   <%= blazer_js_var "dashboards", @dashboards %>
   <%= blazer_js_var "queries", @queries %>
   <%= blazer_js_var "more", @more %>
+  <%= blazer_js_var "showUser", !!Blazer.user_class %>
+
+  const search = document.getElementById("search")
+  const itemsList = document.getElementById("items")
+  const loading = document.getElementById("loading")
 
-  var prepareSearch = function (list) {
-    var i, q, searchStr
-    for (i = 0; i < list.length; i++) {
-      q = list[i]
-      searchStr = q.name + q.creator
-      if (q.creator === "You") {
+  function prepareSearch(items) {
+    for (const item of items) {
+      let searchStr = item.name + item.creator
+      if (item.creator === "You") {
         searchStr += "mine me"
       }
-      q.searchStr = prepareQuery(searchStr)
+      item.searchStr = prepareQuery(searchStr)
     }
   }
 
-  var prepareQuery = function (str) {
+  function prepareQuery(str) {
     return str.toLowerCase()
   }
 
-  var app = Vue.createApp({
-    data: function() {
-      return {
-        searchTerm: "",
-        more: more,
-        updateCounter: 0
-      }
-    },
-    created: function() {
-      this.listItems = dashboards.concat(queries)
-
-      prepareSearch(this.listItems)
-
-      this.queryIds = {}
-      for (i = 0; i < queries.length; i++) {
-        this.queryIds[queries[i].id] = true
-      }
+  function itemPath(item) {
+    if (item.dashboard) {
+      return Routes.dashboard_path(item.to_param)
+    } else {
+      return Routes.query_path(item.to_param)
+    }
+  }
 
-      if (this.more) {
-        var _this = this
+  function renderItem(item) {
+    const tr = document.createElement("tr")
 
-        $.getJSON(Routes.queries_path(), function (data) {
-          var i, j, newValues, val, size = 500;
+    const td = document.createElement("td")
 
-          var newValues = []
-          for (j = 0; j < data.length; j++) {
-            val = data[j]
-            if (val && !_this.queryIds[val.id]) {
-              newValues.push(val)
-            }
-          }
+    const a = document.createElement("a")
+    a.setAttribute("href", itemPath(item))
+    if (item.dashboard) {
+      a.classList.add("dashboard")
+    }
+    a.textContent = item.name
+    td.append(a)
+
+    if (item.vars) {
+      const span = document.createElement("span")
+      span.classList.add("vars")
+      span.textContent = item.vars
+      td.append(" ", span)
+    }
 
-          prepareSearch(newValues)
+    tr.append(td)
+    if (showUser) {
+      const td2 = document.createElement("td")
+      td2.classList.add("creator")
+      td2.textContent = item.creator
+      tr.append(td2)
+    }
+    return tr
+  }
 
-          _this.listItems = _this.listItems.concat(newValues)
-          _this.more = false
-          // hack to get to update
-          _this.updateCounter++
-        })
-      }
-    },
-    computed: {
-      visibleItems: function () {
-        // hack to get to update
-        this.updateCounter
-
-        var pageSize = 200
-        var q, i
-
-        if (this.searchTerm.length > 0) {
-          var term = prepareQuery(this.searchTerm)
-          var items = []
-          var fuzzyItems = []
-          for (i = 0; i < this.listItems.length; i++) {
-            q = this.listItems[i]
-            if (q.searchStr.indexOf(term) !== -1) {
-              items.push(q)
-              if (items.length == pageSize) {
-                break
-              }
-            } else if (fuzzysearch(term, q.searchStr)) {
-              fuzzyItems.push(q)
-            }
+  function visibleItems() {
+    const searchTerm = search.value
+    const pageSize = 200
+
+    if (searchTerm.length > 0) {
+      const term = prepareQuery(searchTerm)
+      const exactItems = []
+      const fuzzyItems = []
+      for (const item of items) {
+        if (item.searchStr.includes(term)) {
+          exactItems.push(item)
+          if (exactItems.length == pageSize) {
+            break
           }
-          return items.concat(fuzzyItems).slice(0, pageSize)
-        } else {
-          return this.listItems.slice(0, pageSize)
+        } else if (fuzzyItems.length < pageSize && fuzzysearch(term, item.searchStr)) {
+          fuzzyItems.push(item)
         }
       }
-    },
-    methods: {
-      itemPath: function (item) {
-        if (item.dashboard) {
-          return Routes.dashboard_path(item.to_param)
-        } else {
-          return Routes.query_path(item.to_param)
-        }
-      }
-    },
-    directives: {
-      focus: {
-        inserted: function (el) {
-          el.focus()
+      return exactItems.concat(fuzzyItems).slice(0, pageSize)
+    } else {
+      return items.slice(0, pageSize)
+    }
+  }
+
+  let items = dashboards.concat(queries)
+  prepareSearch(items)
+
+  const queryIds = new Set()
+  for (const query of queries) {
+    queryIds.add(query.id)
+  }
+
+  if (more) {
+    show(loading)
+
+    getJSON(Routes.queries_path(), function (queries) {
+      hide(loading)
+
+      const newItems = []
+      for (const query of queries) {
+        if (!queryIds.has(query.id)) {
+          newItems.push(query)
         }
       }
-    }
-  })
-  app.config.compilerOptions.whitespace = "preserve"
-  app.mount("#queries")
+
+      prepareSearch(newItems)
+      items = items.concat(newItems)
+      renderItems()
+    })
+  }
+
+  function renderItems() {
+    itemsList.replaceChildren(...visibleItems().map(renderItem))
+  }
+
+  search.addEventListener("input", renderItems)
+  renderItems()
 <% end %>

data/app/views/blazer/queries/new.html.erb

@@ -1,2 +1,3 @@
 <% blazer_title "New Query" %>
+
 <%= render partial: "form" %>

data/app/views/blazer/queries/run.html.erb

@@ -23,7 +23,7 @@
       <%= pluralize(@rows.size, "row") %>
 
       <% @checks.select(&:state).each do |check| %>
-        &middot; <small class="check-state <%= check.state.parameterize.gsub("-", "_") %>"><%= link_to check.state.upcase, edit_check_path(check) %></small>
+        &middot; <%= tag.small link_to(check.state.upcase, edit_check_path(check)), class: ["check-state", check.state.parameterize.gsub("-", "_")] %>
         <% if check.try(:message) %>
           &middot; <%= check.message %>
         <% end %>
@@ -43,10 +43,9 @@
   <% end %>
   <% if @rows.any? %>
     <% values = @rows.first %>
-    <% chart_id = SecureRandom.hex %>
     <% column_types = @result.column_types %>
     <% chart_type = @result.chart_type %>
-    <% chart_options = {id: chart_id, thousands: t("number.format.delimiter"), decimal: t("number.format.separator")} %>
+    <% chart_options = {thousands: t("number.format.delimiter"), decimal: t("number.format.separator")} %>
     <% if ["line", "line2"].include?(chart_type) %>
       <% chart_options.merge!(min: nil) %>
     <% end %>
@@ -72,33 +71,23 @@
       <% color = "#54a3ee" %>
       <% series_library[1] = {borderDash: [8], borderColor: color, pointBackgroundColor: color, backgroundColor: color, pointHoverBackgroundColor: color} %>
     <% end %>
+    <% map_options = {accessToken: Blazer.mapbox_access_token, tooltips: {hover: false, html: true}} %>
     <% if @markers.any? %>
-      <% map_id = SecureRandom.hex %>
-      <%= content_tag :div, nil, id: map_id, style: "height: #{@only_chart ? 300 : 500}px;" %>
-      <%= javascript_tag nonce: true do %>
-        <%= blazer_js_var "mapboxAccessToken", Blazer.mapbox_access_token %>
-        <%= blazer_js_var "markers", @markers %>
-        <%= blazer_js_var "mapId", map_id %>
-        new Mapkick.Map(mapId, markers, {accessToken: mapboxAccessToken, tooltips: {hover: false, html: true}});
-      <% end %>
+      <%= render partial: "map", locals: {type: "Map", data: @markers, options: map_options} %>
     <% elsif @geojson.any? %>
-      <% map_id = SecureRandom.hex %>
-      <%= content_tag :div, nil, id: map_id, style: "height: #{@only_chart ? 300 : 500}px;" %>
-      <%= javascript_tag nonce: true do %>
-        <%= blazer_js_var "mapboxAccessToken", Blazer.mapbox_access_token %>
-        <%= blazer_js_var "geojson", @geojson %>
-        <%= blazer_js_var "mapId", map_id %>
-        new Mapkick.AreaMap(mapId, geojson, {accessToken: mapboxAccessToken, tooltips: {hover: false, html: true}});
-      <% end %>
+      <%= render partial: "map", locals: {type: "AreaMap", data: @geojson, options: map_options} %>
     <% elsif chart_type == "line" %>
-      <% chart_data = @columns[1..-1].each_with_index.map{ |k, i| {name: blazer_series_name(k), data: @rows.map{ |r| [r[0], r[i + 1]] }, library: series_library[i]} } %>
-      <%= line_chart chart_data, **chart_options %>
+      <% chart_data = @columns[1..-1].each_with_index.map { |k, i| {name: blazer_series_name(k), data: @rows.map { |r| [r[0], r[i + 1]] }, library: series_library[i]} } %>
+      <%= render partial: "chart", locals: {type: "LineChart", data: chart_data, options: chart_options} %>
     <% elsif chart_type == "line2" %>
-      <%= line_chart @rows.group_by { |r| v = r[1]; (@smart_values[@columns[1]] || {})[v.to_s] || v }.each_with_index.map { |(name, v), i| {name: blazer_series_name(name), data: v.map { |v2| [v2[0], v2[2]] }, library: series_library[i]} }, **chart_options %>
+      <% chart_data = @rows.group_by { |r| v = r[1]; (@smart_values[@columns[1]] || {})[v.to_s] || v }.each_with_index.map { |(name, v), i| {name: blazer_series_name(name), data: v.map { |v2| [v2[0], v2[2]] }, library: series_library[i]} } %>
+      <%= render partial: "chart", locals: {type: "LineChart", data: chart_data, options: chart_options} %>
     <% elsif chart_type == "pie" %>
-      <%= pie_chart @rows.map { |r| [(@smart_values[@columns[0]] || {})[r[0].to_s] || r[0], r[1]] }, **chart_options %>
+      <% chart_data = @rows.map { |r| [(@smart_values[@columns[0]] || {})[r[0].to_s] || r[0], r[1]] } %>
+      <%= render partial: "chart", locals: {type: "PieChart", data: chart_data, options: chart_options} %>
     <% elsif chart_type == "bar" %>
-      <%= column_chart (values.size - 1).times.map { |i| name = @columns[i + 1]; {name: blazer_series_name(name), data: @rows.first(20).map { |r| [(@smart_values[@columns[0]] || {})[r[0].to_s] || r[0], r[i + 1]] } } }, **chart_options %>
+      <% chart_data = (values.size - 1).times.map { |i| name = @columns[i + 1]; {name: blazer_series_name(name), data: @rows.first(20).map { |r| [(@smart_values[@columns[0]] || {})[r[0].to_s] || r[0], r[i + 1]] } } } %>
+      <%= render partial: "chart", locals: {type: "ColumnChart", data: chart_data, options: chart_options} %>
     <% elsif chart_type == "bar2" %>
       <% first_20 = @rows.group_by { |r| r[0] }.values.first(20).flatten(1) %>
       <% labels = first_20.map { |r| r[0] }.uniq %>
@@ -108,9 +97,11 @@
           <% first_20 << [l, s, 0] unless first_20.find { |r| r[0] == l && r[1] == s } %>
         <% end %>
       <% end %>
-      <%= column_chart first_20.group_by { |r| v = r[1]; (@smart_values[@columns[1]] || {})[v.to_s] || v }.each_with_index.map { |(name, v), i| {name: blazer_series_name(name), data: v.sort_by { |r2| labels.index(r2[0]) }.map { |v2| v3 = v2[0]; [(@smart_values[@columns[0]] || {})[v3.to_s] || v3, v2[2]] }} }, **chart_options %>
+      <% chart_data = first_20.group_by { |r| v = r[1]; (@smart_values[@columns[1]] || {})[v.to_s] || v }.each_with_index.map { |(name, v), i| {name: blazer_series_name(name), data: v.sort_by { |r2| labels.index(r2[0]) }.map { |v2| v3 = v2[0]; [(@smart_values[@columns[0]] || {})[v3.to_s] || v3, v2[2]] }} } %>
+      <%= render partial: "chart", locals: {type: "ColumnChart", data: chart_data, options: chart_options} %>
     <% elsif chart_type == "scatter" %>
-      <%= scatter_chart @rows, xtitle: @columns[0], ytitle: @columns[1], **chart_options %>
+      <% chart_options.merge!(xtitle: @columns[0], ytitle: @columns[1]) %>
+      <%= render partial: "chart", locals: {type: "ScatterChart", data: @rows, options: chart_options} %>
     <% elsif @only_chart %>
       <% if @rows.size == 1 && @rows.first.size == 1 %>
         <% v = @rows.first.first %>
@@ -127,21 +118,19 @@
     <% unless @only_chart && !@no_chart %>
       <% header_width = 100 / @columns.size.to_f %>
       <div class="results-container">
-        <% if @columns == ["QUERY PLAN"] %>
-          <pre><code><%= @rows.map { |r| r[0] }.join("\n") %></code></pre>
-        <% elsif @columns == ["PLAN"] && @data_source.adapter == "druid" %>
-          <pre><code><%= @rows[0][0] %></code></pre>
+        <% if @explain %>
+          <pre><code><%= @explain %></code></pre>
         <% else %>
           <table class="table results-table">
             <thead>
               <tr>
                 <% @columns.each_with_index do |key, i| %>
                   <% type = @column_types[i] %>
-                  <th style="width: <%= header_width %>%;" data-sort="<%= type %>">
-                    <div style="min-width: <%= @min_width_types.include?(i) ? 180 : 60 %>px;">
+                  <%= tag.th style: "width: #{header_width}%;", data: {sort: type} do %>
+                    <%= tag.div style: "min-width: #{@min_width_types.include?(i) ? 180 : 60}px;" do %>
                       <%= key %>
-                    </div>
-                  </th>
+                    <% end %>
+                  <% end %>
                 <% end %>
               </tr>
             </thead>

data/app/views/blazer/queries/schema.html.erb

@@ -5,7 +5,7 @@
 <hr />
 
 <div id="header">
-  <input id="search" type="text" placeholder="Start typing a table or column" style="width: 300px; display: inline-block;" class="search form-control" />
+  <input id="search" type="text" placeholder="Start typing a table or column" class="search form-control" autofocus />
 </div>
 
 <% @schema.each do |table| %>
@@ -20,7 +20,7 @@
     <tbody>
       <% table[:columns].each do |column| %>
         <tr>
-          <td style="width: 60%;"><%= column[:name] %></td>
+          <td class="column-name"><%= column[:name] %></td>
           <td class="text-muted"><%= column[:data_type] %></td>
         </tr>
       <% end %>
@@ -29,27 +29,27 @@
 <% end %>
 
 <%= javascript_tag nonce: true do %>
-  $("#search").on("keyup", function() {
-    var value = $(this).val().toLowerCase()
-    $(".schema-table").filter(function() {
+  document.getElementById("search").addEventListener("input", function () {
+    const value = this.value
+    for (const schemaTable of document.querySelectorAll(".schema-table")) {
       // if found in table name, show entire table
       // if just found in rows, show row
-
-      var found = $(this).find("thead").text().toLowerCase().indexOf(value) > -1
-
-      if (found) {
-        $(this).find("tbody tr").toggle(true)
-      } else {
-        $(this).find("tbody tr").filter(function() {
-          var found2 = $(this).text().toLowerCase().indexOf(value) > -1
-          $(this).toggle(found2)
-          if (found2) {
-            found = true
+      const tableFound = schemaTable.querySelector("thead").textContent.toLowerCase().includes(value)
+
+      let anyColumnFound = false
+      for (const column of schemaTable.querySelectorAll("tbody tr")) {
+        if (tableFound) {
+          show(column)
+        } else {
+          const columnFound = column.textContent.toLowerCase().includes(value)
+          toggle(column, columnFound)
+          if (columnFound) {
+            anyColumnFound = true
           }
-        })
+        }
       }
 
-      $(this).toggle(found)
-    })
-  }).focus()
+      toggle(schemaTable, tableFound || anyColumnFound)
+    }
+  })
 <% end %>

data/app/views/blazer/queries/show.html.erb

@@ -2,10 +2,10 @@
 
 <div class="topbar">
   <div class="container">
-    <div class="row" style="padding-top: 13px;">
+    <div class="row name-row">
       <div class="col-sm-9">
         <%= render partial: "blazer/nav" %>
-        <h3 style="line-height: 34px; display: inline; margin-left: 5px;">
+        <h3 class="name-header">
           <%= @query.name %>
         </h3>
       </div>
@@ -21,7 +21,7 @@
   </div>
 </div>
 
-<div style="margin-bottom: 60px;"></div>
+<div class="topbar-margin"></div>
 
 <% if @sql_errors.any? %>
   <div class="alert alert-danger">
@@ -34,7 +34,7 @@
 <% end %>
 
 <% if @query.description.present? %>
-  <p style="white-space: pre-line;"><%= @query.description %></p>
+  <p class="query-description"><%= @query.description %></p>
 <% end %>
 
 <%= render partial: "blazer/variables", locals: {action: query_path(@query)} %>
@@ -47,26 +47,33 @@
   </div>
 
   <%= javascript_tag nonce: true do %>
+    const results = document.getElementById("results")
+
     function showRun(data) {
-      $("#results").html(data)
-      $("#results table").stupidtable(stupidtableCustomSettings).stickyTableHeaders({fixedOffset: 60})
+      renderResults(results, data)
+      const table = results.querySelector("table")
+      if (table) {
+        tablesort(table)
+        table.classList.add("stickytable")
+      }
     }
 
     function showError(message) {
-      $("#results").addClass("query-error").html(message)
+      results.classList.add("query-error")
+      results.textContent = message
     }
 
-    <%= blazer_js_var "data", @run_data %>
+    <%= blazer_js_var "runData", @run_data %>
 
-    runQuery(data, showRun, showError)
+    runQuery(runData, showRun, showError)
   <% end %>
 <% end %>
 
 <%= javascript_tag nonce: true do %>
   // do not highlight really long queries
   // this can lead to performance issues
-  var code = $("#code code")
-  if (code.text().length < 10000) {
-    hljs.highlightElement(code.get(0))
+  const code = document.querySelector("#code code")
+  if (code.textContent.length < 10000) {
+    hljs.highlightElement(code)
   }
 <% end %>

data/app/views/blazer/uploads/index.html.erb

@@ -1,7 +1,7 @@
 <% blazer_title "Uploads" %>
 
 <div id="header">
-  <div class="pull-right" style="line-height: 34px;">
+  <div class="pull-right header-div">
     <div class="btn-group">
       <%= link_to "New Upload", new_upload_path, class: "btn btn-info" %>
       <button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -19,16 +19,16 @@
     </div>
   </div>
 
-  <input id="search" type="text" placeholder="Start typing a table or person" style="width: 300px; display: inline-block;" class="search form-control" />
+  <input id="search" type="text" placeholder="Start typing a table or person" class="search form-control" autofocus />
 </div>
 
 <table id="uploads" class="table">
   <thead>
     <tr>
       <th>Table</th>
-      <th style="width: 60%;"></th>
+      <th class="description-header"></th>
       <% if Blazer.user_class %>
-        <th style="width: 20%; text-align: right;">Mastermind</th>
+        <th class="user-header">Mastermind</th>
       <% end%>
     </tr>
   </thead>
@@ -46,10 +46,10 @@
 </table>
 
 <%= javascript_tag nonce: true do %>
-  $("#search").on("keyup", function() {
-    var value = $(this).val().toLowerCase()
-    $("#uploads tbody tr").filter( function() {
-      $(this).toggle($(this).text().toLowerCase().indexOf(value) > -1)
-    })
-  }).focus()
+  document.getElementById("search").addEventListener("input", function () {
+    const value = this.value.toLowerCase()
+    for (const upload of document.querySelectorAll("#uploads tbody tr")) {
+      toggle(upload, upload.textContent.toLowerCase().includes(value))
+    }
+  })
 <% end %>

data/app/views/layouts/blazer/application.html.erb

@@ -6,10 +6,10 @@
     <meta charset="utf-8" />
     <%= favicon_link_tag "blazer/favicon.png" %>
     <% if defined?(Propshaft::Railtie) && Rails.application.assets.is_a?(Propshaft::Assembly) %>
-      <%= stylesheet_link_tag "blazer/bootstrap-propshaft", "blazer/bootstrap", "blazer/selectize", "blazer/github", "blazer/daterangepicker", "blazer/application" %>
-      <%= javascript_include_tag "blazer/jquery", "blazer/rails-ujs", "blazer/stupidtable", "blazer/stupidtable-custom-settings", "blazer/jquery.stickytableheaders", "blazer/selectize", "blazer/highlight.min", "blazer/moment", "blazer/moment-timezone-with-data", "blazer/daterangepicker", "blazer/chart.umd", "blazer/chartjs-adapter-date-fns.bundle", "blazer/chartkick", "blazer/mapkick.bundle", "blazer/ace/ace", "blazer/ace/ext-language_tools", "blazer/ace/theme-twilight", "blazer/ace/mode-sql", "blazer/ace/snippets/text", "blazer/ace/snippets/sql", "blazer/Sortable", "blazer/bootstrap", "blazer/vue.global.prod", "blazer/routes", "blazer/queries", "blazer/fuzzysearch", "blazer/application", nonce: true %>
+      <%= stylesheet_link_tag "blazer/bootstrap-propshaft", "blazer/bootstrap", "blazer/tom-select", "blazer/github", "blazer/daterangepicker", "blazer/application", nonce: true %>
+      <%= javascript_include_tag "blazer/tablesort", "blazer/tom-select.base", "blazer/highlight.min", "blazer/moment", "blazer/moment-timezone-with-data", "blazer/daterangepicker", "blazer/chart.umd", "blazer/chartjs-adapter-date-fns.bundle", "blazer/chartkick", "blazer/mapkick.bundle", "blazer/ace/ace", "blazer/ace/ext-language_tools", "blazer/ace/theme-twilight", "blazer/ace/mode-sql", "blazer/ace/snippets/text", "blazer/ace/snippets/sql", "blazer/Sortable", "blazer/routes", "blazer/queries", "blazer/fuzzysearch", "blazer/application", nonce: true %>
     <% else %>
-      <%= stylesheet_link_tag "blazer/application" %>
+      <%= stylesheet_link_tag "blazer/application", nonce: true %>
       <%= javascript_include_tag "blazer/application", nonce: true %>
     <% end %>
     <%= javascript_tag nonce: true do %>

data/lib/blazer/adapters/athena_adapter.rb

@@ -32,9 +32,7 @@ module Blazer
             query_string: statement,
             # use token so we fetch cached results after query is run
             client_request_token: request_token,
-            query_execution_context: {
-              database: database
-            }
+            query_execution_context: {database: database, catalog: catalog}.compact
           }
 
           if settings["output_location"]
@@ -78,7 +76,7 @@ module Blazer
               untyped_rows.concat page.result_set.rows.map { |r| r.data.map(&:var_char_value) }
             end
 
-            utc = ActiveSupport::TimeZone['Etc/UTC']
+            utc = ActiveSupport::TimeZone["Etc/UTC"]
 
             rows = untyped_rows[1..-1] || []
             rows = untyped_rows[0..-1] unless column_info.present?
@@ -119,11 +117,11 @@ module Blazer
       end
 
       def tables
-        glue.get_tables(database_name: database).table_list.map(&:name).sort
+        glue_tables.table_list.map(&:name).sort
       end
 
       def schema
-        glue.get_tables(database_name: database).table_list.map { |t| {table: t.name, columns: t.storage_descriptor.columns.map { |c| {name: c.name, data_type: c.type} }} }
+        glue_tables.table_list.map { |t| {table: t.name, columns: t.storage_descriptor.columns.map { |c| {name: c.name, data_type: c.type} }} }
       end
 
       def preview_statement
@@ -146,6 +144,14 @@ module Blazer
         @database ||= settings["database"] || "default"
       end
 
+      def catalog
+        @catalog ||= settings["catalog"]
+      end
+
+      def glue_tables
+        glue.get_tables({database_name: database, catalog_id: catalog}.compact)
+      end
+
       # note: this setting is experimental
       # it does *not* need to be set to use engine version 2
       # prepared statements must be manually deleted if enabled