sqlui 0.1.59 → 0.1.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b06af3454b65600eacd42b1008e186c473736411fedaed471162af97d98f39f
-  data.tar.gz: 38c46eb311a518ea328acd959ca34c8e5d850c83fa9c1b98c663daef2356c334
+  metadata.gz: ec12b1d88bc2adff9dba6ff91b01e66b123d17cb8b042e142c24f71303a27a92
+  data.tar.gz: df939b59b2bae004270ea1907a6be52352e7c81e6050405bc4534a6faaae0567
 SHA512:
-  metadata.gz: 320e438a5101b83a59691168f2673f82ffb35559b547a9e75e6278b9735c4880a3906b298ae576d89346218f3ff3543e7cd57e034dbbfa2c525b4a069ad337ab
-  data.tar.gz: 03d5d65cad39f143c56f205c1f55280d2ab269390191b0ea026300e1c422b896876c2e5cf0c9f0764ca712a50c9702fb222f93a584960bfe11762fbc4663a78f
+  metadata.gz: fd504e8ba6cf53b06b30b21867a7925ef7fda8055690eefb7759dd8ed745dd28088ca6c2f257eef1073aa976b67548c155bc26eb4f334750df6a059e9abdf6db
+  data.tar.gz: 96584bb97da39f508542a861d16d1bb2196238ab4d12c99528937704f6b29aefee9563c837921dbee1a72fe5113b3a8dfb39b4c74a5951ffc6fb8be697d535cb

data/.release-version

@@ -1 +1 @@
-0.1.59
+0.1.61

data/app/database_config.rb

@@ -14,8 +14,8 @@ class DatabaseConfig
     @display_name = Args.fetch_non_empty_string(hash, :display_name).strip
     @description = Args.fetch_non_empty_string(hash, :description).strip
     @url_path = Args.fetch_non_empty_string(hash, :url_path).strip
-    raise ArgumentError, 'url_path should start with a /' unless @url_path.start_with?('/')
-    raise ArgumentError, 'url_path should not end with a /' if @url_path.length > 1 && @url_path.end_with?('/')
+    raise ArgumentError, 'url_path should not start with a /' if @url_path.start_with?('/')
+    raise ArgumentError, 'url_path should not end with a /' if @url_path.end_with?('/')
 
     @saved_path = Args.fetch_non_empty_string(hash, :saved_path).strip
 

data/app/server.rb

@@ -25,6 +25,9 @@ class Server < Sinatra::Base
   def self.init_and_run(config, resources_dir)
     logger.info("Starting SQLUI v#{Version::SQLUI}")
     logger.info("Airbrake enabled: #{config.airbrake[:server]&.[](:enabled) || false}")
+
+    WEBrick::HTTPRequest.const_set('MAX_URI_LENGTH', 2 * 1024 * 1024)
+
     if config.airbrake[:server]&.[](:enabled)
       require 'airbrake'
       require 'airbrake/rack'
@@ -59,51 +62,53 @@ class Server < Sinatra::Base
     set :raise_errors,    false
     set :show_exceptions, false
 
-    favicon_hash = Digest::MD5.hexdigest(File.read(File.join(resources_dir, 'favicon.svg')))
-    css_hash = Digest::MD5.hexdigest(File.read(File.join(resources_dir, 'sqlui.css')))
-    js_hash = Digest::MD5.hexdigest(File.read(File.join(resources_dir, 'sqlui.js')))
-
     get '/-/health' do
       status 200
       body 'OK'
     end
 
     get '/?' do
-      redirect config.list_url_path, 301
+      redirect config.base_url_path, 301
     end
 
-    get '/favicon.svg' do
-      headers 'Cache-Control' => 'max-age=31536000'
-      send_file File.join(resources_dir, 'favicon.svg')
+    resource_path_map = {}
+    Dir.glob(File.join(resources_dir, '*')).each do |file|
+      hash = Digest::MD5.hexdigest(File.read(file))
+      basename = File.basename(file)
+      url_path = "#{config.base_url_path}/#{basename}"
+      case File.extname(basename)
+      when '.svg'
+        content_type = 'image/svg+xml; charset=utf-8'
+      when '.css'
+        content_type = 'text/css; charset=utf-8'
+      when '.js'
+        content_type = 'text/javascript; charset=utf-8'
+      else
+        raise "unsupported resource file extension: #{File.extname(basename)}"
+      end
+      resource_path_map[basename] = "#{url_path}?#{hash}"
+      get url_path do
+        headers 'Content-Type' => content_type
+        headers 'Cache-Control' => 'max-age=31536000'
+        send_file file
+      end
     end
 
-    get "#{config.list_url_path}/?" do
+    get "#{config.base_url_path}/?" do
       headers 'Cache-Control' => 'no-cache'
-      erb :databases, locals: { config: config }
+      erb :databases, locals: { config: config, resource_path_map: resource_path_map }
     end
 
     config.database_configs.each do |database|
-      get "#{database.url_path}/?" do
+      get "#{config.base_url_path}/#{database.url_path}/?" do
         redirect "#{database.url_path}/query", 301
       end
 
-      get "#{database.url_path}/sqlui.css" do
-        headers 'Content-Type' => 'text/css; charset=utf-8'
-        headers 'Cache-Control' => 'max-age=31536000'
-        send_file File.join(resources_dir, 'sqlui.css')
-      end
-
-      get "#{database.url_path}/sqlui.js" do
-        headers 'Content-Type' => 'text/javascript; charset=utf-8'
-        headers 'Cache-Control' => 'max-age=31536000'
-        send_file File.join(resources_dir, 'sqlui.js')
-      end
-
-      post "#{database.url_path}/metadata" do
+      post "#{config.base_url_path}/#{database.url_path}/metadata" do
         metadata = database.with_client do |client|
           {
             server: "#{config.name} - #{database.display_name}",
-            list_url_path: config.list_url_path,
+            base_url_path: config.base_url_path,
             schemas: DatabaseMetadata.lookup(client, database),
             tables: database.tables,
             columns: database.columns,
@@ -131,7 +136,7 @@ class Server < Sinatra::Base
         body metadata.to_json
       end
 
-      post "#{database.url_path}/query" do
+      post "#{config.base_url_path}/#{database.url_path}/query" do
         data = request.body.read
         request.body.rewind # since Airbrake will read the body on error
         params.merge!(JSON.parse(data, symbolize_names: true))
@@ -143,31 +148,60 @@ class Server < Sinatra::Base
         status 200
         headers 'Content-Type' => 'application/json; charset=utf-8'
 
-        database.with_client do |client|
-          query_result = execute_query(client, variables, queries)
-          stream do |out|
+        stream do |out|
+          database.with_client do |client|
+            begin
+              query_result = execute_query(client, variables, queries)
+            rescue Mysql2::Error => e
+              stacktrace = e.full_message(highlight: false)
+              message = "ERROR #{e.error_number} (#{e.sql_state}): #{e.message.lines.first&.strip || 'unknown error'}"
+              out << { error: message, stacktrace: stacktrace }.compact.to_json
+              break
+            rescue StandardError => e
+              stacktrace = e.full_message(highlight: false)
+              message = e.message.lines.first&.strip || 'unknown error'
+              out << { error: message, stacktrace: stacktrace }.compact.to_json
+              break
+            end
+
             if query_result
               json = <<~RES.chomp
                 {
                   "columns": #{query_result.fields.to_json},
                   "column_types": #{MysqlTypes.map_to_google_charts_types(query_result.field_types).to_json},
-                  "total_rows": #{query_result.size.to_json},
                   "selection": #{params[:selection].to_json},
                   "query": #{params[:sql].to_json},
                   "rows": [
               RES
               out << json
-              bytes = json.bytesize
+              bytes_written = json.bytesize
+              max_rows_written = false
+              rows_written = 0
+              total_rows = 0
               query_result.each_with_index do |row, i|
+                total_rows += 1
+                next if max_rows_written
+
                 json = "#{i.zero? ? '' : ','}\n    #{row.map { |v| big_decimal_to_float(v) }.to_json}"
-                bytes += json.bytesize
-                break if i == Sqlui::MAX_ROWS || bytes > Sqlui::MAX_BYTES
+                bytesize = json.bytesize
+                if bytes_written + bytesize > Sqlui::MAX_BYTES
+                  max_rows_written = true
+                  next
+                end
 
                 out << json
+                bytes_written += bytesize
+                rows_written += 1
+
+                if rows_written == Sqlui::MAX_ROWS
+                  max_rows_written = true
+                  next
+                end
               end
               out << <<~RES
 
-                  ]
+                  ],
+                  "total_rows": #{total_rows}
                 }
               RES
             else
@@ -186,7 +220,7 @@ class Server < Sinatra::Base
         end
       end
 
-      get "#{database.url_path}/download_csv" do
+      get "#{config.base_url_path}/#{database.url_path}/download_csv" do
         break client_error('missing sql') unless params[:sql]
 
         sql = Base64.decode64(params[:sql]).force_encoding('UTF-8')
@@ -198,9 +232,21 @@ class Server < Sinatra::Base
         attachment 'result.csv'
         status 200
 
-        database.with_client do |client|
-          query_result = execute_query(client, variables, queries)
-          stream do |out|
+        stream do |out|
+          database.with_client do |client|
+            begin
+              query_result = execute_query(client, variables, queries)
+            rescue Mysql2::Error => e
+              stacktrace = e.full_message(highlight: false)
+              message = "ERROR #{e.error_number} (#{e.sql_state}): #{e.message.lines.first&.strip || 'unknown error'}"
+              out << { error: message, stacktrace: stacktrace }.compact.to_json
+              break
+            rescue StandardError => e
+              stacktrace = e.full_message(highlight: false)
+              message = e.message.lines.first&.strip || 'unknown error'
+              out << { error: message, stacktrace: stacktrace }.compact.to_json
+              break
+            end
             out << CSV::Row.new(query_result.fields, query_result.fields, header_row: true).to_s.strip
             query_result.each do |row|
               out << "\n#{CSV::Row.new(query_result.fields, row.map { |v| big_decimal_to_float(v) }).to_s.strip}"
@@ -209,7 +255,7 @@ class Server < Sinatra::Base
         end
       end
 
-      get(%r{#{Regexp.escape(database.url_path)}/(query|graph|structure|saved)}) do
+      get(/#{Regexp.escape("#{config.base_url_path}/#{database.url_path}/")}(query|graph|structure|saved)/) do
         status 200
         headers 'Cache-Control' => 'no-cache'
         client_config = config.airbrake[:client] || {}
@@ -218,9 +264,7 @@ class Server < Sinatra::Base
           airbrake_enabled: client_config[:enabled] || false,
           airbrake_project_id: client_config[:project_id] || '',
           airbrake_project_key: client_config[:project_key] || '',
-          js_hash: js_hash,
-          css_hash: css_hash,
-          favicon_hash: favicon_hash
+          resource_path_map: resource_path_map
         }
       end
     end
@@ -230,12 +274,17 @@ class Server < Sinatra::Base
       stacktrace = exception&.full_message(highlight: false)
       if request.env['HTTP_ACCEPT'] == 'application/json'
         headers 'Content-Type' => 'application/json; charset=utf-8'
-        message = exception&.message&.lines&.first&.strip || 'unexpected error'
+        message = "error: #{exception&.message&.lines&.first&.strip || 'unexpected error'}"
         json = { error: message, stacktrace: stacktrace }.compact.to_json
         body json
       else
         message = "#{status} #{Rack::Utils::HTTP_STATUS_CODES[status]}"
-        erb :error, locals: { title: "SQLUI #{message}", message: message, stacktrace: stacktrace }
+        erb :error, locals: {
+          resource_path_map: resource_path_map,
+          title: "SQLUI #{message}",
+          message: message,
+          stacktrace: stacktrace
+        }
       end
     end
 
@@ -274,7 +323,10 @@ class Server < Sinatra::Base
     variables.each do |name, value|
       client.query("SET @#{name} = #{value};")
     end
-    queries.map { |current| client.query(current) }.last
+    queries[0..-2].map do |current|
+      client.query(current, stream: true)&.free
+    end
+    client.query(queries[-1], stream: true)
   end
 
   def big_decimal_to_float(maybe_big_decimal)

data/app/sqlui_config.rb

@@ -8,7 +8,7 @@ require_relative 'deep'
 
 # App config including database configs.
 class SqluiConfig
-  attr_reader :name, :port, :environment, :list_url_path, :database_configs, :airbrake
+  attr_reader :name, :port, :environment, :base_url_path, :database_configs, :airbrake
 
   def initialize(filename, overrides = {})
     config = YAML.safe_load(ERB.new(File.read(filename)).result, aliases: true).deep_merge!(overrides)
@@ -19,10 +19,10 @@ class SqluiConfig
     @name = Args.fetch_non_empty_string(config, :name).strip
     @port = Args.fetch_non_empty_int(config, :port)
     @environment = Args.fetch_non_empty_string(config, :environment).strip
-    @list_url_path = Args.fetch_non_empty_string(config, :list_url_path).strip
-    raise ArgumentError, 'list_url_path should start with a /' unless @list_url_path.start_with?('/')
-    if @list_url_path.length > 1 && @list_url_path.end_with?('/')
-      raise ArgumentError, 'list_url_path should not end with a /'
+    @base_url_path = Args.fetch_non_empty_string(config, :base_url_path).strip
+    raise ArgumentError, 'base_url_path should start with a /' unless @base_url_path.start_with?('/')
+    if @base_url_path.length > 1 && @base_url_path.end_with?('/')
+      raise ArgumentError, 'base_url_path should not end with a /'
     end
 
     databases = Args.fetch_non_empty_hash(config, :databases)

data/app/views/databases.erb

@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8">
   <title>SQLUI <%= config.name %> Databases</title>
-  <link rel="icon" type="image/x-icon" href="/favicon.svg">
+  <link rel="icon" type="image/x-icon" href="<%= resource_path_map['favicon.svg'] %>">
 
   <style>
       body {
@@ -92,9 +92,9 @@
   <div class="database">
     <div class="name-and-links">
       <h2 class='name'><%= database_config.display_name %></h2>
-      <a class='query-link' href="<%= database_config.url_path %>/query">query</a>
-      <a class='saved-link' href="<%= database_config.url_path %>/saved">saved</a>
-      <a class='structure-link' href="<%= database_config.url_path %>/structure">structure</a>
+      <a class='query-link' href="<%= "#{config.base_url_path}/#{database_config.url_path}/query" %>">query</a>
+      <a class='saved-link' href="<%= "#{config.base_url_path}/#{database_config.url_path}/saved" %>">saved</a>
+      <a class='structure-link' href="<%= "#{config.base_url_path}/#{database_config.url_path}/structure" %>">structure</a>
     </div>
     <p class='description'>
       <%= database_config.description %>

data/app/views/error.erb

@@ -4,7 +4,7 @@
 <head>
   <meta charset="utf-8">
   <title><%= title %></title>
-  <link rel="icon" type="image/x-icon" href="/favicon.svg">
+  <link rel="icon" type="image/x-icon" href="<%= resource_path_map['favicon.svg'] %>">
 </head>
 <body style="font-family: monospace; font-size: 16px;">
 

data/app/views/sqlui.erb

@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <title>SQLUI</title>
-    <link rel="icon" type="image/x-icon" href="/favicon.svg?<%= favicon_hash %>">
+    <link rel="icon" type="image/x-icon" href="<%= resource_path_map['favicon.svg'] %>">
     <!-- Initialize Airbrake before loading the main app JS so that we can catch errors as early as possible. -->
     <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/@airbrake/browser"></script>
     <script type="text/javascript">
@@ -19,9 +19,9 @@
         window.airbrake?.notify(error)
       }
     </script>
-    <script type="text/javascript" src="sqlui.js?<%= js_hash %>"></script>
+    <script type="text/javascript" src="<%= resource_path_map['sqlui.js'] %>"></script>
     <script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>
-    <link rel="stylesheet" href="sqlui.css?<%= css_hash %>">
+    <link rel="stylesheet" href="<%= resource_path_map['sqlui.css'] %>">
   </head>
 
   <body>
@@ -43,10 +43,12 @@
       </div>
 
       <div id="submit-box" class="tab-content-element graph-element query-element" style="display: none;">
-        <input id="cancel-button" class="cancel-button" type="button" value="cancel"></input>
-        <div class="submit-fill"></div>
+        <input id="cancel-button" type="button" value="cancel"></input>
+        <div id="editor-resizer">
+          <img src="<%= resource_path_map['vertical-resizer.svg'] %>" />
+        </div>
         <div style="position: relative;">
-          <div class="submit-button-wrapper">
+          <div id="submit-button-wrapper">
             <input id="submit-button-all" class="submit-button" type="button"></input>
             <input id="submit-button-current" class="submit-button submit-button-show" type="button"></input>
             <input id="submit-dropdown-button" class="submit-dropdown-button" type="button", value="▼"></input>

data/client/resources/sqlui.css

@@ -120,27 +120,35 @@ p {
     padding: 5px;
 }
 
-.submit-fill {
+#editor-resizer {
     display: flex;
-    flex: 1
+    flex: 1;
+    cursor: row-resize;
+    flex-direction: column;
+    align-items: center;
 }
 
-.cancel-button {
+#cancel-button {
     cursor: pointer;
-    margin: 0;
     background: none;
     color: #333;
     border: 1px solid #888;
     height: 32px;
     font-size: 18px;
+    margin: 0 220px 0 0; /* To center the resizer icon. Ok, it's a hack. Get over it. */
 }
 
-.submit-button-wrapper {
+#cancel-button-spacer {
+    width: 150px;
+}
+
+#submit-button-wrapper {
     cursor: pointer;
     border: 1px solid #888;
     height: 32px;
     display: flex;
     flex-direction: row;
+    background: white;
 }
 
 .submit-button, .submit-dropdown-button {
@@ -217,7 +225,7 @@ p {
 
 .submit-dropdown-content-button:active,
 .submit-button:active,
-.cancel-button:active,
+#cancel-button:active,
 .submit-dropdown-button:active {
     background-color: #e6e6e6;
     outline: none
@@ -233,16 +241,15 @@ p {
 }
 
 #status-message {
-    display: flex;
-    justify-content: center;
-    align-content: center;
-    flex-direction: row;
+    min-width: 0;
+    justify-content: left;
     font-family: Helvetica, sans-serif;
     white-space: nowrap;
     overflow: hidden;
     font-size: 16px;
     color: #333;
-    margin-left: 5px;
+    margin: 0 5px;
+    text-overflow: ellipsis;
 }
 
 #result-box, #fetch-sql-box, #saved-box, #graph-box, #structure-box {
@@ -255,6 +262,10 @@ table tbody tr td {
   height: 21px;
 }
 
+#result-table td, #result-table th {
+    cursor: default;
+}
+
 #result-table tbody tr td abbr a {
     color: #555;
     cursor: pointer;
@@ -264,6 +275,7 @@ table tbody tr td {
     border: 1px dotted #555;
     font-size: 12px;
     display: inline-block;
+    user-select: none;
 }
 
 #result-table tbody tr td abbr {
@@ -358,7 +370,8 @@ thead {
 }
 
 #status-box {
-    padding: 5px;
+    width: 100%;
+    padding: 5px 0;
     display: flex;
     flex-direction: row;
     border-top: 1px solid #ddd;
@@ -485,11 +498,13 @@ select {
 #pagination-box {
     display: flex;
     flex-direction: row;
+    margin: 0 5px;
 }
 
 #page-count-box {
     align-self: center;
     font-size: 16px;
+    white-space: nowrap;
 }
 
 .pagination-button {