fluidB
/
fluidb-old
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #702 from rqlite/better_var_name

Browse Source 
Better variable name, Query -> SQL
master
Philip O'Toole 4 years ago committed by GitHub
parent 5da95631b2 b4867713e4
commit 6bf184661e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File

12
db/db.go
Unescape Escape View File

@ -72,7 +72,7 @@ type Rows struct {
// Statement represents a single parameterized statement for processing
// by the database layer.
type Statement struct {
Query string
SQL string
Parameters []driver.Value
}
@ -243,16 +243,16 @@ func (db *DB) Execute(stmts []Statement, tx, xTime bool) ([]*Result, error) {
}
}
// Execute each query.
// Execute each statement.
for _, stmt := range stmts {
if stmt.Query == "" {
if stmt.SQL == "" {
continue
}
result := &Result{}
start := time.Now()
r, err := execer.Exec(stmt.Query, stmt.Parameters)
r, err := execer.Exec(stmt.SQL, stmt.Parameters)
if err != nil {
if handleError(result, err) {
continue
@ -335,14 +335,14 @@ func (db *DB) Query(stmts []Statement, tx, xTime bool) ([]*Rows, error) {
}
for _, stmt := range stmts {
if stmt.Query == "" {
if stmt.SQL == "" {
continue
}
rows := &Rows{}
start := time.Now()
rs, err := queryer.Query(stmt.Query, stmt.Parameters)
rs, err := queryer.Query(stmt.SQL, stmt.Parameters)
if err != nil {
rows.Error = err.Error()
allRows = append(allRows, rows)

4
db/db_test.go
Unescape Escape View File

@ -440,7 +440,7 @@ func Test_SimpleParameterizedStatements(t *testing.T) {
}
s := Statement{
Query: "INSERT INTO foo(name) VALUES(?)",
SQL: "INSERT INTO foo(name) VALUES(?)",
Parameters: []driver.Value{"fiona"},
}
_, err = db.Execute([]Statement{s}, false, false)
@ -462,7 +462,7 @@ func Test_SimpleParameterizedStatements(t *testing.T) {
t.Fatalf("unexpected results for query\nexp: %s\ngot: %s", exp, got)
}
s.Query = "SELECT * FROM foo WHERE name=?"
s.SQL = "SELECT * FROM foo WHERE name=?"
s.Parameters = []driver.Value{"aoife"}
r, err = db.Query([]Statement{s}, false, false)
if err != nil {

4
http/request_parser.go
Unescape Escape View File

@ -33,7 +33,7 @@ func ParseRequest(b []byte) ([]store.Statement, error) {
stmts := make([]store.Statement, len(simple))
for i := range simple {
stmts[i].Query = simple[i]
stmts[i].SQL = simple[i]
}
return stmts, nil
}
@ -49,7 +49,7 @@ func ParseRequest(b []byte) ([]store.Statement, error) {
return nil, ErrNoStatements
}
stmts[i].Query = parameterized[i][0].(string)
stmts[i].SQL = parameterized[i][0].(string)
if len(parameterized[i]) == 1 {
continue
}

32
http/request_parser_test.go
Unescape Escape View File

@ -38,8 +38,8 @@ func Test_SingleSimpleRequest(t *testing.T) {
if len(stmts) != 1 {
t.Fatalf("incorrect number of statements returned: %d", len(stmts))
}
if stmts[0].Query != s {
t.Fatalf("incorrect statement parsed, exp %s, got %s", s, stmts[0].Query)
if stmts[0].SQL != s {
t.Fatalf("incorrect statement parsed, exp %s, got %s", s, stmts[0].SQL)
}
if stmts[0].Parameters != nil {
t.Fatal("statement parameters are not nil")
@ -69,14 +69,14 @@ func Test_DoubleSimpleRequest(t *testing.T) {
if len(stmts) != 2 {
t.Fatalf("incorrect number of statements returned: %d", len(stmts))
}
if stmts[0].Query != s0 {
t.Fatalf("incorrect statement parsed, exp %s, got %s", s0, stmts[0].Query)
if stmts[0].SQL != s0 {
t.Fatalf("incorrect statement parsed, exp %s, got %s", s0, stmts[0].SQL)
}
if stmts[0].Parameters != nil {
t.Fatal("statement parameters are not nil")
}
if stmts[1].Query != s1 {
t.Fatalf("incorrect statement parsed, exp %s, got %s", s1, stmts[1].Query)
if stmts[1].SQL != s1 {
t.Fatalf("incorrect statement parsed, exp %s, got %s", s1, stmts[1].SQL)
}
if stmts[1].Parameters != nil {
t.Fatal("statement parameters are not nil")
@ -97,8 +97,8 @@ func Test_SingleParameterizedRequest(t *testing.T) {
if len(stmts) != 1 {
t.Fatalf("incorrect number of statements returned: %d", len(stmts))
}
if stmts[0].Query != s {
t.Fatalf("incorrect statement parsed, exp %s, got %s", s, stmts[0].Query)
if stmts[0].SQL != s {
t.Fatalf("incorrect statement parsed, exp %s, got %s", s, stmts[0].SQL)
}
if len(stmts[0].Parameters) != 2 {
@ -124,8 +124,8 @@ func Test_SingleParameterizedRequestNoParams(t *testing.T) {
if len(stmts) != 1 {
t.Fatalf("incorrect number of statements returned: %d", len(stmts))
}
if stmts[0].Query != s {
t.Fatalf("incorrect statement parsed, exp %s, got %s", s, stmts[0].Query)
if stmts[0].SQL != s {
t.Fatalf("incorrect statement parsed, exp %s, got %s", s, stmts[0].SQL)
}
if len(stmts[0].Parameters) != 0 {
@ -147,15 +147,15 @@ func Test_SingleParameterizedRequestNoParamsMixed(t *testing.T) {
if len(stmts) != 2 {
t.Fatalf("incorrect number of statements returned: %d", len(stmts))
}
if stmts[0].Query != s1 {
t.Fatalf("incorrect statement parsed, exp %s, got %s", s1, stmts[0].Query)
if stmts[0].SQL != s1 {
t.Fatalf("incorrect statement parsed, exp %s, got %s", s1, stmts[0].SQL)
}
if len(stmts[0].Parameters) != 0 {
t.Fatalf("incorrect number of parameters returned: %d", len(stmts[0].Parameters))
}
if stmts[1].Query != s2 {
t.Fatalf("incorrect statement parsed, exp %s, got %s", s2, stmts[0].Query)
if stmts[1].SQL != s2 {
t.Fatalf("incorrect statement parsed, exp %s, got %s", s2, stmts[0].SQL)
}
if len(stmts[1].Parameters) != 1 {
t.Fatalf("incorrect number of parameters returned: %d", len(stmts[0].Parameters))
@ -177,8 +177,8 @@ func Test_SingleSimpleParameterizedRequest(t *testing.T) {
if len(stmts) != 1 {
t.Fatalf("incorrect number of statements returned: %d", len(stmts))
}
if stmts[0].Query != s {
t.Fatalf("incorrect statement parsed, exp %s, got %s", s, stmts[0].Query)
if stmts[0].SQL != s {
t.Fatalf("incorrect statement parsed, exp %s, got %s", s, stmts[0].SQL)
}
if stmts[0].Parameters != nil {

2
http/service.go
Unescape Escape View File

@ -475,7 +475,7 @@ func (s *Service) handleLoad(w http.ResponseWriter, r *http.Request) {
queries := []string{string(b)}
stmts := make([]store.Statement, len(queries))
for i := range queries {
stmts[i].Query = queries[i]
stmts[i].SQL = queries[i]
}
results, err := s.store.ExecuteOrAbort(&store.ExecuteRequest{stmts, timings, false})

2
store/command.go
Unescape Escape View File

@ -43,7 +43,7 @@ func newMetadataSetCommand(id string, md map[string]string) (*command, error) {
// reasons. Unless Parameters is nil, it should be the same length as Queries.
type databaseSub struct {
Tx bool `json:"tx,omitempty"`
Queries []string `json:"queries,omitempty"`
SQLs []string `json:"queries,omitempty"`
Parameters [][]Value `json:"Parameters,omitempty`
Timings bool `json:"timings,omitempty"`
}

18
store/store.go
Unescape Escape View File

@ -88,7 +88,7 @@ type Value interface{}
// Statement represent a parameterized SQL statement.
type Statement struct {
Query string
SQL string
Parameters []Value
}
@ -105,7 +105,7 @@ type QueryRequest struct {
func (q *QueryRequest) statements() []sql.Statement {
stmts := make([]sql.Statement, len(q.Stmts))
for i, s := range q.Stmts {
stmts[i].Query = s.Query
stmts[i].SQL = s.SQL
stmts[i].Parameters = make([]gosql.Value, len(s.Parameters))
for j := range s.Parameters {
stmts[i].Parameters[j] = s.Parameters[j]
@ -117,12 +117,12 @@ func (q *QueryRequest) statements() []sql.Statement {
func (q *QueryRequest) command() *databaseSub {
c := databaseSub{
Tx: q.Tx,
Queries: make([]string, len(q.Stmts)),
SQLs: make([]string, len(q.Stmts)),
Parameters: make([][]Value, len(q.Stmts)),
Timings: q.Timings,
}
for i, s := range q.Stmts {
c.Queries[i] = s.Query
c.SQLs[i] = s.SQL
c.Parameters[i] = s.Parameters
}
return &c
@ -139,12 +139,12 @@ type ExecuteRequest struct {
func (e *ExecuteRequest) command() *databaseSub {
c := databaseSub{
Tx: e.Tx,
Queries: make([]string, len(e.Stmts)),
SQLs: make([]string, len(e.Stmts)),
Parameters: make([][]Value, len(e.Stmts)),
Timings: e.Timings,
}
for i, s := range e.Stmts {
c.Queries[i] = s.Query
c.SQLs[i] = s.SQL
c.Parameters[i] = s.Parameters
}
return &c
@ -1123,9 +1123,9 @@ func (s *Store) database(leader bool, dst io.Writer) error {
func (f *fsmSnapshot) Release() {}
func subCommandToStatements(d *databaseSub) []sql.Statement {
stmts := make([]sql.Statement, len(d.Queries))
for i := range d.Queries {
stmts[i].Query = d.Queries[i]
stmts := make([]sql.Statement, len(d.SQLs))
for i := range d.SQLs {
stmts[i].SQL = d.SQLs[i]
// Support backwards-compatibility, since previous versions didn't
// have Parameters in Raft commands.

Write Preview
Loading…
Cancel
Save