Merge remote-tracking branch 'upstream/master' into itn/tables-quotes-2

# Conflicts: # pkg/client/client.go
2018-06-20 07:19:34 -07:00
parent 7b3e99b599 41a99be4ca
commit 9bb3afe6ce
18 changed files with 286 additions and 56 deletions
--- a/pkg/statements/sql.go
+++ b/pkg/statements/sql.go
@@ -73,6 +73,13 @@ SELECT
  pg_size_pretty(pg_total_relation_size($1)) AS total_size,
  (SELECT reltuples FROM pg_class WHERE oid = $1::regclass) AS rows_count`

+	TableInfoCockroach = `
+SELECT
+  'n/a' AS data_size,
+  'n/a' AS index_size,
+  'n/a' AS total_size,
+  'n/a' AS rows_count`
+
 	// ---------------------------------------------------------------------------

 	TableSchema = `