noth/surrealpatch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DEFINE and REMOVE SQL queries can not be inside transactions

Browse source
This commit is contained in:
Tobie Morgan Hitchcock 2016-11-26 13:05:21 +00:00
parent 7bbe6cb610
commit 90953735d9
5 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sql/define.go
View file

@ -16,6 +16,10 @@ package sql
func (p *parser) parseDefineStatement() (Statement, error) { func (p *parser) parseDefineStatement() (Statement, error) {
if p.buf.txn {
return nil, &TXError{}
}
// Inspect the next token. // Inspect the next token.
tok, _, err := p.shouldBe(NAMESPACE, DATABASE, LOGIN, TOKEN, SCOPE, TABLE, RULES, FIELD, INDEX, VIEW) tok, _, err := p.shouldBe(NAMESPACE, DATABASE, LOGIN, TOKEN, SCOPE, TABLE, RULES, FIELD, INDEX, VIEW)

8
sql/error.go
View file

@ -43,6 +43,14 @@ func (e *BlankError) Error() string {
return fmt.Sprint("You need to specify a namespace and a database to use") return fmt.Sprint("You need to specify a namespace and a database to use")
} }
// TXError represents an error that occured when switching access.
type TXError struct{}
// Error returns the string representation of the error.
func (e *TXError) Error() string {
return fmt.Sprintf("DEFINE and REMOVE statements must be outside of a transaction.")
}
// NSError represents an error that occured when switching access. // NSError represents an error that occured when switching access.
type NSError struct { type NSError struct {
NS string NS string

1
sql/parser.go
View file

@ -30,6 +30,7 @@ type parser struct {
v map[string]interface{} v map[string]interface{}
buf struct { buf struct {
n int // buffer size n int // buffer size
txn bool // inside txn
tok Token // last read token tok Token // last read token
lit string // last read literal lit string // last read literal
val interface{} // Last read value val interface{} // Last read value

4
sql/remove.go
View file

@ -16,6 +16,10 @@ package sql
func (p *parser) parseRemoveStatement() (Statement, error) { func (p *parser) parseRemoveStatement() (Statement, error) {
if p.buf.txn {
return nil, &TXError{}
}
// Inspect the next token. // Inspect the next token.
tok, _, err := p.shouldBe(NAMESPACE, DATABASE, LOGIN, TOKEN, SCOPE, TABLE, RULES, FIELD, INDEX, VIEW) tok, _, err := p.shouldBe(NAMESPACE, DATABASE, LOGIN, TOKEN, SCOPE, TABLE, RULES, FIELD, INDEX, VIEW)

6
sql/trans.go
View file

@ -24,6 +24,8 @@ func (p *parser) parseBeginStatement() (stmt *BeginStatement, err error) {
return nil, err return nil, err
} }
p.buf.txn = true
return return
} }
@ -38,6 +40,8 @@ func (p *parser) parseCancelStatement() (stmt *CancelStatement, err error) {
return nil, err return nil, err
} }
p.buf.txn = false
return return
} }
@ -52,6 +56,8 @@ func (p *parser) parseCommitStatement() (stmt *CommitStatement, err error) {
return nil, err return nil, err
} }
p.buf.txn = false
return return
} }