Initial support for date/time types; expose runtime parameters; fix e…

…xecution of prepared statements that return no data; maybe some more fixes ;)

README

@@ -32,7 +32,7 @@ go-pgsql is currently missing support for some features, including:
 
 - authentication types other than MD5
 - SSL encrypted sessions
-- some data types like date/time, bytea, ...
+- some data types like bytea, ...
 - canceling commands/queries
 - bulk copy
 ...

conn.go

@@ -71,6 +71,7 @@ type Conn struct {
 	backendPID                      int32
 	backendSecretKey                int32
 	onErrorDontRequireReadyForQuery bool
+	runtimeParameters               map[string]string
 }
 
 // Connect establishes a database connection.
@@ -95,7 +96,7 @@ func Connect(parameters *ConnParams) (conn *Conn, err os.Error) {
 	newConn.params = params
 
 	if params.Host == "" {
-		params.Host = "127.0.0.1"
+		params.Host = "localhost"
 	}
 	if params.Port == 0 {
 		params.Port = 5432
@@ -116,6 +117,8 @@ func Connect(parameters *ConnParams) (conn *Conn, err os.Error) {
 	newConn.reader = bufio.NewReader(tcpConn)
 	newConn.writer = bufio.NewWriter(tcpConn)
 
+	newConn.runtimeParameters = make(map[string]string)
+
 	newConn.writeStartup()
 
 	newConn.readBackendMessages(nil)
@@ -231,6 +234,17 @@ func (conn *Conn) Query(command string) (res *ResultSet, err os.Error) {
 	return
 }
 
+// RuntimeParameter returns the value of the specified runtime parameter.
+// If the value was successfully retrieved, ok is true, otherwise false.
+func (conn *Conn) RuntimeParameter(name string) (value string, ok bool) {
+	if conn.LogLevel >= LogVerbose {
+		defer conn.logExit(conn.logEnter("*Conn.RuntimeParameter"))
+	}
+
+	value, ok = conn.runtimeParameters[name]
+	return
+}
+
 // Scan executes the command and scans the fields of the first row
 // in the ResultSet, trying to store field values into the specified
 // arguments. The arguments must be of pointer types. If a row has

conn_log.go

@@ -27,12 +27,12 @@ func (conn *Conn) logError(level LogLevel, err os.Error) {
 }
 
 func (conn *Conn) logEnter(funcName string) string {
-	conn.log(LogDebug, "entering: ", "pgsqconn."+funcName)
+	conn.log(LogDebug, "entering: ", "pgsql."+funcName)
 	return funcName
 }
 
 func (conn *Conn) logExit(funcName string) {
-	conn.log(LogDebug, "exiting: ", "pgsqconn."+funcName)
+	conn.log(LogDebug, "exiting: ", "pgsql."+funcName)
 }
 
 func (conn *Conn) logAndConvertPanic(x interface{}) (err os.Error) {

conn_read.go

@@ -59,68 +59,6 @@ func (conn *Conn) readString() string {
 	return string(b[0 : len(b)-1])
 }
 
-func (conn *Conn) readDataRow(res *ResultSet) {
-	// Just eat message length.
-	conn.readInt32()
-
-	fieldCount := conn.readInt16()
-
-	var ord int16
-	for ord = 0; ord < fieldCount; ord++ {
-		valLen := conn.readInt32()
-
-		var val []byte
-
-		if valLen == -1 {
-			val = nil
-		} else {
-			val = make([]byte, valLen)
-			conn.read(val)
-		}
-
-		res.values[ord] = val
-	}
-}
-
-func (conn *Conn) readRowDescription(res *ResultSet) {
-	// Just eat message length.
-	conn.readInt32()
-
-	fieldCount := conn.readInt16()
-
-	res.fields = make([]field, fieldCount)
-	res.values = make([][]byte, fieldCount)
-
-	var ord int16
-	for ord = 0; ord < fieldCount; ord++ {
-		res.fields[ord].name = conn.readString()
-
-		// Just eat table OID.
-		conn.readInt32()
-
-		// Just eat field OID.
-		conn.readInt16()
-
-		// Just eat field data type OID.
-		conn.readInt32()
-
-		// Just eat field size.
-		conn.readInt16()
-
-		// Just eat field type modifier.
-		conn.readInt32()
-
-		format := fieldFormat(conn.readInt16())
-		switch format {
-		case textFormat:
-		case binaryFormat:
-		default:
-			panic("unsupported field format")
-		}
-		res.fields[ord].format = format
-	}
-}
-
 func (conn *Conn) readAuthenticationRequest() {
 	if conn.LogLevel >= LogDebug {
 		defer conn.logExit(conn.logEnter("*Conn.readAuthenticationRequest"))
@@ -242,6 +180,29 @@ func (conn *Conn) readCommandComplete(res *ResultSet) {
 	}
 }
 
+func (conn *Conn) readDataRow(res *ResultSet) {
+	// Just eat message length.
+	conn.readInt32()
+
+	fieldCount := conn.readInt16()
+
+	var ord int16
+	for ord = 0; ord < fieldCount; ord++ {
+		valLen := conn.readInt32()
+
+		var val []byte
+
+		if valLen == -1 {
+			val = nil
+		} else {
+			val = make([]byte, valLen)
+			conn.read(val)
+		}
+
+		res.values[ord] = val
+	}
+}
+
 func (conn *Conn) readEmptyQueryResponse() {
 	if conn.LogLevel >= LogDebug {
 		defer conn.logExit(conn.logEnter("*Conn.readEmptyQueryResponse"))
@@ -323,6 +284,15 @@ func (conn *Conn) readErrorOrNoticeResponse(isError bool) {
 	}
 }
 
+func (conn *Conn) readNoData() {
+	if conn.LogLevel >= LogDebug {
+		defer conn.logExit(conn.logEnter("*Conn.readNoData"))
+	}
+
+	// Just eat message length.
+	conn.readInt32()
+}
+
 func (conn *Conn) readParameterStatus() {
 	if conn.LogLevel >= LogDebug {
 		defer conn.logExit(conn.logEnter("*Conn.readParameterStatus"))
@@ -337,6 +307,8 @@ func (conn *Conn) readParameterStatus() {
 	if conn.LogLevel >= LogDebug {
 		conn.logf(LogDebug, "ParameterStatus: Name: '%s', Value: '%s'", name, value)
 	}
+
+	conn.runtimeParameters[name] = value
 }
 
 func (conn *Conn) readParseComplete() {
@@ -381,6 +353,44 @@ func (conn *Conn) readReadyForQuery(res *ResultSet) {
 	conn.state = readyState{}
 }
 
+func (conn *Conn) readRowDescription(res *ResultSet) {
+	// Just eat message length.
+	conn.readInt32()
+
+	fieldCount := conn.readInt16()
+
+	res.fields = make([]field, fieldCount)
+	res.values = make([][]byte, fieldCount)
+
+	var ord int16
+	for ord = 0; ord < fieldCount; ord++ {
+		res.fields[ord].name = conn.readString()
+
+		// Just eat table OID.
+		conn.readInt32()
+
+		// Just eat field OID.
+		conn.readInt16()
+
+		res.fields[ord].typeOID = conn.readInt32()
+
+		// Just eat field size.
+		conn.readInt16()
+
+		// Just eat field type modifier.
+		conn.readInt32()
+
+		format := fieldFormat(conn.readInt16())
+		switch format {
+		case textFormat:
+		case binaryFormat:
+		default:
+			panic("unsupported field format")
+		}
+		res.fields[ord].format = format
+	}
+}
+
 func (conn *Conn) readBackendMessages(res *ResultSet) {
 	if conn.LogLevel >= LogDebug {
 		defer conn.logExit(conn.logEnter("*Conn.readBackendMessages"))
@@ -421,6 +431,10 @@ func (conn *Conn) readBackendMessages(res *ResultSet) {
 		case _ErrorResponse:
 			conn.readErrorOrNoticeResponse(true)
 
+		case _NoData:
+			conn.readNoData()
+			return
+
 		case _NoticeResponse:
 			conn.readErrorOrNoticeResponse(false)
 

conn_write.go

@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"math"
 	"strconv"
+	"time"
 )
 
 func (conn *Conn) flush() {
@@ -134,13 +135,40 @@ func (conn *Conn) writeBind(stmt *Statement) {
 			values[i] = strconv.Itoa(int(val))
 
 		case int64:
-			values[i] = strconv.Itoa64(val)
+			switch param.typ {
+			case Date:
+				values[i] = time.SecondsToUTC(val).Format("2006-01-02")
+
+			case Time, TimeTZ:
+				values[i] = time.SecondsToUTC(val).Format("15:04:05")
+
+			case Timestamp, TimestampTZ:
+				values[i] = time.SecondsToUTC(val).Format("2006-01-02 15:04:05")
+
+			default:
+				values[i] = strconv.Itoa64(val)
+			}
 
 		case nil:
 
 		case string:
 			values[i] = val
 
+		case *time.Time:
+			switch param.typ {
+			case Date:
+				values[i] = val.Format("2006-01-02")
+
+			case Time, TimeTZ:
+				values[i] = val.Format("15:04:05")
+
+			case Timestamp, TimestampTZ:
+				values[i] = val.Format("2006-01-02 15:04:05")
+
+			default:
+				panic("invalid use of *time.Time")
+			}
+
 		default:
 			panic("unsupported parameter type")
 		}
@@ -212,6 +240,12 @@ func (conn *Conn) writeExecute(stmt *Statement) {
 }
 
 func (conn *Conn) writeParse(stmt *Statement) {
+	if conn.LogLevel >= LogDebug {
+		defer conn.logExit(conn.logEnter("*Conn.writeParse"))
+
+		conn.log(LogDebug, fmt.Sprintf("stmt.ActualCommand: '%s'", stmt.ActualCommand()))
+	}
+
 	msgLen := int32(4 +
 		len(stmt.name) + 1 +
 		len(stmt.actualCommand) + 1 +
@@ -245,6 +279,12 @@ func (conn *Conn) writePasswordMessage(password string) {
 }
 
 func (conn *Conn) writeQuery(command string) {
+	if conn.LogLevel >= LogDebug {
+		defer conn.logExit(conn.logEnter("*Conn.writeQuery"))
+
+		conn.log(LogDebug, fmt.Sprintf("command: '%s'", command))
+	}
+
 	conn.writeFrontendMessageCode(_Query)
 	conn.writeInt32(int32(4 + len(command) + 1))
 	conn.writeString0(command)

examples/multipleselects.go

@@ -14,7 +14,6 @@ func main() {
 	pgsql.DefaultLogLevel = pgsql.LogError
 
 	params := &pgsql.ConnParams{
-		Host:     "127.0.0.1",
 		Database: "testdatabase",
 		User:     "testuser",
 		Password: "testpassword",

examples/scan.go

@@ -20,7 +20,6 @@ func main() {
 	pgsql.DefaultLogLevel = pgsql.LogError
 
 	params := &pgsql.ConnParams{
-		Host:     "127.0.0.1",
 		Database: "testdatabase",
 		User:     "testuser",
 		Password: "testpassword",

examples/statements.go

@@ -43,7 +43,6 @@ func main() {
 	pgsql.DefaultLogLevel = pgsql.LogError
 
 	params := &pgsql.ConnParams{
-		Host:     "127.0.0.1",
 		Database: "testdatabase",
 		User:     "testuser",
 		Password: "testpassword",