trilogy 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aca8390c35be7813f34f018fab70db8630dbec8e1b9fa3962e5b432203ae0299
-  data.tar.gz: ac509a03ca6f611eb87603ba55749547fe8eaad0792107dd2bf855646726fb4c
+  metadata.gz: 79779c19d22b6a05581eba7135cf2fd588a64ee33b59c8caf82a4dc51277bf5f
+  data.tar.gz: 48c88ac7fe38563810abc4f21858758f9b54f102b4abb63c81d0a41f4bd0a687
 SHA512:
-  metadata.gz: 2d66ea74cadbc2849a53d240b2a4b0a7094a31e9b79be12b92d1691c1aede8929d6752afeed46a5e2ad0666cc7f2e1aef170c55e8ec3b2caa91f5c0be369572c
-  data.tar.gz: b96064098c800476df66ad24eca177f3651b37679d8d634eb7301c4c97ca653e59da1f6acf3ea5e72af892fb0a8abea5d0f83378319bb73f81307cfac1fa08ac
+  metadata.gz: ab915961914de4e0ed847b93aae3357fe328186cd0fdf602f322c379bdd15a3d1aa935535783bfce892cb5013b41c841581c83c42ea248cc6ff0efd7abd2d6eb
+  data.tar.gz: 6865a1c5b9c96ff4d4eefda88cc771aff23b3ff6db8534767edbdba4a929eec1f42184ae845fe02664c1e6b8c64c72aa52f5948233d8ca35f57c510c60ef42a9

data/Rakefile

@@ -1,4 +1,4 @@
-require "bundler/gem_helper"
+require "bundler/gem_tasks"
 require "rake/extensiontask"
 
 Rake::ExtensionTask.new do |ext|

data/ext/trilogy-ruby/cext.c

@@ -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_fields, 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_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;
 
 struct trilogy_ctx {
     trilogy_conn_t conn;
@@ -140,6 +140,11 @@ static struct timeval double_to_timeval(double secs)
     };
 }
 
+static double timeval_to_double(struct timeval tv)
+{
+    return (double)tv.tv_sec + ((double)tv.tv_usec) / 1000000.0;
+}
+
 static int _cb_ruby_wait(trilogy_sock_t *sock, trilogy_wait_t wait)
 {
     struct timeval *timeout = NULL;
@@ -606,6 +611,10 @@ static VALUE execute_read_query(VALUE vargs)
     rb_ivar_set(result, id_ivar_query_time, DBL2NUM(query_time));
 
     if (rc == TRILOGY_OK) {
+        rb_ivar_set(result, id_ivar_last_insert_id, ULL2NUM(ctx->conn.last_insert_id));
+
+        rb_ivar_set(result, id_ivar_affected_rows, ULL2NUM(ctx->conn.affected_rows));
+
         return result;
     }
 
@@ -631,8 +640,12 @@ static VALUE execute_read_query(VALUE vargs)
             }
         }
 
+#ifdef HAVE_RB_INTERNED_STR
+        VALUE column_name = rb_interned_str(column.name, column.name_len);
+#else
         VALUE column_name = rb_str_new(column.name, column.name_len);
         OBJ_FREEZE(column_name);
+#endif
 
         rb_ary_push(column_names, column_name);
 
@@ -836,6 +849,38 @@ static VALUE rb_trilogy_query_flags_set(VALUE self, VALUE query_flags)
     return get_ctx(self)->query_flags = NUM2UINT(query_flags);
 }
 
+static VALUE rb_trilogy_read_timeout(VALUE self) {
+    struct trilogy_ctx *ctx = get_open_ctx(self);
+    return DBL2NUM(timeval_to_double(ctx->conn.socket->opts.read_timeout));
+}
+
+static VALUE rb_trilogy_read_timeout_set(VALUE self, VALUE read_timeout)
+{
+    struct trilogy_ctx *ctx = get_open_ctx(self);
+    if (read_timeout == Qnil) {
+        ctx->conn.socket->opts.read_timeout = double_to_timeval(0.0);
+    } else {
+        ctx->conn.socket->opts.read_timeout = double_to_timeval(NUM2DBL(read_timeout));
+    }
+    return read_timeout;
+}
+
+static VALUE rb_trilogy_write_timeout(VALUE self) {
+    struct trilogy_ctx *ctx = get_open_ctx(self);
+    return DBL2NUM(timeval_to_double(ctx->conn.socket->opts.write_timeout));
+}
+
+static VALUE rb_trilogy_write_timeout_set(VALUE self, VALUE write_timeout)
+{
+    struct trilogy_ctx *ctx = get_open_ctx(self);
+    if (write_timeout == Qnil) {
+        ctx->conn.socket->opts.write_timeout = double_to_timeval(0.0);
+    } else {
+        ctx->conn.socket->opts.write_timeout = double_to_timeval(NUM2DBL(write_timeout));
+    }
+    return write_timeout;
+}
+
 static VALUE rb_trilogy_server_status(VALUE self) { return LONG2FIX(get_open_ctx(self)->conn.server_status); }
 
 static VALUE rb_trilogy_server_version(VALUE self) { return rb_str_new_cstr(get_open_ctx(self)->server_version); }
@@ -858,6 +903,10 @@ void Init_cext()
     rb_define_method(Trilogy, "last_gtid", rb_trilogy_last_gtid, 0);
     rb_define_method(Trilogy, "query_flags", rb_trilogy_query_flags, 0);
     rb_define_method(Trilogy, "query_flags=", rb_trilogy_query_flags_set, 1);
+    rb_define_method(Trilogy, "read_timeout", rb_trilogy_read_timeout, 0);
+    rb_define_method(Trilogy, "read_timeout=", rb_trilogy_read_timeout_set, 1);
+    rb_define_method(Trilogy, "write_timeout", rb_trilogy_write_timeout, 0);
+    rb_define_method(Trilogy, "write_timeout=", rb_trilogy_write_timeout_set, 1);
     rb_define_method(Trilogy, "server_status", rb_trilogy_server_status, 0);
     rb_define_method(Trilogy, "server_version", rb_trilogy_server_version, 0);
     rb_define_const(Trilogy, "TLS_VERSION_10", INT2NUM(TRILOGY_TLS_VERSION_10));
@@ -890,7 +939,9 @@ void Init_cext()
     Trilogy_Result = rb_define_class_under(Trilogy, "Result", rb_cObject);
     rb_global_variable(&Trilogy_Result);
 
+    rb_define_attr(Trilogy_Result, "affected_rows", 1, 0);
     rb_define_attr(Trilogy_Result, "fields", 1, 0);
+    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);
 
@@ -920,14 +971,16 @@ void Init_cext()
     id_tls_min_version = rb_intern("tls_min_version");
     id_tls_max_version = rb_intern("tls_max_version");
 
+    id_ivar_affected_rows = rb_intern("@affected_rows");
     id_ivar_fields = rb_intern("@fields");
+    id_ivar_last_insert_id = rb_intern("@last_insert_id");
     id_ivar_rows = rb_intern("@rows");
     id_ivar_query_time = rb_intern("@query_time");
 
     rb_trilogy_cast_init();
 
 // server_status flags
-#define XX(name, code) rb_const_set(Trilogy, rb_intern(#name + strlen("TRILOGY_")), LONG2NUM(name));
+#define XX(name, code) rb_const_set(Trilogy, rb_intern((char *)#name + strlen("TRILOGY_")), LONG2NUM(name));
     TRILOGY_SERVER_STATUS(XX)
 #undef XX
 }

data/ext/trilogy-ruby/extconf.rb

@@ -12,5 +12,6 @@ dir_config("openssl")
 
 have_library("crypto", "CRYPTO_malloc")
 have_library("ssl", "SSL_new")
+have_func("rb_interned_str", "ruby.h")
 
 create_makefile "trilogy/cext"

data/ext/trilogy-ruby/src/socket.c

@@ -307,7 +307,7 @@ fail:
 static ssize_t ssl_io_return(struct trilogy_sock *sock, ssize_t ret)
 {
     if (ret < 0) {
-        int rc = SSL_get_error(sock->ssl, ret);
+        int rc = SSL_get_error(sock->ssl, (int)ret);
         if (rc == SSL_ERROR_WANT_WRITE || rc == SSL_ERROR_WANT_READ) {
             return (ssize_t)TRILOGY_AGAIN;
         } else if (rc == SSL_ERROR_SYSCALL && errno != 0) {
@@ -375,7 +375,7 @@ static int trilogy_tls_version_map[] = {0, TLS1_VERSION, TLS1_1_VERSION, TLS1_2_
 #endif
 };
 
-int trilogy_set_min_proto_version(SSL_CTX *ctx, trilogy_tls_version_t version)
+long trilogy_set_min_proto_version(SSL_CTX *ctx, trilogy_tls_version_t version)
 {
     int ssl_ver = trilogy_tls_version_map[version];
     if (ssl_ver == 0) {
@@ -385,7 +385,7 @@ int trilogy_set_min_proto_version(SSL_CTX *ctx, trilogy_tls_version_t version)
     return SSL_CTX_set_min_proto_version(ctx, ssl_ver);
 }
 
-int trilogy_set_max_proto_version(SSL_CTX *ctx, trilogy_tls_version_t version)
+long trilogy_set_max_proto_version(SSL_CTX *ctx, trilogy_tls_version_t version)
 {
     int ssl_ver = trilogy_tls_version_map[version];
     if (ssl_ver == 0) {

data/lib/trilogy/version.rb

@@ -1,3 +1,3 @@
 class Trilogy
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trilogy
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - GitHub Engineering
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-15 00:00:00.000000000 Z
+date: 2022-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.0.dev
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: A friendly MySQL-compatible library for Ruby, binding to libtrilogy