sqlui 0.1.20 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f41becc73029aa0f4e09476edbe96d273ed59b6dfd778eed97728c9d8b957e8e
-  data.tar.gz: 845897a0a4ab1a39e2ee2e6b8e5688b2548c0f30a463ef48171bd4953c138c01
+  metadata.gz: 1781b502f4bf82b9a87461d495cb6776f9290bfb5a2809a7ddb12e992ce7cc5c
+  data.tar.gz: a992696d1bbd1f809290035fa23c7cfec262f827073665e9013254420794d6d4
 SHA512:
-  metadata.gz: 85a81eeb433be3d01e0ecbacc990515249cc620c50cb852639a15a35849d2a69461c5c975140c1cb3ba743ac5f719756c0d1c7c44eed6e869f368cd32fd7386c
-  data.tar.gz: 9ad8b11e30e9ef47689eb01a7eb961fe409a7a5b10b06f32cdab6ce16a1ac43adaf91ab5a2643f51095d50262309f67d1af09cf8b304d532668380105c65c1dc
+  metadata.gz: b6bfc097c3e9f427aec918c9b3eabeef74a69a3109fff6588c2a87201c9f43a7a0839463ec1cbe400b5d880ee1c3f069e6ecea6978acb02fd152633cc841f448
+  data.tar.gz: 9ec1cfb0f64cc425331723856e89aab3d2fac02f107a381a7c7ab6b2f1c4f0ee40adbe87b458c14fb537fe72ecb5eff044f02812e82fceb9c1263cff369a6ee3

data/.version

@@ -1 +1 @@
-0.1.20
+0.1.21

data/app/mysql_types.rb

@@ -9,7 +9,7 @@ class MysqlTypes
   class << self
     def map_to_google_charts_types(types)
       types.map do |type|
-        type.gsub!(/\([^)]*\)/, '').strip!
+        type = type.gsub(/\([^)]*\)/, '').strip
         case type
         when 'bool', 'boolean'
           'boolean'

data/app/server.rb

@@ -56,12 +56,11 @@ class Server < Sinatra::Base
       end
 
       get "#{database.url_path}/metadata" do
-        database_config = config.database_config_for(url_path: database.url_path)
-        metadata = database_config.with_client do |client|
+        metadata = database.with_client do |client|
           {
             server: config.name,
-            schemas: DatabaseMetadata.lookup(client, database_config),
-            saved: Dir.glob("#{database_config.saved_path}/*.sql").map do |path|
+            schemas: DatabaseMetadata.lookup(client, database),
+            saved: Dir.glob("#{database.saved_path}/*.sql").map do |path|
               comment_lines = File.readlines(path).take_while do |l|
                 l.start_with?('--')
               end
@@ -80,11 +79,12 @@ class Server < Sinatra::Base
 
       get "#{database.url_path}/query_file" do
         break client_error('missing file param') unless params[:file]
-        break client_error('no such file') unless File.exist?(params[:file])
 
-        database_config = config.database_config_for(url_path: database.url_path)
-        sql = File.read(File.join(database_config.saved_path, params[:file]))
-        result = database_config.with_client do |client|
+        file = File.join(database.saved_path, params[:file])
+        break client_error('no such file') unless File.exist?(file)
+
+        sql = File.read(file)
+        result = database.with_client do |client|
           execute_query(client, sql).tap { |r| r[:file] = params[:file] }
         end
 
@@ -110,8 +110,7 @@ class Server < Sinatra::Base
           break client_error("can't find query at selection") unless sql
         end
 
-        database_config = config.database_config_for(url_path: database.url_path)
-        result = database_config.with_client do |client|
+        result = database.with_client do |client|
           execute_query(client, sql)
         end
 
@@ -126,8 +125,10 @@ class Server < Sinatra::Base
     error do |e|
       status 500
       headers 'Content-Type': 'application/json'
+      message = e.message.lines.first&.strip || 'unexpected error'
+      message = "#{message[0..80]}…" if message.length > 80
       result = {
-        error: e.message,
+        error: message,
         stacktrace: e.backtrace.map { |b| b }.join("\n")
       }
       body result.to_json
@@ -145,12 +146,13 @@ class Server < Sinatra::Base
   end
 
   def execute_query(client, sql)
-    if sql.include?(';')
-      results = sql.split(/(?<=;)/).map { |current| client.query(current) }
-      result = results[-1]
-    else
-      result = client.query(sql)
-    end
+    queries = if sql.include?(';')
+                sql.split(/(?<=;)/).map(&:strip).reject(&:empty?)
+              else
+                [sql]
+              end
+    results = queries.map { |current| client.query(current) }
+    result = results[-1]
     # NOTE: the call to result.field_types must go before any other interaction with the result. Otherwise you will
     # get a seg fault. Seems to be a bug in Mysql2.
     if result

data/app/views/databases.erb

@@ -1,66 +1,98 @@
 <html>
-  <head>
-    <title>Databases</title>
+<head>
+  <title>Databases</title>
 
-    <style>
+  <style>
       body {
-        font-family: Helvetica;
-        margin: 0px;
+          font-family: Helvetica;
+          margin: 0px;
       }
 
       h1 {
-        font-size: 30px;
-        margin: 10px;
+          font-size: 22px;
+      }
+
+      h2 {
+          font-size: 20px;
+      }
+
+      p {
+          font-size: 18px;
+      }
+
+      .header-box {
+          display: flex;
+          flex-direction: row;
+          border-bottom: 1px solid #ddd;
+          height: 36px;
+          font-family: Helvetica;
+      }
+
+      .header, .server-name {
+          display: flex;
+          align-items: center;
+          justify-content: start;
+          color: #333;
+      }
+
+      .server-name {
+          flex: 1;
+          padding-left: 15px;
+          font-weight: normal;
+      }
 
+      .header {
+          font-weight: bold;
+          padding-left: 5px;
       }
 
       .database a {
-        margin-right: 10px;
-        color: darkblue;
-        font-size: 16px;
+          margin-right: 10px;
+          color: darkblue;
+          font-size: 16px
       }
 
       .database h2 {
-        margin: 0px;
-        font-size: 20px;
-        font-weight: bold;
+          margin: 0px;
       }
 
       .database p {
-        margin: 0px;
-        margin-top: 10px;
-        font-size: 16px;
+          margin: 0px;
+          margin-top: 10px;
       }
 
       .database {
-        margin: 0px;
-        padding: 10px;
-        cursor: pointer;
-        border-bottom: 1px solid #eeeeee;
+          margin: 0px;
+          padding: 10px;
+          cursor: pointer;
+          border-bottom: 1px solid #eeeeee;
       }
 
       .database:last-child {
-        border-bottom: none;
+          border-bottom: none;
       }
 
       .database:hover {
-        background: #eee;
+          background: #eee;
       }
-    </style>
-  </head>
+  </style>
+</head>
 
-  <body>
-    <h1><% config.name %> Databases</h1>
-    <% config.database_configs.each do |database_config| %>
-      <div class="database" onclick="window.location='<%= "#{database_config.url_path}/app" %>'">
-      <h2 class='name'><%= database_config.display_name %></h2>
-      <a class='query-link' href="<%= database_config.url_path %>/app">query</a>
-      <a class='saved-link' href="<%= database_config.url_path %>/app?tab=saved">saved</a>
-      <a class='structure-link' href="<%= database_config.url_path %>/app?tab=structure">structure</a>
-      <p class='description'>
-        <%= database_config.description %>
-      </p>
-    </div>
-    <% end %>
-  </body>
+<body>
+<div class="header-box">
+  <h1 class="header">SQLUI</h1>
+  <h1 class="server-name"><%= config.name %> Databases</h1>
+</div>
+<% config.database_configs.each do |database_config| %>
+  <div class="database" onclick="window.location='<%= "#{database_config.url_path}/app" %>'">
+    <h2 class='name'><%= database_config.display_name %></h2>
+    <a class='query-link' href="<%= database_config.url_path %>/app">query</a>
+    <a class='saved-link' href="<%= database_config.url_path %>/app?tab=saved">saved</a>
+    <a class='structure-link' href="<%= database_config.url_path %>/app?tab=structure">structure</a>
+    <p class='description'>
+      <%= database_config.description %>
+    </p>
+  </div>
+<% end %>
+</body>
 </html>

data/client/resources/sqlui.css

@@ -2,6 +2,18 @@ body {
     margin: 0;
 }
 
+h1 {
+    font-size: 22px;
+}
+
+h2 {
+    font-size: 20px;
+}
+
+p {
+    font-size: 18px;
+}
+
 .loading-box {
     font-family: monospace;
     display: flex;
@@ -13,6 +25,7 @@ body {
     align-items: start;
     justify-content: start;
     padding: 10px;
+    color: #333;
 }
 
 .main-box {
@@ -36,9 +49,15 @@ body {
     padding-left: 5px;
 }
 
+.header a {
+    text-decoration: none;
+    color: #333
+}
+
 .server-name {
     flex: 1;
     padding-left: 15px;
+    font-weight: normal;
 }
 
 .tabs-box {
@@ -46,7 +65,7 @@ body {
     flex-direction: row;
     border-bottom: 1px solid #ddd;
     height: 36px;
-    font-family: Helvetica;
+    font-family: Helvetica, sans-serif;
 }
 
 .tab-button, .selected-tab-button {
@@ -55,10 +74,11 @@ body {
     cursor: pointer;
     width: 150px;
     padding: 2px;
-    margin: 0px;
+    margin: 0;
     display: flex;
     justify-content: center;
     background-color: #fff;
+    font-size: 18px;
 }
 
 .tab-button {
@@ -100,6 +120,8 @@ body {
     border: 1px solid #888;
     background: none;
     padding: 5px;
+    font-size: 18px;
+    color: #333;
 }
 
 .status {
@@ -107,9 +129,11 @@ body {
     justify-content: center;
     align-content: center;
     flex-direction: column;
-    font-family: Helvetica;
+    font-family: Helvetica, sans-serif;
     white-space: nowrap;
     overflow: hidden;
+    font-size: 18px;
+    color: #333;
 }
 
 .result-box, .saved-box, .graph-box, .structure-box {
@@ -130,9 +154,10 @@ body {
 table {
     font-family: monospace;
     flex: 1;
-    border-spacing: 0px;
+    border-spacing: 0;
     display: flex;
     width: 100%;
+    color: #333;
 }
 
 table td:last-child, table th:last-child {
@@ -165,11 +190,11 @@ table {
 }
 
 thead {
-    padding: 0px;
+    padding: 0;
     background-color: #fff;
     position: -webkit-sticky;
     position: sticky;
-    top: 0px;
+    top: 0;
     z-index: 100;
     table-layout: fixed;
 }
@@ -181,7 +206,7 @@ thead {
 .status-box {
     padding: 5px;
     display: flex;
-    flex-direction: rows;
+    flex-direction: row;
     justify-content: space-between;
     border-top: 1px solid #ddd;
     height: 30px;
@@ -196,31 +221,31 @@ thead {
 }
 
 .saved-box {
-    font-family: Helvetica;
+    font-family: Helvetica, sans-serif;
 }
 
-.saved-box h1 {
-    margin: 0px;
-    padding-left: 10px;
-    padding-right: 10px;
-    padding-top: 10px;
-    padding-bottom: 10px;
+.saved-box h2 {
+    margin: 0;
     font-weight: bold;
 }
 
-.saved-box div:first-child {
+.saved-list-item:last-child {
     border-top: none !important;
 }
 
 .saved-box p {
-    margin: 0px;
-    padding-left: 20px;
-    padding-bottom: 20px;
+    margin: 0;
 }
 
-.saved-box div {
+.saved-list-item {
     cursor: pointer;
-    border-top: 1px solid #eeeeee;
+    border-bottom: 1px solid #eeeeee;
+    margin: 0;
+    padding: 10px;
+}
+
+.saved-list-item h2 {
+    margin: 0 0 5px;
 }
 
 .saved-box div:hover {
@@ -239,7 +264,6 @@ thead {
 
 .table-info {
     display: grid;
-    grid-template-columns: 1;
     grid-template-rows: 0.5fr 0.5fr;
     justify-items: stretch;
     flex: 1;
@@ -260,4 +284,5 @@ thead {
 
 select {
     outline: none;
+    color: #333;
 }

data/client/resources/sqlui.html

@@ -13,8 +13,8 @@
 
   <div id="main-box" class="main-box" style="display:none">
     <div class="tabs-box">
-      <div class="header">SQLUI</div>
-      <div id="server-name" class="server-name"></div>
+      <h1 class="header"><a href="/sqlui">SQLUI</a></h1>
+      <h1 id="server-name" class="server-name"></h1>
       <input id="query-tab-button" class="tab-button" type="button" value="Query" onclick="sqlui.selectTab('query')"></input>
       <input id="graph-tab-button" class="tab-button" type="button" value="Graph" onclick="sqlui.selectTab('graph')"></input>
       <input id="saved-tab-button" class="tab-button" type="button" value="Saved" onclick="sqlui.selectTab('saved')"></input>

data/client/resources/sqlui.js

@@ -24156,6 +24156,7 @@ var sqlui = (function (exports) {
      }
      saved.forEach(file => {
        const divElement = document.createElement('div');
+       divElement.classList.add('saved-list-item');
        divElement.addEventListener('click', function (event) {
          clearResult();
          const url = new URL(window.location);
@@ -24165,7 +24166,7 @@ var sqlui = (function (exports) {
          window.history.pushState({}, '', url);
          route();
        });
-       const nameElement = document.createElement('h1');
+       const nameElement = document.createElement('h2');
        nameElement.innerText = file.filename;
        divElement.appendChild(nameElement);
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqlui
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.21
 platform: ruby
 authors:
 - Nick Dower
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-27 00:00:00.000000000 Z
+date: 2022-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2