Prepared statement support

postgres/messages/row_description.go

@@ -23,6 +23,87 @@ import (
 	"github.com/dolthub/doltgresql/postgres/connection"
 )
 
+const (
+	OidBool        = 16
+	OidBytea       = 17
+	OidChar        = 18
+	OidName        = 19
+	OidInt8        = 20
+	OidInt2        = 21
+	OidInt2Vector  = 22
+	OidInt4        = 23
+	OidRegproc     = 24
+	OidText        = 25
+	OidOid         = 26
+	OidTid         = 27
+	OidXid         = 28
+	OidCid         = 29
+	OidOidVector   = 30
+	OidPgNodeTree  = 194
+	OidPgString    = 1033
+	OidPgType      = 71
+	OidPgAttribute = 75
+	OidPgProc      = 81
+	OidPgClass     = 83
+	OidJson        = 114
+	OidXml         = 142
+	OidXmlArray    = 143
+	OidJsonArray   = 199
+	OidPgNodeTreeArray = 195
+	OidSmgr        = 210
+	OidIndexAm     = 261
+	OidPoint       = 600
+	OidLseg        = 601
+	OidPath        = 602
+	OidBox         = 603
+	OidPolygon     = 604
+	OidLine        = 628
+	OidFloat4      = 700
+	OidFloat8      = 701
+	OidAbstime     = 702
+	OidReltime     = 703
+	OidTinterval   = 704
+	OidUnknown     = 705
+	OidCircle      = 718
+	OidCash        = 790
+	OidMacaddr     = 829
+	OidInet        = 869
+	OidCidr        = 650
+	OidInt2Array   = 1005
+	OidInt4Array   = 1007
+	OidTextArray   = 1009
+	OidByteaArray  = 1001
+	OidVarcharArray = 1015
+	OidInt8Array   = 1016
+	OidPointArray  = 1017
+	OidJsonArrayArray = 199
+	OidFloat4Array = 1021
+	OidFloat8Array = 1022
+	OidAclitem     = 1033
+	OidAclitemArray = 1034
+	OidInetArray   = 1041
+	OidCidrArray   = 651
+	OidVarchar     = 1043
+	OidDate        = 1082
+	OidTime        = 1083
+	OidTimestamp   = 1114
+	OidTimestampArray = 1115
+	OidDateArray   = 1182
+	OidTimeArray   = 1183
+	OidNumeric     = 1700
+	OidRefcursor   = 1790
+	OidRegprocedure = 2202
+	OidRegoper     = 2203
+	OidRegoperator = 2204
+	OidRegclass    = 2205
+	OidRegtype     = 2206
+	OidRegrole     = 4096
+	OidRegnamespace = 4097
+	OidRegnamespaceArray = 4098
+	OidRegclassArray = 4099
+	OidRegRoleArray = 4090
+)
+
 func init() {
 	connection.InitializeDefaultMessage(RowDescription{})
 }
@@ -134,50 +215,58 @@ func (m RowDescription) DefaultMessage() *connection.MessageFormat {
 	return &rowDescriptionDefault
 }
 
-// VitessFieldToDataTypeObjectID returns a type, as defined by Vitess, into a type as defined by Postgres.
+// VitessFieldToDataTypeObjectID returns the type of a vitess Field into a type as defined by Postgres.
 // OIDs can be obtained with the following query: `SELECT oid, typname FROM pg_type ORDER BY 1;`
 func VitessFieldToDataTypeObjectID(field *query.Field) (int32, error) {
-	switch field.Type {
+	return VitessTypeToObjectID(field.Type)
+}
+
+// VitessFieldToDataTypeObjectID returns a type, as defined by Vitess, into a type as defined by Postgres.
+// OIDs can be obtained with the following query: `SELECT oid, typname FROM pg_type ORDER BY 1;`
+func VitessTypeToObjectID(typ query.Type) (int32, error) {
+	switch typ {
 	case query.Type_INT8:
 		// Postgres doesn't make use of a small integer type for integer returns, which presents a bit of a conundrum.
 		// GMS defines boolean operations as the smallest integer type, while Postgres has an explicit bool type.
 		// We can't always assume that `INT8` means bool, since it could just be a small integer. As a result, we'll
 		// always return this as though it's an `INT32`, which also means that we can't support bools right now.
 		// OIDs 16 (bool) and 18 (char, ASCII only?) are the only single-byte types as far as I'm aware.
-		return 23, nil
+		return OidInt4, nil
 	case query.Type_INT16:
 		// The technically correct OID is 21 (2-byte integer), however it seems like some clients don't actually expect
 		// this, so I'm not sure when it's actually used by Postgres. Because of this, we'll just pretend it's an `INT32`.
-		return 23, nil
+		return OidInt4, nil
 	case query.Type_INT24:
 		// Postgres doesn't have a 3-byte integer type, so just pretend it's `INT32`.
-		return 23, nil
+		return OidInt4, nil
 	case query.Type_INT32:
-		return 23, nil
+		return OidInt4, nil
 	case query.Type_INT64:
-		return 20, nil
+		return OidInt8, nil
 	case query.Type_FLOAT32:
-		return 700, nil
+		return OidFloat4, nil
 	case query.Type_FLOAT64:
-		return 701, nil
+		return OidFloat8, nil
 	case query.Type_DECIMAL:
-		return 1700, nil
+		return OidNumeric, nil
 	case query.Type_CHAR:
-		return 1042, nil
+		return OidChar, nil
 	case query.Type_VARCHAR:
-		return 1043, nil
+		return OidVarchar, nil
 	case query.Type_TEXT:
-		return 25, nil
+		return OidText, nil
 	case query.Type_JSON:
-		return 114, nil
+		return OidJson, nil
 	case query.Type_TIMESTAMP, query.Type_DATETIME:
-		return 1114, nil
+		const OidTimestamp = 1114
+		return OidTimestamp, nil
 	case query.Type_DATE:
-		return 1082, nil
+		const OidDate = 1082
+		return OidDate, nil
 	case query.Type_NULL_TYPE:
-		return 25, nil // NULL is treated as TEXT on the wire
+		return OidText, nil // NULL is treated as TEXT on the wire
 	default:
-		return 0, fmt.Errorf("unsupported type returned from engine: %s", field.Type)
+		return 0, fmt.Errorf("unsupported type: %s", typ)
 	}
 }
 

server/ast/expr.go

@@ -457,8 +457,9 @@ func nodeExpr(node tree.Expr) (vitess.Expr, error) {
 	case *tree.PartitionMinVal:
 		return nil, fmt.Errorf("MINVALUE is not yet supported")
 	case *tree.Placeholder:
-		//TODO: figure out if I can delete this
-		panic("this should probably be deleted (internal error, Placeholder)")
+		// TODO: deal with type annotation
+		mysqlBindVarIdx := node.Idx + 1
+		return vitess.NewValArg([]byte(fmt.Sprintf(":v%d", mysqlBindVarIdx))), nil
 	case *tree.RangeCond:
 		operator := vitess.BetweenStr
 		if node.Not {

server/converted_query.go

@@ -14,7 +14,11 @@
 
 package server
 
-import vitess "github.com/dolthub/vitess/go/vt/sqlparser"
+import (
+	"github.com/dolthub/go-mysql-server/sql"
+	querypb "github.com/dolthub/vitess/go/vt/proto/query"
+	vitess "github.com/dolthub/vitess/go/vt/sqlparser"
+)
 
 // ConvertedQuery represents a query that has been converted from the Postgres representation to the Vitess
 // representation. String may contain the string version of the converted query. AST will contain the tree
@@ -24,3 +28,15 @@ type ConvertedQuery struct {
 	String string
 	AST    vitess.Statement
 }
+
+type PreparedStatementData struct {
+	Query        ConvertedQuery
+	ReturnFields []*querypb.Field
+	BindVarTypes []int32
+}
+
+type PortalData struct {
+  Query ConvertedQuery
+	Fields []*querypb.Field
+	BoundPlan sql.Node
+}