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

Copy the in_transaction flag into Trilogy::Result #20

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+29 −3
Open

Copy the in_transaction flag into Trilogy::Result #20

Show file tree
Hide file tree
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
13 changes: 10 additions & 3 deletions contrib/ruby/ext/trilogy-ruby/cext.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ static VALUE Trilogy_DatabaseError, Trilogy_Result;

static ID id_socket, id_host, id_port, id_username, id_password, id_found_rows, id_connect_timeout, id_read_timeout,
id_write_timeout, id_keepalive_enabled, id_keepalive_idle, id_keepalive_interval, id_keepalive_count,
id_ivar_affected_rows, id_ivar_fields, id_ivar_last_insert_id, id_ivar_rows, id_ivar_query_time, id_password,
id_database, id_ssl_ca, id_ssl_capath, id_ssl_cert, id_ssl_cipher, id_ssl_crl, id_ssl_crlpath, id_ssl_key,
id_ssl_mode, id_tls_ciphersuites, id_tls_min_version, id_tls_max_version;
id_ivar_affected_rows, id_ivar_fields, id_ivar_last_insert_id, id_ivar_query_time, id_ivar_rows,
id_ivar_in_transaction, id_password, id_database, id_ssl_ca, id_ssl_capath, id_ssl_cert, id_ssl_cipher,
id_ssl_crl, id_ssl_crlpath, id_ssl_key, id_ssl_mode, id_tls_ciphersuites, id_tls_min_version, id_tls_max_version;

struct trilogy_ctx {
trilogy_conn_t conn;
Expand Down Expand Up @@ -610,6 +610,9 @@ static VALUE execute_read_query(VALUE vargs)

rb_ivar_set(result, id_ivar_query_time, DBL2NUM(query_time));

rb_ivar_set(result, id_ivar_in_transaction,
(ctx->conn.server_status & TRILOGY_SERVER_STATUS_IN_TRANS) ? Qtrue : Qfalse);

if (rc == TRILOGY_OK) {
rb_ivar_set(result, id_ivar_last_insert_id, ULL2NUM(ctx->conn.last_insert_id));

Expand Down Expand Up @@ -944,6 +947,9 @@ void Init_cext()
rb_define_attr(Trilogy_Result, "last_insert_id", 1, 0);
rb_define_attr(Trilogy_Result, "rows", 1, 0);
rb_define_attr(Trilogy_Result, "query_time", 1, 0);
rb_define_attr(Trilogy_Result, "in_transaction", 1, 0);

rb_define_alias(Trilogy_Result, "in_transaction?", "in_transaction");

id_socket = rb_intern("socket");
id_host = rb_intern("host");
Expand Down Expand Up @@ -976,6 +982,7 @@ void Init_cext()
id_ivar_last_insert_id = rb_intern("@last_insert_id");
id_ivar_rows = rb_intern("@rows");
id_ivar_query_time = rb_intern("@query_time");
id_ivar_in_transaction = rb_intern("@in_transaction");

rb_trilogy_cast_init();

Expand Down
19 changes: 19 additions & 0 deletions contrib/ruby/test/client_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ def test_trilogy_query_result_object
assert_equal [{ "a" => 1, "b" => 2 }], result.each_hash.to_a
assert_equal [[1, 2]], result.to_a
assert_kind_of Float, result.query_time
refute_predicate result, :in_transaction?
assert_in_delta 0.1, result.query_time, 0.1
ensure
ensure_closed client
Expand Down Expand Up @@ -215,6 +216,24 @@ def test_trilogy_affected_rows_in_found_rows_mode
ensure_closed client
end

def test_trilogy_in_transaction_flag_on_result
client = new_tcp_client
create_test_table(client)

refute_predicate client.query("SELECT 1"), :in_transaction?
refute_predicate client.query("INSERT INTO trilogy_test (varchar_test, int_test) VALUES ('a', 1)"), :in_transaction?

assert_predicate client.query("BEGIN"), :in_transaction?
assert_predicate client.query("INSERT INTO trilogy_test (varchar_test, int_test) VALUES ('b', 2)"), :in_transaction?

refute_predicate client.query("COMMIT"), :in_transaction?

assert_predicate client.query("BEGIN"), :in_transaction?
refute_predicate client.query("ROLLBACK"), :in_transaction?
ensure
ensure_closed client
end

def test_trilogy_warning_count
client = new_tcp_client
create_test_table(client)
Expand Down