Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #7869 from influxdata/er-rp-validate-1.2 

[Backport 1.2] #7866
pull/7870/head
Edd Robinson 2017-01-23 19:36:12 +00:00 committed by GitHub
parent 89ccc852b6 d30819b978
commit a67b5457f5
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cmd/influxd/run/server_suite_test.go
View File

@ -29,10 +29,21 @@ func init() {
once: true,
},
&Query{
name: "create database should error with bad name",
name: "create database with retention policy should fail with invalid name",
command: `CREATE DATABASE db1 WITH NAME "."`,
exp: `{"results":[{"statement_id":0,"error":"invalid name"}]}`,
once: true,
},
&Query{
name: "create database should error with some unquoted names",
command: `CREATE DATABASE 0xdb0`,
exp: `{"error":"error parsing query: found 0xdb0, expected identifier at line 1, char 17"}`,
},
&Query{
name: "create database should error with invalid characters",
command: `CREATE DATABASE "."`,
exp: `{"results":[{"statement_id":0,"error":"invalid name"}]}`,
},
&Query{
name: "create database with retention duration should error with bad retention duration",
command: `CREATE DATABASE db0 WITH DURATION xyz`,
@ -367,6 +378,12 @@ func init() {
tests["retention_policy_commands"] = Test{
db: "db0",
queries: []*Query{
&Query{
name: "create retention policy with invalid name should return an error",
command: `CREATE RETENTION POLICY "." ON db0 DURATION 1d REPLICATION 1`,
exp: `{"results":[{"statement_id":0,"error":"invalid name"}]}`,
once: true,
},
&Query{
name: "create retention policy should succeed",
command: `CREATE RETENTION POLICY rp0 ON db0 DURATION 1h REPLICATION 1`,

8
coordinator/statement_executor.go
View File

@ -255,6 +255,14 @@ func (e *StatementExecutor) executeCreateDatabaseStatement(stmt *influxql.Create
return err
}
// If we're doing, for example, CREATE DATABASE "db" WITH DURATION 1d then
// the name will not yet be set. We only need to validate non-empty
// retention policy names, such as in the statement:
// CREATE DATABASE "db" WITH DURATION 1d NAME "xyz"
if stmt.RetentionPolicyName != "" && !meta.ValidName(stmt.RetentionPolicyName) {
return meta.ErrInvalidName
}
spec := meta.RetentionPolicySpec{
Name: stmt.RetentionPolicyName,
Duration: stmt.RetentionPolicyDuration,