sqlui 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ba63da1ed30cfdea9173f2a36da69e8fc15dad031758462b155207b20a8fd80
-  data.tar.gz: 5c3b9d24c298b0d2fe959a7335768c3f42486e4997f1b9b3bc9277ecf50da43c
+  metadata.gz: d7c438724dd4d58432da2908650a10bb82c3452a2faf4f0560c5dd23a8fd6d66
+  data.tar.gz: 949a64296520f3e7fcfec48ae1a4cc8b4a4056184d88a88ca52b5813b1ad8064
 SHA512:
-  metadata.gz: 98690da6f44fd10cc3a10c8425da463d5db944ef8015836e74666ec4a64950940f5ae039da64f72c0f58b51ca3a375dcb18816c49a2c71fbae3cc86d4adba814
-  data.tar.gz: 4c26360082f3417e70e46b7436888e068c6897cebdd09b2019b2a9a4db3dc92bf5b0f27371e01b4dee2a153abaf21a09e931da395c7b72aa3d309ce7453c2528
+  metadata.gz: ab6348bdcbeb1b2dfd7e38c206b7d72bf388f28ae992e15c40823b00db1bc3bdfb705cc3764373ca0f1de053b32ea546f84bdacf99328b5b6def0f9aea40954e
+  data.tar.gz: a55564765cd9c90fe47ef06d521aefde3bc78f903527cd4a49b6817267364ff6cd609d47b645a9508c382fcc1798b355b414b12ea861782038b538dbaa90a861

data/.version

@@ -1 +1 @@
-0.1.15
+0.1.16

data/app/environment.rb

@@ -0,0 +1,20 @@
+class Environment
+  SERVER_ENV = ENV.fetch('SERVER_ENV', 'development').to_sym
+  SERVER_PORT = ENV.fetch('SERVER_PORT', 8080)
+
+  def self.server_env
+    SERVER_ENV
+  end
+
+  def self.development?
+    SERVER_ENV == :development
+  end
+
+  def self.production?
+    SERVER_ENV == :production
+  end
+
+  def self.server_port
+    SERVER_PORT
+  end
+end

data/app/server.rb

@@ -4,6 +4,7 @@ require 'mysql2'
 require 'sinatra/base'
 require_relative 'sqlui'
 require 'yaml'
+require_relative 'environment'
 
 if ARGV.include?('-v') || ARGV.include?('--version')
   puts File.read('.version')
@@ -16,7 +17,8 @@ raise "configuration file does not exist" unless File.exist?(ARGV[0])
 class Server < Sinatra::Base
   set :logging, true
   set :bind,    '0.0.0.0'
-  set :port,    Integer(ENV['PORT'])
+  set :port,    Environment.server_port
+  set :env,     Environment.server_env
 
   class Client
     def initialize(params)

data/app/sqlui.rb

@@ -11,7 +11,7 @@ class SQLUI
     @name = name
     @saved_path = saved_path
     @max_rows = max_rows
-    @resources_dir = File.join(File.expand_path('..', File.dirname(__FILE__)), 'resources')
+    @resources_dir = File.join(File.expand_path('..', File.dirname(__FILE__)), 'client', 'resources')
   end
 
   def get(params)
@@ -78,25 +78,6 @@ class SQLUI
   end
 
   def load_metadata
-    if @table_schema
-      where_clause = "where table_schema = '#{@table_schema}'"
-    else
-      where_clause = "where table_schema not in('mysql', 'sys')"
-    end
-    stats_result = @client.query(
-      <<~SQL
-        select
-          table_schema,
-          table_name,
-          index_name,
-          seq_in_index,
-          non_unique,
-          column_name
-        from information_schema.statistics
-        #{where_clause}
-        order by table_schema, table_name, if(index_name = "PRIMARY", 0, index_name), seq_in_index;
-      SQL
-    )
     result = {
       server:  @name,
       schemas: {},
@@ -107,40 +88,11 @@ class SQLUI
         }
       end
     }
-    stats_result.each do |row|
-      table_schema = row['table_schema']
-      unless result[:schemas][table_schema]
-        result[:schemas][table_schema] = {
-          tables: {}
-        }
-      end
-      tables = result[:schemas][table_schema][:tables]
-      table_name = row['table_name']
-      unless tables[table_name]
-        tables[table_name] = {
-          indexes: {},
-          columns: {}
-        }
-      end
-      indexes = tables[table_name][:indexes]
-      index_name = row['index_name']
-      unless indexes[index_name]
-        indexes[index_name] = {}
-      end
-      index = indexes[index_name]
-      column_name = row['column_name']
-      index[column_name] = {}
-      column = index[column_name]
-      column[:name] = index_name
-      column[:seq_in_index] = row['seq_in_index']
-      column[:non_unique] = row['non_unique']
-      column[:column_name] = row['column_name']
-    end
 
     if @table_schema
       where_clause = "where table_schema = '#{@table_schema}'"
     else
-      where_clause = "where table_schema not in('information_schema' 'mysql', 'performance_schema', 'sys')"
+      where_clause = "where table_schema not in('mysql', 'sys', 'information_schema', 'performance_schema')"
     end
     column_result = @client.query(
       <<~SQL
@@ -155,29 +107,78 @@ class SQLUI
           column_default,
           extra
         from information_schema.columns
-        where table_schema not in('information_schema' 'mysql', 'performance_schema', 'sys')
+        #{where_clause}
         order by table_schema, table_name, column_name, ordinal_position;
-    SQL
+      SQL
     )
     column_result.each do |row|
-      table_schema = row['table_schema']
-      table_name = row['table_name']
-      column_name = row['column_name']
-      next unless result[:schemas][table_schema]
-      next unless result[:schemas][table_schema][:tables][table_name]
-
+      row = row.transform_keys(&:downcase).transform_keys(&:to_sym)
+      table_schema = row[:table_schema]
+      unless result[:schemas][table_schema]
+        result[:schemas][table_schema] = {
+          tables: {}
+        }
+      end
+      table_name = row[:table_name]
+      tables = result[:schemas][table_schema][:tables]
+      unless tables[table_name]
+        tables[table_name] = {
+          indexes: {},
+          columns: {}
+        }
+      end
       columns = result[:schemas][table_schema][:tables][table_name][:columns]
+      column_name = row[:column_name]
       unless columns[column_name]
         columns[column_name] = {}
       end
       column = columns[column_name]
       column[:name] = column_name
-      column[:data_type] = row['data_type']
-      column[:length] = row['character_maximum_length']
-      column[:allow_null] = row['is_nullable']
-      column[:key] = row['column_key']
-      column[:default] = row['column_default']
-      column[:extra] = row['extra']
+      column[:data_type] = row[:data_type]
+      column[:length] = row[:character_maximum_length]
+      column[:allow_null] = row[:is_nullable]
+      column[:key] = row[:column_key]
+      column[:default] = row[:column_default]
+      column[:extra] = row[:extra]
+    end
+
+    if @table_schema
+      where_clause = "where table_schema = '#{@table_schema}'"
+    else
+      where_clause = "where table_schema not in('mysql', 'sys', 'information_schema', 'performance_schema')"
+    end
+    stats_result = @client.query(
+      <<~SQL
+        select
+          table_schema,
+          table_name,
+          index_name,
+          seq_in_index,
+          non_unique,
+          column_name
+        from information_schema.statistics
+        #{where_clause}
+        order by table_schema, table_name, if(index_name = "PRIMARY", 0, index_name), seq_in_index;
+      SQL
+    )
+    stats_result.each do |row|
+      row = row.transform_keys(&:downcase).transform_keys(&:to_sym)
+      table_schema = row[:table_schema]
+      tables = result[:schemas][table_schema][:tables]
+      table_name = row[:table_name]
+      indexes = tables[table_name][:indexes]
+      index_name = row[:index_name]
+      unless indexes[index_name]
+        indexes[index_name] = {}
+      end
+      index = indexes[index_name]
+      column_name = row[:column_name]
+      index[column_name] = {}
+      column = index[column_name]
+      column[:name] = index_name
+      column[:seq_in_index] = row[:seq_in_index]
+      column[:non_unique] = row[:non_unique]
+      column[:column_name] = row[:column_name]
     end
 
     result

data/app/views/databases.erb

@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>Payments Databases</title>
+    <title>Databases</title>
 
     <style>
       body {
@@ -49,7 +49,7 @@
   </head>
 
   <body>
-    <h1>Payments Databases</h1>
+    <h1>Databases</h1>
     <% databases.values.each do |database| %>
       <div class="database" onclick="window.location='<%= "/db/#{database['url_path']}/app" %>'">
       <h2><%= database['name'] %></h2>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqlui
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Nick Dower
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-20 00:00:00.000000000 Z
+date: 2022-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: watir
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 description: A SQL UI.
 email: nicholasdower@gmail.com
 executables:
@@ -130,13 +144,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".version"
+- app/environment.rb
 - app/server.rb
 - app/sqlui.rb
 - app/views/databases.erb
 - bin/sqlui
-- resources/sqlui.css
-- resources/sqlui.html
-- resources/sqlui.js
+- client/resources/sqlui.css
+- client/resources/sqlui.html
+- client/resources/sqlui.js
 homepage: https://github.com/nicholasdower/sqlui
 licenses:
 - MIT
@@ -156,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: A SQL UI.