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

fix(sql) fix ready for query state #17272

Merged
merged 1 commit into from
Feb 12, 2025
Merged

fix(sql) fix ready for query state #17272

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/sql/postgres.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,12 +718,14 @@ pub const PostgresSQLQuery = struct {
if (!connection.hasQueryRunning()) {
this.flags.binary = this.statement.?.fields.len > 0;
debug("bindAndExecute", .{});

// bindAndExecute will bind + execute, it will change to running after binding is complete
PostgresRequest.bindAndExecute(globalObject, this.statement.?, binding_value, columns_value, PostgresSQLConnection.Writer, writer) catch |err| {
if (!globalObject.hasException())
return globalObject.throwValue(postgresErrorToJS(globalObject, "failed to bind and execute query", err));
return error.JSError;
};
connection.flags.is_ready_for_query = false;
this.status = .binding;

did_write = true;
Expand All @@ -748,10 +750,12 @@ pub const PostgresSQLQuery = struct {
return globalObject.throwValue(postgresErrorToJS(globalObject, "failed to prepare and query", err));
return error.JSError;
};
connection.flags.is_ready_for_query = false;
this.status = .binding;
did_write = true;
} else {
debug("writeQuery", .{});

PostgresRequest.writeQuery(query_str.slice(), signature.prepared_statement_name, signature.fields, PostgresSQLConnection.Writer, writer) catch |err| {
signature.deinit();
if (!globalObject.hasException())
Expand All @@ -764,6 +768,7 @@ pub const PostgresSQLQuery = struct {
return globalObject.throwValue(postgresErrorToJS(globalObject, "failed to flush", err));
return error.JSError;
};
connection.flags.is_ready_for_query = false;
did_write = true;
}
}
Expand Down Expand Up @@ -3243,6 +3248,7 @@ pub const PostgresSQLConnection = struct {

continue;
};
this.flags.is_ready_for_query = false;
req.status = .binding;
return;
},
Expand All @@ -3257,7 +3263,6 @@ pub const PostgresSQLConnection = struct {
bun.assert(thisValue != .zero);
// prepareAndQueryWithSignature will write + bind + execute, it will change to running after binding is complete
const binding_value = PostgresSQLQuery.bindingGetCached(thisValue) orelse .zero;

PostgresRequest.prepareAndQueryWithSignature(this.globalObject, query_str.slice(), binding_value, PostgresSQLConnection.Writer, this.writer(), &stmt.signature) catch |err| {
stmt.status = .failed;
stmt.error_response = .{ .postgres_error = err };
Expand All @@ -3267,6 +3272,7 @@ pub const PostgresSQLConnection = struct {

continue;
};
this.flags.is_ready_for_query = false;
req.status = .binding;
stmt.status = .parsing;

Expand Down Expand Up @@ -3294,6 +3300,7 @@ pub const PostgresSQLConnection = struct {

continue;
};
this.flags.is_ready_for_query = false;
stmt.status = .parsing;
return;
},
Expand Down Expand Up @@ -3324,9 +3331,6 @@ pub const PostgresSQLConnection = struct {

pub fn on(this: *PostgresSQLConnection, comptime MessageType: @Type(.enum_literal), comptime Context: type, reader: protocol.NewReader(Context)) AnyPostgresError!void {
debug("on({s})", .{@tagName(MessageType)});
if (comptime MessageType != .ReadyForQuery) {
this.flags.is_ready_for_query = false;
}

switch (comptime MessageType) {
.DataRow => {
Expand Down