Tweak calling convention.

This commit is contained in:
Nuno Cruces
2023-05-25 13:17:44 +01:00
parent 9e7b6bb8ea
commit eee71e06aa
7 changed files with 65 additions and 71 deletions

54
stmt.go
View File

@@ -29,7 +29,7 @@ func (s *Stmt) Close() error {
r := s.c.call(s.c.api.finalize, uint64(s.handle))
s.handle = 0
return s.c.error(r[0])
return s.c.error(r)
}
// Reset resets the prepared statement object.
@@ -38,7 +38,7 @@ func (s *Stmt) Close() error {
func (s *Stmt) Reset() error {
r := s.c.call(s.c.api.reset, uint64(s.handle))
s.err = nil
return s.c.error(r[0])
return s.c.error(r)
}
// ClearBindings resets all bindings on the prepared statement.
@@ -46,7 +46,7 @@ func (s *Stmt) Reset() error {
// https://www.sqlite.org/c3ref/clear_bindings.html
func (s *Stmt) ClearBindings() error {
r := s.c.call(s.c.api.clearBindings, uint64(s.handle))
return s.c.error(r[0])
return s.c.error(r)
}
// Step evaluates the SQL statement.
@@ -61,13 +61,13 @@ func (s *Stmt) ClearBindings() error {
func (s *Stmt) Step() bool {
s.c.checkInterrupt()
r := s.c.call(s.c.api.step, uint64(s.handle))
if r[0] == _ROW {
if r == _ROW {
return true
}
if r[0] == _DONE {
if r == _DONE {
s.err = nil
} else {
s.err = s.c.error(r[0])
s.err = s.c.error(r)
}
return false
}
@@ -94,7 +94,7 @@ func (s *Stmt) Exec() error {
func (s *Stmt) BindCount() int {
r := s.c.call(s.c.api.bindCount,
uint64(s.handle))
return int(r[0])
return int(r)
}
// BindIndex returns the index of a parameter in the prepared statement
@@ -106,7 +106,7 @@ func (s *Stmt) BindIndex(name string) int {
namePtr := s.c.arena.string(name)
r := s.c.call(s.c.api.bindIndex,
uint64(s.handle), uint64(namePtr))
return int(r[0])
return int(r)
}
// BindName returns the name of a parameter in the prepared statement.
@@ -117,7 +117,7 @@ func (s *Stmt) BindName(param int) string {
r := s.c.call(s.c.api.bindName,
uint64(s.handle), uint64(param))
ptr := uint32(r[0])
ptr := uint32(r)
if ptr == 0 {
return ""
}
@@ -152,7 +152,7 @@ func (s *Stmt) BindInt(param int, value int) error {
func (s *Stmt) BindInt64(param int, value int64) error {
r := s.c.call(s.c.api.bindInteger,
uint64(s.handle), uint64(param), uint64(value))
return s.c.error(r[0])
return s.c.error(r)
}
// BindFloat binds a float64 to the prepared statement.
@@ -162,7 +162,7 @@ func (s *Stmt) BindInt64(param int, value int64) error {
func (s *Stmt) BindFloat(param int, value float64) error {
r := s.c.call(s.c.api.bindFloat,
uint64(s.handle), uint64(param), math.Float64bits(value))
return s.c.error(r[0])
return s.c.error(r)
}
// BindText binds a string to the prepared statement.
@@ -175,7 +175,7 @@ func (s *Stmt) BindText(param int, value string) error {
uint64(s.handle), uint64(param),
uint64(ptr), uint64(len(value)),
uint64(s.c.api.destructor), _UTF8)
return s.c.error(r[0])
return s.c.error(r)
}
// BindBlob binds a []byte to the prepared statement.
@@ -189,7 +189,7 @@ func (s *Stmt) BindBlob(param int, value []byte) error {
uint64(s.handle), uint64(param),
uint64(ptr), uint64(len(value)),
uint64(s.c.api.destructor))
return s.c.error(r[0])
return s.c.error(r)
}
// BindZeroBlob binds a zero-filled, length n BLOB to the prepared statement.
@@ -199,7 +199,7 @@ func (s *Stmt) BindBlob(param int, value []byte) error {
func (s *Stmt) BindZeroBlob(param int, n int64) error {
r := s.c.call(s.c.api.bindZeroBlob,
uint64(s.handle), uint64(param), uint64(n))
return s.c.error(r[0])
return s.c.error(r)
}
// BindNull binds a NULL to the prepared statement.
@@ -209,7 +209,7 @@ func (s *Stmt) BindZeroBlob(param int, n int64) error {
func (s *Stmt) BindNull(param int) error {
r := s.c.call(s.c.api.bindNull,
uint64(s.handle), uint64(param))
return s.c.error(r[0])
return s.c.error(r)
}
// BindTime binds a [time.Time] to the prepared statement.
@@ -244,7 +244,7 @@ func (s *Stmt) bindRFC3339Nano(param int, value time.Time) error {
uint64(s.handle), uint64(param),
uint64(ptr), uint64(len(buf)),
uint64(s.c.api.destructor), _UTF8)
return s.c.error(r[0])
return s.c.error(r)
}
// ColumnCount returns the number of columns in a result set.
@@ -253,7 +253,7 @@ func (s *Stmt) bindRFC3339Nano(param int, value time.Time) error {
func (s *Stmt) ColumnCount() int {
r := s.c.call(s.c.api.columnCount,
uint64(s.handle))
return int(r[0])
return int(r)
}
// ColumnName returns the name of the result column.
@@ -264,7 +264,7 @@ func (s *Stmt) ColumnName(col int) string {
r := s.c.call(s.c.api.columnName,
uint64(s.handle), uint64(col))
ptr := uint32(r[0])
ptr := uint32(r)
if ptr == 0 {
panic(util.OOMErr)
}
@@ -278,7 +278,7 @@ func (s *Stmt) ColumnName(col int) string {
func (s *Stmt) ColumnType(col int) Datatype {
r := s.c.call(s.c.api.columnType,
uint64(s.handle), uint64(col))
return Datatype(r[0])
return Datatype(r)
}
// ColumnBool returns the value of the result column as a bool.
@@ -310,7 +310,7 @@ func (s *Stmt) ColumnInt(col int) int {
func (s *Stmt) ColumnInt64(col int) int64 {
r := s.c.call(s.c.api.columnInteger,
uint64(s.handle), uint64(col))
return int64(r[0])
return int64(r)
}
// ColumnFloat returns the value of the result column as a float64.
@@ -320,7 +320,7 @@ func (s *Stmt) ColumnInt64(col int) int64 {
func (s *Stmt) ColumnFloat(col int) float64 {
r := s.c.call(s.c.api.columnFloat,
uint64(s.handle), uint64(col))
return math.Float64frombits(r[0])
return math.Float64frombits(r)
}
// ColumnTime returns the value of the result column as a [time.Time].
@@ -375,17 +375,17 @@ func (s *Stmt) ColumnRawText(col int) []byte {
r := s.c.call(s.c.api.columnText,
uint64(s.handle), uint64(col))
ptr := uint32(r[0])
ptr := uint32(r)
if ptr == 0 {
r = s.c.call(s.c.api.errcode, uint64(s.c.handle))
s.err = s.c.error(r[0])
s.err = s.c.error(r)
return nil
}
r = s.c.call(s.c.api.columnBytes,
uint64(s.handle), uint64(col))
return util.View(s.c.mod, ptr, r[0])
return util.View(s.c.mod, ptr, r)
}
// ColumnRawBlob returns the value of the result column as a []byte.
@@ -398,17 +398,17 @@ func (s *Stmt) ColumnRawBlob(col int) []byte {
r := s.c.call(s.c.api.columnBlob,
uint64(s.handle), uint64(col))
ptr := uint32(r[0])
ptr := uint32(r)
if ptr == 0 {
r = s.c.call(s.c.api.errcode, uint64(s.c.handle))
s.err = s.c.error(r[0])
s.err = s.c.error(r)
return nil
}
r = s.c.call(s.c.api.columnBytes,
uint64(s.handle), uint64(col))
return util.View(s.c.mod, ptr, r[0])
return util.View(s.c.mod, ptr, r)
}
// Return true if stmt is an empty SQL statement.