add WrapRefCursor which convert RefCursor to sql.Rows

sijms · Aug 24, 2023 · d92bac6 · d92bac6
1 parent c1f4c03
commit d92bac6
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 9 deletions.
diff --git a/examples/refcursor/main.go b/examples/refcursor/main.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"context"
 	"database/sql"
 	"flag"
 	"fmt"
@@ -103,9 +104,11 @@ func usage() {
 	fmt.Println()
 }
 
-func queryCursor(cursor *go_ora.RefCursor) error {
+func queryCursor(conn *sql.DB, cursor *go_ora.RefCursor) error {
 	t := time.Now()
-	rows, err := cursor.Query()
+	rows, err := go_ora.WrapRefCursor(context.Background(), conn, cursor)
+
+	//rows, err := cursor.Query()
 	if err != nil {
 		return err
 	}
@@ -115,14 +118,21 @@ func queryCursor(cursor *go_ora.RefCursor) error {
 		val  float64
 		date time.Time
 	)
-
-	for rows.Next_() {
+	defer rows.Close()
+	for rows.Next() {
 		err = rows.Scan(&id, &name, &val, &date)
 		if err != nil {
 			return err
 		}
 		fmt.Println("ID: ", id, "\tName: ", name, "\tval: ", val, "\tDate: ", date)
 	}
+	//for rows.Next_() {
+	//	err = rows.Scan(&id, &name, &val, &date)
+	//	if err != nil {
+	//		return err
+	//	}
+	//	fmt.Println("ID: ", id, "\tName: ", name, "\tval: ", val, "\tDate: ", date)
+	//}
 	fmt.Println("Finish query RefCursor: ", time.Now().Sub(t))
 	return nil
 }
@@ -201,7 +211,7 @@ func main() {
 		}
 	}()
 
-	err = queryCursor(&cursor)
+	err = queryCursor(conn, &cursor)
 	if err != nil {
 		fmt.Println("Can't query RefCursor", err)
 	}

diff --git a/v2/connection.go b/v2/connection.go
@@ -36,6 +36,16 @@ const (
 	//PROXY       LogonMode = 0x400
 )
 
+// from GODROR
+const wrapResultset = "--WRAP_RESULTSET--"
+
+// Querier is the QueryContext of sql.Conn.
+type Querier interface {
+	QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error)
+}
+
+/////
+
 type NLSData struct {
 	Calender        string `db:"p_nls_calendar,,40,out"`
 	Comp            string `db:"p_nls_comp,,40,out"`
@@ -1086,7 +1096,17 @@ func (conn *Connection) QueryRowContext(ctx context.Context, query string, args
 	return dataSet
 }
 
+func WrapRefCursor(ctx context.Context, q Querier, cursor *RefCursor) (*sql.Rows, error) {
+	rows, err := cursor.Query()
+	if err != nil {
+		return nil, err
+	}
+	return q.QueryContext(ctx, wrapResultset, rows)
+}
 func (conn *Connection) QueryContext(ctx context.Context, query string, args []driver.NamedValue) (driver.Rows, error) {
+	if query == wrapResultset {
+		return args[0].Value.(driver.Rows), nil
+	}
 	stmt := NewStmt(query, conn)
 	stmt.autoClose = true
 	rows, err := stmt.QueryContext(ctx, args)

diff --git a/v2/parameter_encode.go b/v2/parameter_encode.go
@@ -538,10 +538,6 @@ func (par *ParameterInfo) encodeValue(val driver.Value, size int, connection *Co
 			}
 			par.MaxLen = par.MaxCharLen * converters.MaxBytePerChar(conv.GetLangID())
 		}
-		//if par.DataType == NUMBER {
-		//	par.Precision = 38
-		//	par.Scale = 0xff
-		//}
 		if par.DataType == RAW {
 			if par.MaxLen < size {
 				par.MaxLen = size