activerecord-memsql 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d94f8681817f340ea7a58df713a314f44ea23f78
-  data.tar.gz: ebfba3b893d5e877b0b3bb7fd468248e88b14c39
+SHA256:
+  metadata.gz: 184a17492e053c82784b1a58af061529af17fe4736b887d7e7af98cc154380d4
+  data.tar.gz: 3541951f22a4129dc640a0625665c4ae33a4107312733d70e0ea48f47306db83
 SHA512:
-  metadata.gz: 8a2d0ec2a3061e27bb636af514e05d6e4ad95fba4f931740302a200a221bf3db01e953f53015c28ac0cd517f7450ab21fce2f61b0e86edd45df4b0a7157e3602
-  data.tar.gz: a06d7d52824b92340d55855bb72a29a9a8745b505b926eae38fcbafea5d6768970ad97ef34304a9a7462781aeb4135f15a9b0f4feace991ddce811a5163719e3
+  metadata.gz: bdcb8cf3b3d6fe261495f675109f658e3aad7d15bc72c021378ec41f8c3d9d8e2e17ba0154e12bdcebd8b4b8c8dd23de935bdb7fb153ed4e722df2295cc009c1
+  data.tar.gz: 0be1ef4c41cacd3354739ab24bb54c61e81a0cf5fa5bde993ac6c2a7e3fe13b578c0db4b8d20bf56d20da1c726a46dffc57cd64ffcf9f5ede0ec55d028f3c443

data/lib/active_record/connection_adapters/memsql_adapter.rb

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 require "active_record/connection_adapters/abstract_mysql_adapter"
 require "active_record/connection_adapters/mysql2_adapter"
 require "active_record/connection_adapters/mysql/database_statements"
 
-gem "mysql2", ">= 0.3.18", "< 0.5"
-require "mysql2"
-raise "mysql2 0.4.3 is not supported. Please upgrade to 0.4.4+" if Mysql2::VERSION == "0.4.3"
+gem "mysql2", ">= 0.4.4"
 
 module ActiveRecord
   module ConnectionHandling # :nodoc:
+    ER_BAD_DB_ERROR = 1049
+
     # Establishes a connection to the database that's used by all Active Record objects.
     def memsql_connection(config)
       config = config.symbolize_keys
@@ -17,15 +19,15 @@ module ActiveRecord
       config[:variables] = {sql_mode: ''} if config[:variables].nil?
 
       if config[:flags].kind_of? Array
-        config[:flags].push "FOUND_ROWS".freeze
+        config[:flags].push "FOUND_ROWS"
       else
         config[:flags] |= Mysql2::Client::FOUND_ROWS
       end
 
       client = Mysql2::Client.new(config)
-      ConnectionAdapters::Mysql2Adapter.new(client, logger, nil, config)
+      ConnectionAdapters::MemsqlAdapter.new(client, logger, nil, config)
     rescue Mysql2::Error => error
-      if error.message.include?("Unknown database")
+      if error.error_number == ER_BAD_DB_ERROR
         raise ActiveRecord::NoDatabaseError
       else
         raise
@@ -35,18 +37,24 @@ module ActiveRecord
 
   module ConnectionAdapters
     class MemsqlAdapter < AbstractMysqlAdapter
-      ADAPTER_NAME = "MemSQL".freeze
+      ADAPTER_NAME = "MemSQL"
 
       include MySQL::DatabaseStatements
 
       def initialize(connection, logger, connection_options, config)
-        super
-        @prepared_statements = false unless config.key?(:prepared_statements)
+        superclass_config = config.reverse_merge(prepared_statements: false)
+        super(connection, logger, connection_options, superclass_config)
         configure_connection
       end
 
+      def self.database_exists?(config)
+        !!ActiveRecord::Base.memsql_connection(config)
+      rescue ActiveRecord::NoDatabaseError
+        false
+      end
+
       def supports_json?
-        !mariadb? && version >= "5.7.8"
+        !mariadb? && database_version >= "5.7.8"
       end
 
       def supports_comments?
@@ -61,6 +69,10 @@ module ActiveRecord
         true
       end
 
+      def supports_lazy_transactions?
+        true
+      end
+
       def supports_advisory_locks?
         false
       end
@@ -111,21 +123,31 @@ module ActiveRecord
         @connection.close
       end
 
+      def discard! # :nodoc:
+        super
+        @connection.automatic_close = false
+        @connection = nil
+      end
+
       private
 
-      def connect
-        @connection = Mysql2::Client.new(@config)
-        configure_connection
-      end
+        def connect
+          @connection = Mysql2::Client.new(@config)
+          configure_connection
+        end
 
-      def configure_connection
-        @connection.query_options.merge!(as: :array)
-        super
-      end
+        def configure_connection
+          @connection.query_options[:as] = :array
+          super
+        end
 
-      def full_version
-        @full_version ||= @connection.server_info[:version]
-      end
+        def full_version
+          schema_cache.database_version.full_version_string
+        end
+
+        def get_full_version
+          @connection.server_info[:version]
+        end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-memsql
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Thomas Geselle
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-27 00:00:00.000000000 Z
+date: 2020-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,34 +58,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.4.4
 description: "The ActiveRecod MemSQL Adapter is an ActiveRecord connection adapter
   based on the standard mysql2 adapter.\nThis adapter is a customized version of the
   mysql2 adapter to provide support for MemSQL. "
@@ -116,8 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: ActiveRecord MemSQL Adapter