sqlui 0.1.19 → 0.1.20

data/app/sqlui.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require_relative 'sqlui_config'
+require_relative 'server'
+
+# Main entry point.
+class Sqlui
+  MAX_ROWS = 1_000
+
+  def initialize(config_file)
+    raise 'you must specify a configuration file' unless config_file
+    raise 'configuration file does not exist' unless File.exist?(config_file)
+
+    @config = SqluiConfig.new(config_file)
+    @resources_dir = File.join(File.expand_path('..', File.dirname(__FILE__)), 'client', 'resources')
+
+    # Connect to each database to verify each can be connected to.
+    @config.database_configs.each { |database| database.with_client { |client| client } }
+  end
+
+  def run
+    Server.init_and_run(@config, @resources_dir)
+  end
+
+  def self.from_command_line(args)
+    if args.include?('-v') || args.include?('--version')
+      puts File.read('.version')
+      exit
+    end
+
+    raise 'you must specify a configuration file' unless args.size == 1
+    raise 'configuration file does not exist' unless File.exist?(args[0])
+
+    Sqlui.new(args[0])
+  end
+end

data/app/sqlui_config.rb

@@ -2,6 +2,7 @@
 
 require 'yaml'
 require_relative 'database_config'
+require_relative 'args'
 
 # App config including database configs.
 class SqluiConfig
@@ -10,40 +11,34 @@ class SqluiConfig
   def initialize(filename)
     config = YAML.safe_load(ERB.new(File.read(filename)).result)
     deep_symbolize!(config)
-    @name = fetch_non_empty_string(config, :name).strip
-    @list_url_path = fetch_non_empty_string(config, :list_url_path).strip
+    @name = Args.fetch_non_empty_string(config, :name).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 /'
     end
 
-    databases = config[:databases]
-    if databases.nil? || !databases.is_a?(Hash) || databases.empty?
-      raise ArgumentError, 'required parameter databases missing'
-    end
-
+    databases = Args.fetch_non_empty_hash(config, :databases)
     @database_configs = databases.map do |_, current|
       DatabaseConfig.new(current)
     end
   end
 
   def database_config_for(url_path:)
-    @database_configs.find { |database| database.url_path == url_path } || raise("no config found for path #{url_path}")
+    config = @database_configs.find { |database| database.url_path == url_path }
+    raise ArgumentError, "no config found for path #{url_path}" unless config
+
+    config
   end
 
   private
 
-  def fetch_non_empty_string(hash, key)
-    value = hash[key]
-    raise ArgumentError, "required parameter #{key} missing" if value.nil? || !value.is_a?(String) || value.strip.empty?
-
-    value.strip
-  end
-
   def deep_symbolize!(object)
-    return unless object.is_a? Hash
+    return object unless object.is_a? Hash
 
     object.transform_keys!(&:to_sym)
     object.each_value { |child| deep_symbolize!(child) }
+
+    object
   end
 end

data/bin/sqlui

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require_relative '../app/server'
+require_relative '../app/sqlui'
+
+Sqlui.from_command_line(ARGV).run

data/client/resources/sqlui.css

@@ -1,242 +1,263 @@
-    body {
-      font-size: 16px;
-      margin: 0;
-    }
-
-    .main-box {
-      display: flex;
-      flex-direction: column;
-      flex: 1;
-      margin: 0;
-      height: 100%;
-      min-height: 100%;
-    }
-
-    .header {
-      display: flex;
-      flex: 1;
-      align-items: center;
-      justify-content: start;
-      padding-left: 5px;
-      color: #333;
-      font-weight: bold;
-    }
-
-    .tabs-box {
-      display: flex;
-      flex-direction: row;
-      border-bottom: 1px solid #ddd;
-      height: 36px;
-      font-size: 16px;
-      font-family: Helvetica;
-    }
-
-    .tab-button, .selected-tab-button {
-      border: none;
-      outline: none;
-      cursor: pointer;
-      width: 150px;
-      padding: 2px;
-      margin: 0px;
-      display: flex;
-      justify-content: center;
-      background-color: #fff;
-    }
-
-    .tab-button {
-      color: #888;
-    }
-
-    .tab-button:hover {
-      color: #333;
-    }
-
-    .selected-tab-button {
-      color: #333;
-      font-weight: bold;
-    }
-
-    .tab-content-element {
-      display: none;
-    }
-
-    .query-box {
-      display: flex;
-      flex-direction: column;
-    }
-
-    .query {
-      display: flex;
-      flex: 1;
-    }
-
-    .submit-box {
-      display: flex;
-      border-top: 1px solid #ddd;
-      height: 36px;
-      justify-content: right;
-    }
-
-    .status {
-      display: flex;
-      justify-content: center;
-      align-content: center;
-      flex-direction: column;
-      font-family: Helvetica;
-    }
-
-    .result-box, .saved-box, .graph-box, .structure-box {
-      flex: 1;
-      overflow: auto;
-      display: flex;
-      flex-direction: column;
-    }
-
-    .graph-box, .result-box {
-      border-top: 1px solid #ddd;
-    }
-
-    .graph-box {
-      padding: 20px;
-    }
-
-    table {
-      font-family: monospace;
-      flex: 1;
-      border-spacing: 0px;
-      display: flex;
-      width: 100%;
-    }
-
-    table td:last-child, table th:last-child {
-      width: 100%;
-      border-right: none !important;
-    }
-
-    td, th {
-      padding: 5px 20px 5px 5px;
-      font-weight: normal;
-      white-space: nowrap;
-      max-width: 500px;
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-
-    td {
-      text-align: right;
-    }
-
-    th {
-      text-align: left;
-      font-weight: bold;
-      border-bottom: 1px solid #ddd;
-      border-right: 1px solid #ddd;
-    }
-
-    table {
-      display: block;
-    }
-
-    thead {
-      padding: 0px;
-      background-color: #fff;
-      position: -webkit-sticky;
-      position: sticky;
-      top: 0px;
-      z-index: 100;
-      table-layout:fixed;
-    }
-
-    .highlighted-row {
-      background: #eee;
-    }
-
-    .status-box {
-      padding: 5px;
-      display: flex;
-      flex-direction: rows;
-      justify-content: space-between;
-      border-top: 1px solid #ddd;
-      height: 30px;
-    }
-
-    .CodeMirror pre.CodeMirror-placeholder {
-      color: #999;
-    }
-
-    .tabs-box {
-      display: flex;
-    }
-
-    .saved-box {
-      font-family: Helvetica;
-    }
-
-    .saved-box h1 {
-      margin: 0px;
-      padding-left: 10px;
-      padding-right: 10px;
-      padding-top: 10px;
-      padding-bottom: 10px;
-      font-size: 16px;
-      font-weight: bold;
-    }
-
-    .saved-box div:first-child {
-      border-top: none !important;
-    }
-
-    .saved-box p {
-      margin: 0px;
-      padding-left: 20px;
-      padding-bottom: 20px;
-    }
-
-    .saved-box div {
-      cursor: pointer;
-      border-top: 1px solid #eeeeee;
-    }
-
-    .saved-box div:hover {
-      background: #eee;
-    }
-
-    .submit-button {
-      cursor: pointer;
-      margin-right: 10px;
-    }
-
-    .cm-editor.cm-focused {
-      outline: none !important;
-    }
-
-    .schemas, .tables {
-      border: none;
-      display: flex;
-      min-width: 200px;
-    }
-
-    .table-info {
-      display: grid;
-      grid-template-columns: 1;
-      grid-template-rows: 0.5fr 0.5fr;
-      justify-items: stretch;
-      flex: 1;
-    }
-
-    .columns {
-      border-bottom: 1px solid #ddd;
-      overflow: auto;
-      grid-column: 1;
-      grid-row: 1;
-    }
-
-    .indexes {
-      overflow: auto;
-      grid-column: 1;
-      grid-row: 2;
-    }
-
-    select {
-      outline: none;
-    }
+body {
+    margin: 0;
+}
+
+.loading-box {
+    font-family: monospace;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    margin: 0;
+    height: 100%;
+    min-height: 100%;
+    align-items: start;
+    justify-content: start;
+    padding: 10px;
+}
+
+.main-box {
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    margin: 0;
+    height: 100%;
+    min-height: 100%;
+}
+
+.header, .server-name {
+    display: flex;
+    align-items: center;
+    justify-content: start;
+    color: #333;
+}
+
+.header {
+    font-weight: bold;
+    padding-left: 5px;
+}
+
+.server-name {
+    flex: 1;
+    padding-left: 15px;
+}
+
+.tabs-box {
+    display: flex;
+    flex-direction: row;
+    border-bottom: 1px solid #ddd;
+    height: 36px;
+    font-family: Helvetica;
+}
+
+.tab-button, .selected-tab-button {
+    border: none;
+    outline: none;
+    cursor: pointer;
+    width: 150px;
+    padding: 2px;
+    margin: 0px;
+    display: flex;
+    justify-content: center;
+    background-color: #fff;
+}
+
+.tab-button {
+    color: #888;
+}
+
+.tab-button:hover {
+    color: #333;
+}
+
+.selected-tab-button {
+    color: #333;
+    font-weight: bold;
+}
+
+.tab-content-element {
+    display: none;
+}
+
+.query-box {
+    display: flex;
+    flex-direction: column;
+}
+
+.query {
+    display: flex;
+    flex: 1;
+}
+
+.submit-box {
+    display: flex;
+    border-top: 1px solid #ddd;
+    justify-content: right;
+}
+
+.submit-button {
+    cursor: pointer;
+    margin: 5px;
+    border: 1px solid #888;
+    background: none;
+    padding: 5px;
+}
+
+.status {
+    display: flex;
+    justify-content: center;
+    align-content: center;
+    flex-direction: column;
+    font-family: Helvetica;
+    white-space: nowrap;
+    overflow: hidden;
+}
+
+.result-box, .saved-box, .graph-box, .structure-box {
+    flex: 1;
+    overflow: auto;
+    display: flex;
+    flex-direction: column;
+}
+
+.graph-box, .result-box {
+    border-top: 1px solid #ddd;
+}
+
+.graph-box {
+    padding: 20px;
+}
+
+table {
+    font-family: monospace;
+    flex: 1;
+    border-spacing: 0px;
+    display: flex;
+    width: 100%;
+}
+
+table td:last-child, table th:last-child {
+    width: 100%;
+    border-right: none !important;
+}
+
+td, th {
+    padding: 5px 20px 5px 5px;
+    font-weight: normal;
+    white-space: nowrap;
+    max-width: 500px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+td {
+    text-align: right;
+}
+
+th {
+    text-align: left;
+    font-weight: bold;
+    border-bottom: 1px solid #ddd;
+    border-right: 1px solid #ddd;
+}
+
+table {
+    display: block;
+}
+
+thead {
+    padding: 0px;
+    background-color: #fff;
+    position: -webkit-sticky;
+    position: sticky;
+    top: 0px;
+    z-index: 100;
+    table-layout: fixed;
+}
+
+.highlighted-row {
+    background: #eee;
+}
+
+.status-box {
+    padding: 5px;
+    display: flex;
+    flex-direction: rows;
+    justify-content: space-between;
+    border-top: 1px solid #ddd;
+    height: 30px;
+}
+
+.CodeMirror pre.CodeMirror-placeholder {
+    color: #999;
+}
+
+.tabs-box {
+    display: flex;
+}
+
+.saved-box {
+    font-family: Helvetica;
+}
+
+.saved-box h1 {
+    margin: 0px;
+    padding-left: 10px;
+    padding-right: 10px;
+    padding-top: 10px;
+    padding-bottom: 10px;
+    font-weight: bold;
+}
+
+.saved-box div:first-child {
+    border-top: none !important;
+}
+
+.saved-box p {
+    margin: 0px;
+    padding-left: 20px;
+    padding-bottom: 20px;
+}
+
+.saved-box div {
+    cursor: pointer;
+    border-top: 1px solid #eeeeee;
+}
+
+.saved-box div:hover {
+    background: #eee;
+}
+
+.cm-editor.cm-focused {
+    outline: none !important;
+}
+
+.schemas, .tables {
+    border: none;
+    display: flex;
+    min-width: 200px;
+}
+
+.table-info {
+    display: grid;
+    grid-template-columns: 1;
+    grid-template-rows: 0.5fr 0.5fr;
+    justify-items: stretch;
+    flex: 1;
+}
+
+.columns {
+    border-bottom: 1px solid #ddd;
+    overflow: auto;
+    grid-column: 1;
+    grid-row: 1;
+}
+
+.indexes {
+    overflow: auto;
+    grid-column: 1;
+    grid-row: 2;
+}
+
+select {
+    outline: none;
+}

data/client/resources/sqlui.html

@@ -8,9 +8,13 @@
 </head>
 
 <body>
-  <div class="main-box">
+  <div id="loading-box" class="loading-box">
+  </div>
+
+  <div id="main-box" class="main-box" style="display:none">
     <div class="tabs-box">
-      <div id="header" class="header">SQLUI</div>
+      <div class="header">SQLUI</div>
+      <div id="server-name" class="server-name"></div>
       <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>
@@ -21,11 +25,10 @@
       <div id="query"></div>
     </div>
 
-    <!--
     <div id="submit-box" class="submit-box tab-content-element graph-element query-element" style="display: none;">
-      <input id="submit-button" class="submit-button" type="button" value="submit" onclick="submit();"></input>
+      <input id="submit-all-button" class="submit-button" type="button" value="execute (ctrl-shift-enter)" onclick="sqlui.submitAll();"></input>
+      <input id="submit-current-button" class="submit-button" type="button" value="execute selection (ctrl-enter)" onclick="sqlui.submitCurrent();"></input>
     </div>
-    -->
 
     <div id="result-box" class="result-box tab-content-element query-element" style="display: none;">
     </div>