From 796a5ec791923cc0a81bf58146c29f2859c7f031 Mon Sep 17 00:00:00 2001
From: marc <marc@cockroachlabs.com>
Date: Mon, 31 Aug 2015 14:45:32 -0400
Subject: [PATCH] Change system.descriptor column from desc to descriptor.

Fixes #2304.

Also remove quotes from column names in `CREATE TABLE` statements
so that we may catch reserved keywords in the future.
Add system table column listing to testdata.
---
 sql/doc.go          |  6 +++---
 sql/system.go       | 14 +++++++-------
 sql/testdata/system | 21 +++++++++++++++++++++
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/sql/doc.go b/sql/doc.go
index f605a2107506..de681af244f9 100644
--- a/sql/doc.go
+++ b/sql/doc.go
@@ -69,8 +69,8 @@ database/table name to ID and from ID to descriptor:
   );
 
   CREATE TABLE system.descriptor (
-    "id"   INT PRIMARY KEY,
-    "desc" BLOB
+    "id"         INT PRIMARY KEY,
+    "descriptor" BLOB
   );
 
 The reserved ID of 0 is used for the "root" of the namespace in which the
@@ -82,7 +82,7 @@ system effectively does a query like:
 And given a database/table ID, the system looks up the descriptor using a query
 like:
 
-  SELECT desc FROM system.descriptor WHERE id = <ID>
+  SELECT descriptor FROM system.descriptor WHERE id = <ID>
 
 Primary Key Addressing
 
diff --git a/sql/system.go b/sql/system.go
index 05d2157c8a9b..7d19f6d7dfe2 100644
--- a/sql/system.go
+++ b/sql/system.go
@@ -45,22 +45,22 @@ const (
 	// TODO(marc): wouldn't it be better to use a pre-parsed version?
 	namespaceTableSchema = `
 CREATE TABLE system.namespace (
-  "parentID" INT,
-  "name"     CHAR,
-  "id"       INT,
+  parentID INT,
+  name     CHAR,
+  id       INT,
   PRIMARY KEY (parentID, name)
 );`
 
 	descriptorTableSchema = `
 CREATE TABLE system.descriptor (
-  "id"   INT PRIMARY KEY,
-  "desc" BLOB
+  id         INT PRIMARY KEY,
+  descriptor BLOB
 );`
 
 	usersTableSchema = `
 CREATE TABLE system.users (
-  "username"       CHAR PRIMARY KEY,
-  "hashedPassword" BLOB
+  username       CHAR PRIMARY KEY,
+  hashedPassword BLOB
 );`
 )
 
diff --git a/sql/testdata/system b/sql/testdata/system
index 35d2bfda1385..ab9689b5736e 100644
--- a/sql/testdata/system
+++ b/sql/testdata/system
@@ -38,6 +38,27 @@ SELECT id FROM system.descriptor
 4
 1000
 
+# Verify format of system tables.
+query TTT
+SHOW COLUMNS FROM system.namespace;
+----
+parentID INT    true
+name     STRING true
+id       INT    true
+
+query TTT
+SHOW COLUMNS FROM system.descriptor;
+----
+id         INT   true
+descriptor BYTES true
+
+query TTT
+SHOW COLUMNS FROM system.users;
+----
+username       STRING true
+hashedPassword BYTES  true
+
+# Verify default privileges on system tables.
 query TTT
 SHOW GRANTS ON DATABASE system
 ----