Skip to content

Commit

Permalink
Temporarily remove Docstore reserved words (#440)
Browse files Browse the repository at this point in the history
  • Loading branch information
phliar authored May 4, 2020
1 parent a015d8f commit 9027abb
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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).
Expand Down
12 changes: 6 additions & 6 deletions names.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{}{}
Expand Down
4 changes: 0 additions & 4 deletions names_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion version.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
package dosa

// VERSION indicates the dosa client version
const VERSION = "3.4.23"
const VERSION = "3.4.24"

0 comments on commit 9027abb

Please sign in to comment.