Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix booleans #92

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 58 additions & 0 deletions driver/driver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1170,6 +1170,64 @@ func TestInsertByteArrayODBC(t *testing.T) {
}
}

func TestInsertBoolTrueODBC(t *testing.T) {

db, err := sql.Open("ramsql", "TestInsertBoolODBC")
if err != nil {
t.Fatalf("sql.Open : Error : %s\n", err)
}

_, err = db.Exec(`CREATE TABLE test_bool (sequence_number BIGSERIAL PRIMARY KEY, is_ready boolean, created_at TIMESTAMP)`)
if err != nil {
t.Fatalf("sql.Exec: Error: %s\n", err)
}

want := true
_, err = db.Exec("INSERT INTO test_bool (is_ready) values (?)", want)
if err != nil {
t.Fatalf("sql.Exec: Error: %s\n", err)
}

var got bool
err = db.QueryRow("SELECT is_ready FROM test_bool limit 1").Scan(&got)
if err != nil {
t.Fatalf("sql.Select: Error: %s\n", err)
}

if !reflect.DeepEqual(want, got) {
t.Fatalf("Expected JSON to be '%v', got '%v'", want, got)
}
}

func TestInsertBoolFalseODBC(t *testing.T) {

db, err := sql.Open("ramsql", "TestInsertBoolODBC")
if err != nil {
t.Fatalf("sql.Open : Error : %s\n", err)
}

_, err = db.Exec(`CREATE TABLE test_bool (sequence_number BIGSERIAL PRIMARY KEY, is_ready boolean, created_at TIMESTAMP)`)
if err != nil {
t.Fatalf("sql.Exec: Error: %s\n", err)
}

want := false
_, err = db.Exec("INSERT INTO test_bool (is_ready) values (?)", want)
if err != nil {
t.Fatalf("sql.Exec: Error: %s\n", err)
}

var got bool
err = db.QueryRow("SELECT is_ready FROM test_bool limit 1").Scan(&got)
if err != nil {
t.Fatalf("sql.Select: Error: %s\n", err)
}

if !reflect.DeepEqual(want, got) {
t.Fatalf("Expected JSON to be '%v', got '%v'", want, got)
}
}

func TestSchema(t *testing.T) {

db, err := sql.Open("ramsql", "TestSchema")
Expand Down
58 changes: 57 additions & 1 deletion engine/parser/lexer.go
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ func (l *lexer) lex(instruction []byte) ([]Token, error) {
matchers = append(matchers, l.genericStringMatcher("for", ForToken))
matchers = append(matchers, l.genericStringMatcher("default", DefaultToken))
matchers = append(matchers, l.genericStringMatcher("localtimestamp", LocalTimestampToken))
matchers = append(matchers, l.genericStringMatcher("false", LocalTimestampToken))
matchers = append(matchers, l.isCreateStatement(l.genericStringMatcher("false", FalseToken)))
matchers = append(matchers, l.genericStringMatcher("unique", UniqueToken))
matchers = append(matchers, l.genericStringMatcher("now()", NowToken))
matchers = append(matchers, l.genericStringMatcher("offset", OffsetToken))
Expand All @@ -212,6 +212,7 @@ func (l *lexer) lex(instruction []byte) ([]Token, error) {
matchers = append(matchers, l.MatchDateToken)
matchers = append(matchers, l.MatchNumberToken)
matchers = append(matchers, l.MatchStringToken)
matchers = append(matchers, l.MatchBooleanToken)

var r bool
for l.pos < l.instructionLen {
Expand All @@ -237,6 +238,23 @@ func (l *lexer) lex(instruction []byte) ([]Token, error) {
return l.tokens, nil
}

func (l *lexer) isCreateStatement(matcher Matcher) Matcher {
return func() bool {
isCreateStmt := false
for _, token := range l.tokens {
if token.Token == CreateToken {
isCreateStmt = true
}
}

if !isCreateStmt {
return false
}

return matcher()
}
}

func (l *lexer) MatchArgTokenODBC() bool {

i := l.pos
Expand Down Expand Up @@ -430,6 +448,44 @@ func (l *lexer) MatchNumberToken() bool {
return false
}

func (l *lexer) MatchBooleanToken() bool {

// check if it is an update or insert statment; make sure it is not a create statement
canContinue := false
for _, token := range l.tokens {
if token.Token == CreateToken {
return false
}
if token.Token == UpdateToken || token.Token == InsertToken {
canContinue = true
}
}

if !canContinue {
return false
}

i := l.pos
for i < l.instructionLen &&
(unicode.IsLetter(rune(l.instruction[i])) ||
l.instruction[i] == '_' ||
l.instruction[i] == '@') {
i++
}

if i != l.pos {
t := Token{
Token: StringToken,
Lexeme: string(l.instruction[l.pos:i]),
}
l.tokens = append(l.tokens, t)
l.pos = i
return true
}

return false
}

// 2015-09-10 14:03:09.444695269 +0200 CEST);
func (l *lexer) MatchDateToken() bool {

Expand Down
Loading