From 9027abb900d1019230f2156adef76ae23e196ebe Mon Sep 17 00:00:00 2001
From: Shamim Mohamed <shamim@uber.com>
Date: Mon, 4 May 2020 14:15:56 -0700
Subject: [PATCH] Temporarily remove Docstore reserved words (#440)

---
 CHANGELOG.md  |  4 ++++
 names.go      | 12 ++++++------
 names_test.go |  4 ----
 version.go    |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ba5e10c..8a296bed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,11 @@
 # Changelog
 
+## v3.4.25 (unreleased)
+ - Nothing changed yet.
+
 ## v3.4.24 (unreleased)
  - Update the copyright messages to 2020.
+ - Temporarily remove the Docstore reserved word list
 
 ## v3.4.23 (2020-04-22)
  - Do not discard errors returned by the Gateway (for Read and CreateIfNotExists).
diff --git a/names.go b/names.go
index 8f4d8877..e828d474 100644
--- a/names.go
+++ b/names.go
@@ -52,12 +52,12 @@ func init() {
 		"rename", "replace", "revoke", "schema", "select", "set", "table", "to", "token", "truncate",
 		"unlogged", "update", "use", "using", "where", "with",
 	}
-	docstoreRsvd := []string{
-		"and", "array", "cast", "contains", "data", "default", "distinct", "else",
-		"false", "from", "group", "having", "interval", "limit", "metadata",
-		"null", "offset", "or", "order", "partition_key", "partition", "row_key",
-		"select", "tombstone", "true", "ts", "where",
-	}
+	docstoreRsvd := []string{} // Temporarily removed, shamim 2020-05-04
+	//	"and", "array", "cast", "contains", "data", "default", "distinct", "else",
+	//	"false", "from", "group", "having", "interval", "limit", "metadata",
+	//	"null", "offset", "or", "order", "partition_key", "partition", "row_key",
+	//	"select", "tombstone", "true", "ts", "where",
+	// }
 	reserved = make(map[string]struct{})
 	for _, n := range cassandraRsvd {
 		reserved[n] = struct{}{}
diff --git a/names_test.go b/names_test.go
index 2f3c8793..239bd454 100644
--- a/names_test.go
+++ b/names_test.go
@@ -71,10 +71,6 @@ func TestIsValidName(t *testing.T) {
 			arg: "keyspace",
 			err: "reserved word",
 		},
-		{
-			arg: "partition_key",
-			err: "reserved word",
-		},
 		{
 			arg: "schema",
 			err: "reserved word",
diff --git a/version.go b/version.go
index 2d7f3c7f..fe939858 100644
--- a/version.go
+++ b/version.go
@@ -21,4 +21,4 @@
 package dosa
 
 // VERSION indicates the dosa client version
-const VERSION = "3.4.23"
+const VERSION = "3.4.24"