Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Do not invoke sync command while preparing unnamed prepared statement #759

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Do not invoke sync command while preparing unnamed prepared statement #759

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
79107de
do not invoke sync command while preparing unnamed prepared statement
Jun 8, 2018
47bf0c0
Merge remote-tracking branch 'upstream/master'
mkabilov Dec 14, 2020
4692fd3
Merge branch 'master' into master
mkabilov Jul 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
57 changes: 41 additions & 16 deletions conn.go
View file
Open in desktop
Expand Up @@ -828,6 +828,7 @@ func decideColumnFormats(
}

func (cn *conn) prepareTo(q, stmtName string) *stmt {
var err error
st := &stmt{cn: cn, name: stmtName}

b := cn.writeBuf('P')
Expand All @@ -839,13 +840,30 @@ func (cn *conn) prepareTo(q, stmtName string) *stmt {
b.byte('S')
b.string(st.name)

b.next('S')
if stmtName != "" {
b.next('S') // sync
} else {
b.next('H') // flush
}
cn.send(b)

cn.readParseResponse()
st.paramTyps, st.colNames, st.colTyps = cn.readStatementDescribeResponse()
if err := cn.readParseResponse(); err != nil {
cn.send(cn.writeBuf('S')) // sync
cn.readReadyForQuery()
panic(err)
}

st.paramTyps, st.colNames, st.colTyps, err = cn.readStatementDescribeResponse()
if err != nil {
cn.send(cn.writeBuf('S')) // sync
cn.readReadyForQuery()
panic(err)
}
st.colFmts, st.colFmtData = decideColumnFormats(st.colTyps, cn.disablePreparedBinaryResult)
cn.readReadyForQuery()
if stmtName != "" {
cn.readReadyForQuery()
}

return st
}

Expand Down Expand Up @@ -906,7 +924,11 @@ func (cn *conn) query(query string, args []driver.Value) (_ *rows, err error) {
if cn.binaryParameters {
cn.sendBinaryModeQuery(query, args)

cn.readParseResponse()
if err := cn.readParseResponse(); err != nil {
cn.readReadyForQuery()
panic(err)
}

cn.readBindResponse()
rows := &rows{cn: cn}
rows.rowsHeader = cn.readPortalDescribeResponse()
Expand Down Expand Up @@ -939,7 +961,11 @@ func (cn *conn) Exec(query string, args []driver.Value) (res driver.Result, err
if cn.binaryParameters {
cn.sendBinaryModeQuery(query, args)

cn.readParseResponse()
if err := cn.readParseResponse(); err != nil {
cn.readReadyForQuery()
panic(err)
}

cn.readBindResponse()
cn.readPortalDescribeResponse()
cn.postExecuteWorkaround()
Expand Down Expand Up @@ -1819,25 +1845,25 @@ func (cn *conn) processBackendKeyData(r *readBuf) {
cn.secretKey = r.int32()
}

func (cn *conn) readParseResponse() {
func (cn *conn) readParseResponse() (err error) {
t, r := cn.recv1()
switch t {
case '1':
return
case 'E':
err := parseError(r)
cn.readReadyForQuery()
panic(err)
err = parseError(r)
default:
cn.err.set(driver.ErrBadConn)
errorf("unexpected Parse response %q", t)
}

return
}

func (cn *conn) readStatementDescribeResponse() (
paramTyps []oid.Oid,
colNames []string,
colTyps []fieldDesc,
err error,
) {
for {
t, r := cn.recv1()
Expand All @@ -1849,14 +1875,13 @@ func (cn *conn) readStatementDescribeResponse() (
paramTyps[i] = r.oid()
}
case 'n':
return paramTyps, nil, nil
return
case 'T':
colNames, colTyps = parseStatementRowDescribe(r)
return paramTyps, colNames, colTyps
return
case 'E':
err := parseError(r)
cn.readReadyForQuery()
panic(err)
err = parseError(r)
return
default:
cn.err.set(driver.ErrBadConn)
errorf("unexpected Describe statement response %q", t)
Expand Down