firebird_adapter 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 24dfef1450ce29ef361115a47e79f442aa8908dd
-  data.tar.gz: 0a1787a99b62900b4448d1fcaad3ac7a139fe4ad
+SHA256:
+  metadata.gz: 4f46cae1f98cb70fc48708f3601515888fcf7b9a8ddb653481f35abeed91944e
+  data.tar.gz: 5f1329081189c33a4666dafd7bdf5a5e78fdca673986291257ab1359f1e1eaf6
 SHA512:
-  metadata.gz: ce562bc1109874c11cce96fc538d4abd8cbb139b0a31cb74d2db2bef59fcff54fe2f887802a2a32e6620ebd344d19c691ad48409ee493cfaffc280e67235b73c
-  data.tar.gz: 90d5c2c991bd66901ba7f9ee52ae5e7a0ce1988ecd8ffcc311e401f4bf2e0a88f673e4089f95b7c8ea2cdde68a59e1e02a69eed957b5eeb5a22b2d79e6f2e539
+  metadata.gz: 7a2ebdc870225a7339e0ba4b872b2a29d27995885ef582c99f68a2690036ece3619f1dd4320a1c3b89b4155d5181f613478303b5c8dc56d91adeb5fc2e121b88
+  data.tar.gz: b0ef7b0c854b149ba7fb4041a7371c142cf02c75f3de701eaeb5b7c915ab75bcd8f8d3445fa04cabc7e81ba1034496c408f84520f0a60eb6c1b09d6c5700a054

data/lib/active_record/connection_adapters/firebird/database_statements.rb

@@ -1,5 +1,5 @@
 module ActiveRecord::ConnectionAdapters::Firebird::DatabaseStatements
-  
+
   def native_database_types
     {
       primary_key: 'integer not null primary key',
@@ -15,8 +15,10 @@ module ActiveRecord::ConnectionAdapters::Firebird::DatabaseStatements
       boolean:     { name: 'smallint' }
     }
   end
-  
+
   def execute(sql, name = nil)
+    sql = sql.encode(encoding, 'UTF-8')
+
     log(sql, name) do
       ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
         @connection.query(sql)
@@ -25,8 +27,9 @@ module ActiveRecord::ConnectionAdapters::Firebird::DatabaseStatements
   end
 
   def exec_query(sql, name = 'SQL', binds = [], prepare: false)
+    sql = sql.encode(encoding, 'UTF-8')
+
     type_casted_binds = type_casted_binds(binds).map do |value|
-      encoding = ActiveRecord::Base.connection_config[:encoding] || ActiveRecord::ConnectionAdapters::FirebirdAdapter::DEFAULT_ENCODING
       value.encode(encoding) rescue value
     end
 
@@ -89,7 +92,7 @@ module ActiveRecord::ConnectionAdapters::Firebird::DatabaseStatements
   def drop_sequence(sequence_name)
     execute("DROP SEQUENCE #{sequence_name}") rescue nil
   end
-  
+
   def sequence_exists?(sequence_name)
     @connection.generator_names.include?(sequence_name)
   end

data/lib/active_record/connection_adapters/firebird_adapter.rb

@@ -46,18 +46,18 @@ class ActiveRecord::ConnectionAdapters::FirebirdAdapter < ActiveRecord::Connecti
   def reset!
     reconnect!
   end
-      
+
   def primary_keys(table_name)
     raise ArgumentError unless table_name.present?
 
     names = query_values(<<~SQL, "SCHEMA")
-      SELECT 
+      SELECT
         s.rdb$field_name
-      FROM 
+      FROM
         rdb$indices i
         JOIN rdb$index_segments s ON i.rdb$index_name = s.rdb$index_name
         LEFT JOIN rdb$relation_constraints c ON i.rdb$index_name = c.rdb$index_name
-      WHERE 
+      WHERE
         i.rdb$relation_name = '#{table_name.upcase}'
         AND c.rdb$constraint_type = 'PRIMARY KEY';
     SQL
@@ -65,6 +65,15 @@ class ActiveRecord::ConnectionAdapters::FirebirdAdapter < ActiveRecord::Connecti
     names.map(&:strip).map(&:downcase)
   end
 
+  def encoding
+    ActiveRecord::Base.connection_config[:encoding] || ActiveRecord::ConnectionAdapters::FirebirdAdapter::DEFAULT_ENCODING
+  end
+
+  def log(sql, name = "SQL", binds = [], type_casted_binds = [], statement_name = nil) # :doc:
+    sql = sql.encode('UTF-8', encoding) if sql.encoding.to_s == encoding
+    super
+  end
+
 protected
 
   def translate_exception(e, message)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firebird_adapter
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Fábio Rodrigues
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-25 00:00:00.000000000 Z
+date: 2019-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: ActiveRecord Firebird Adapter for Rails 5.