Fix validating the Describe step in PG extended query protocol

BemiHQ · Jan 30, 2025 · d7907ee · d7907ee
1 parent 426fe3c
commit d7907ee
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/main.go b/src/main.go
@@ -6,7 +6,7 @@ import (
 	"time"
 )
 
-const VERSION = "0.30.0"
+const VERSION = "0.30.1"
 
 func main() {
 	config := LoadConfig()

diff --git a/src/query_handler.go b/src/query_handler.go
@@ -296,7 +296,7 @@ func (queryHandler *QueryHandler) HandleDescribeQuery(message *pgproto3.Describe
 		return []pgproto3.Message{&pgproto3.NoData{}}, preparedStatement, nil
 	}
 
-	if len(preparedStatement.ParameterOIDs) != len(preparedStatement.Variables) { // Bind step didn't happen before
+	if len(preparedStatement.ParameterOIDs) > 0 && len(preparedStatement.ParameterOIDs) != len(preparedStatement.Variables) { // Parse passed the parameters, but Bind didn't happen after
 		return []pgproto3.Message{&pgproto3.NoData{}}, preparedStatement, nil
 	}
 

diff --git a/src/query_handler_test.go b/src/query_handler_test.go
@@ -1023,7 +1023,7 @@ func TestHandleDescribeQuery(t *testing.T) {
 	t.Run("Handles DESCRIBE extended query step", func(t *testing.T) {
 		queryHandler := initQueryHandler()
 		query := "SELECT usename, passwd FROM pg_shadow WHERE usename=$1"
-		parseMessage := &pgproto3.Parse{Query: query, ParameterOIDs: []uint32{pgtype.TextOID}}
+		parseMessage := &pgproto3.Parse{Query: query}
 		_, preparedStatement, _ := queryHandler.HandleParseQuery(parseMessage)
 		bindMessage := &pgproto3.Bind{Parameters: [][]byte{[]byte("bemidb")}}
 		_, preparedStatement, _ = queryHandler.HandleBindQuery(bindMessage, preparedStatement)