trilogy 2.13.0 → 2.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa039c6b0e08712590ea5c50bea7c9a6418d56b1878b3c2935568248d0c5deb5
-  data.tar.gz: f76d5315bd82dd00a58c43d7de51885448ba3b72fb0e2adcca3fd132e4bd1163
+  metadata.gz: 4ea4b038d25e87b1d26c6dc0af6aa37b3cfa2b7244ea4788155bb392f7a5e93e
+  data.tar.gz: c4201dd5f2c3974244cea9ae97af6052d3d1991509e64c2dde8319882b00a53e
 SHA512:
-  metadata.gz: 45cb57bc1614f81b1f477e987936b00ba97ec75acd4b88d4e86640848442daa76993cb14fe6b39bccf76c3e7a5a1dc6f86c37d5af96e179c0889c9e50356cac9
-  data.tar.gz: 5da626807137fe79611a85157b4537fde0c7451c047074ddac514732ecfed04f0e665b9e432607aa52fb73830bad176dd6d640fb2ab87019b71e46a44fea3b52
+  metadata.gz: 2e58cdf8bf20b4d31e43b811ceb7972a772c2ccb44133f715a4d9c0723c1c1ed4b3139c5e7be68575b119932348f5d8d393d088b88fd73ba058eeef9d8203796
+  data.tar.gz: ef9527a11371f0b6dbab901eb6c682e5a6e7cbf48d81e483b647682355b825a08ca342491a523859f543bfcaaf598588a713c5859baf8a883fe5adcda14f59ea

data/ext/trilogy-ruby/cast.c

@@ -56,8 +56,11 @@ static const char *ruby_encoding_name_map[] = {
 
 static rb_encoding * encoding_for_charset(TRILOGY_CHARSET_t charset)
 {
-    static rb_encoding * map[TRILOGY_CHARSET_MAX];
+    if (RB_UNLIKELY(charset >= TRILOGY_CHARSET_MAX)) {
+        return rb_enc_find(ruby_encoding_name_map[trilogy_encoding_from_charset(charset)]);
+    }
 
+    static rb_encoding * map[TRILOGY_CHARSET_MAX];
     if (RB_LIKELY(map[charset])) {
         return map[charset];
     }

data/ext/trilogy-ruby/cext.c

@@ -1128,7 +1128,6 @@ static VALUE rb_trilogy_query(VALUE self, VALUE query)
     struct trilogy_ctx *ctx = get_open_ctx(self);
 
     StringValue(query);
-    query = rb_str_export_to_enc(query, ctx->encoding);
     query = rb_str_new_frozen(query);
 
     rb_trilogy_acquire_buffer(ctx);
@@ -1189,13 +1188,6 @@ static VALUE rb_trilogy_escape(VALUE self, VALUE str)
     struct trilogy_ctx *ctx = get_open_ctx(self);
 
     StringValue(str);
-    str = rb_str_new_frozen(str);
-
-    rb_encoding *str_enc = rb_enc_get(str);
-
-    if (!rb_enc_asciicompat(str_enc)) {
-        rb_raise(rb_eEncCompatError, "input string must be ASCII-compatible");
-    }
 
     const char *escaped_str;
     size_t escaped_len;
@@ -1208,7 +1200,7 @@ static VALUE rb_trilogy_escape(VALUE self, VALUE str)
         handle_trilogy_error(ctx, rc, "trilogy_escape");
     }
 
-    VALUE escaped_string = rb_enc_str_new(escaped_str, escaped_len, str_enc);
+    VALUE escaped_string = rb_enc_str_new(escaped_str, escaped_len, ctx->encoding);
 
     rb_trilogy_release_buffer(ctx);
 
@@ -1371,9 +1363,9 @@ RUBY_FUNC_EXPORTED void Init_cext(void)
     rb_define_private_method(Trilogy, "_connect", rb_trilogy_connect, 4);
     rb_define_method(Trilogy, "change_db", rb_trilogy_change_db, 1);
     rb_define_alias(Trilogy, "select_db", "change_db");
-    rb_define_method(Trilogy, "query", rb_trilogy_query, 1);
+    rb_define_private_method(Trilogy, "_query", rb_trilogy_query, 1);
     rb_define_method(Trilogy, "ping", rb_trilogy_ping, 0);
-    rb_define_method(Trilogy, "escape", rb_trilogy_escape, 1);
+    rb_define_private_method(Trilogy, "_escape", rb_trilogy_escape, 1);
     rb_define_method(Trilogy, "close", rb_trilogy_close, 0);
     rb_define_method(Trilogy, "closed?", rb_trilogy_closed, 0);
     rb_define_method(Trilogy, "check", rb_trilogy_check, 0);

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

@@ -209,4 +209,9 @@ static TRILOGY_ENCODING_t charset_to_encoding_map[] = {
     [TRILOGY_CHARSET_EUCJPMS_BIN] = TRILOGY_ENCODING_EUCJPMS,
 };
 
-TRILOGY_ENCODING_t trilogy_encoding_from_charset(TRILOGY_CHARSET_t charset) { return charset_to_encoding_map[charset]; }
+TRILOGY_ENCODING_t trilogy_encoding_from_charset(TRILOGY_CHARSET_t charset) {
+    if ((unsigned)charset >= TRILOGY_CHARSET_MAX) {
+        return TRILOGY_ENCODING_BINARY;
+    }
+    return charset_to_encoding_map[charset];
+}

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

@@ -214,6 +214,7 @@ int trilogy_flush_writes(trilogy_conn_t *conn)
 
 static void set_error(trilogy_conn_t *conn, const trilogy_err_packet_t *packet)
 {
+    conn->server_status &= ((uint16_t)~TRILOGY_SERVER_STATUS_MORE_RESULTS_EXISTS);
     conn->error_code = packet->error_code;
     conn->error_message = packet->error_message;
     conn->error_message_len = packet->error_message_len;
@@ -312,7 +313,7 @@ static int read_eof_packet(trilogy_conn_t *conn)
 
 static int read_auth_switch_packet(trilogy_conn_t *conn, trilogy_handshake_t *handshake)
 {
-    trilogy_auth_switch_request_packet_t auth_switch_packet;
+    trilogy_auth_switch_request_packet_t auth_switch_packet = {0};
 
     int rc = trilogy_parse_auth_switch_request_packet(conn->packet_buffer.buff, conn->packet_buffer.len,
                                                       conn->capabilities, &auth_switch_packet);

data/lib/trilogy/encoding.rb

@@ -84,7 +84,13 @@ class Trilogy
       "binary"   => CHARSET_BINARY,
     }.freeze
 
+    UNSUPPORTED_ENCODINGS = %w[big5 sjis gbk cp932 gb18030 ucs2 utf16 utf16le utf32].freeze
+
     def self.find(mysql_encoding)
+      if UNSUPPORTED_ENCODINGS.include?(mysql_encoding)
+        raise ArgumentError, "Unsupported encoding: #{mysql_encoding}"
+      end
+
       unless rb_encoding = RUBY_ENCODINGS[mysql_encoding]
         raise ArgumentError, "Unknown or unsupported encoding: #{mysql_encoding}"
       end

data/lib/trilogy/version.rb

@@ -1,3 +1,3 @@
 class Trilogy
-  VERSION = "2.13.0"
+  VERSION = "2.13.2"
 end

data/lib/trilogy.rb

@@ -16,6 +16,27 @@ class Trilogy
     end
   private_constant :IO_TIMEOUT_ERROR
 
+  def query(arg)
+    str = String.try_convert(arg) or raise TypeError, "no implicit conversion of #{arg.class} into String"
+    str = str.dup if str.equal?(arg)
+    str.freeze
+
+    str_encoding = str.encoding
+    if @encoding != str_encoding && ::Encoding::BINARY != str_encoding && !(str.ascii_only? && @encoding.ascii_compatible?)
+      raise ::Encoding::CompatibilityError, "Trilogy connection uses #{@encoding} but the query was provided in #{str_encoding}"
+    end
+
+    _query(str)
+  end
+
+  def escape(arg)
+    str = String.try_convert(arg) or raise TypeError, "no implicit conversion of #{arg.class} into String"
+    if @encoding != str.encoding && !(str.ascii_only? && @encoding.ascii_compatible?) && str.encoding != ::Encoding::ASCII_8BIT
+      str = str.encode(@encoding)
+    end
+    _escape(str)
+  end
+
   module Synchronization
     def initialize(...)
       @mutex = Mutex.new
@@ -47,10 +68,12 @@ class Trilogy
 
   prepend(Synchronization)
 
+  attr_reader :encoding
+
   def initialize(options = {})
     options[:port] = options[:port].to_i if options[:port]
     mysql_encoding = options[:encoding] || "utf8mb4"
-    encoding = Trilogy::Encoding.find(mysql_encoding)
+    @encoding = Trilogy::Encoding.find(mysql_encoding)
     charset = Trilogy::Encoding.charset(mysql_encoding)
     @connection_options = options
     @connected_host = nil
@@ -99,7 +122,7 @@ class Trilogy
       end
     end
 
-    _connect(socket, encoding, charset, options)
+    _connect(socket, @encoding, charset, options)
   ensure
     # Socket's fd will be dup'd in C
     socket&.close

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trilogy
 version: !ruby/object:Gem::Version
-  version: 2.13.0
+  version: 2.13.2
 platform: ruby
 authors:
 - GitHub Engineering
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 4.0.20
 specification_version: 4
 summary: A friendly MySQL-compatible library for Ruby, binding to libtrilogy
 test_files: []