Merge fede63a878 into e6df3d19fa

* add exec time of empty queries
* add { }
* fix space
* use proposed format

.github/workflows/docker.yml

@@ -34,4 +34,4 @@ jobs:
           tags: pgweb:latest
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           build-args: |
-            "CGO_ENABLED=${{ env.CGO_ENABLED }}"
+            CGO_ENABLED=${{ env.CGO_ENABLED }}

.github/workflows/release.yml

@@ -58,3 +58,5 @@ jobs:
             ghcr.io/${{ env.GHCR_REPOSITORY }}:${{ steps.refs.outputs.SOURCE_TAG }}
             ghcr.io/${{ env.GHCR_REPOSITORY }}:latest
           platforms: linux/amd64,linux/arm64,linux/arm/v7
+          build-args: |
+            CGO_ENABLED=${{ env.CGO_ENABLED }}

CHANGELOG.md

@@ -374,7 +374,7 @@ Current [release](https://github.com/sosedoff/pgweb/releases) is `0.16.2`.
 ## 0.6.0 - 2015-05-31
 
 - Adds ability to execute only selected SQL query in run command view, [GH-85]
-- Adds ability to delete/truncate table via context meny on sidebar view
+- Adds ability to delete/truncate table via context many on sidebar view
 - Adds ability to export table contents to CSV via context menu on sidebar view
 - Changes sidebar color scheme to a lighter and better looking one
 
@@ -388,7 +388,7 @@ Current [release](https://github.com/sosedoff/pgweb/releases) is `0.16.2`.
 
 ## 0.5.2 - 2015-04-13
 
-- Adds a new endpoint /activity that retuns active queries
+- Adds a new endpoint /activity that returns active queries
 - Adds tab to view active queries
 - Adds column sorting when browsing table contents
 - Fixes SQL query view when switching to table structure view

CONTRIBUTING.md

@@ -2,6 +2,6 @@
 - Create a new git branch
 - Make changes
 - Run tests: `make test`
-- Run tests agains all supported PostreSQL versions: `make test-all` (optional)
+- Run tests against all supported PostreSQL versions: `make test-all` (optional)
 - If you change frontend code (js/css) make sure to rebuild assets: `make assets`
 - Open a new pull request

config/examples/connect_backend_ruby/main.rb

@@ -3,7 +3,7 @@ require "sinatra"
 # Authentication token
 $token = "test"
 
-# List of all availble resources
+# List of all available resources
 $resources = {
   "id1" => "postgres://localhost:5432/db1?sslmode=disable",
   "id2" => "postgres://localhost:5432/db2?sslmode=disable",

pkg/cli/cli.go

@@ -215,7 +215,7 @@ func startServer() {
 
 		err := router.Run(fmt.Sprintf("%v:%v", options.HTTPHost, options.HTTPPort))
 		if err != nil {
-			fmt.Println("Cant start server:", err)
+			fmt.Println("Can't start server:", err)
 			if strings.Contains(err.Error(), "address already in use") {
 				openPage()
 			}

pkg/command/options.go

@@ -181,7 +181,7 @@ func ParseOptions(args []string) (Options, error) {
 
 	homePath, err := homedir.Dir()
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "[WARN] cant detect home dir: %v", err)
+		fmt.Fprintf(os.Stderr, "[WARN] can't detect home dir: %v", err)
 		homePath = os.Getenv("HOME")
 	}
 

static/js/app.js

@@ -430,7 +430,11 @@ function buildTable(results, sortColumn, sortOrder, options) {
   if (results.rows.length == 0) {
     $("#results_header").html("");
     $("#results_body").html("<tr><td>No records found</td></tr>");
-    $("#result-rows-count").html("");
+    if (results.stats) {
+      $("#result-rows-count").html(results.stats.query_duration_ms + " ms");
+    } else {
+      $("#result-rows-count").html("");
+    }
     $("#results").addClass("empty");
     return;
   }
@@ -440,9 +444,8 @@ function buildTable(results, sortColumn, sortOrder, options) {
 
   results.columns.forEach(function(col) {
     if (col === sortColumn) {
-      cols += "<th class='table-header-col active' data-name='" + col + "'" + "data-order=" + sortOrder + ">" + col + "&nbsp;" + sortArrow(sortOrder) + "</th>";
-    }
-    else {
+      cols += "<th class='table-header-col active' data-name='" + col + "' data-order=" + sortOrder + ">" + col + "&nbsp;" + sortArrow(sortOrder) + "</th>";
+    } else {
       cols += "<th class='table-header-col' data-name='" + col + "'>" + col + "</th>";
     }
   });