firebird_adapter 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a48c9a2cd3d59a28cfc048e324f24a8df62015cb
-  data.tar.gz: 26d5b223e8a9031290bfa05c907188f9cf2a2d9d
+SHA256:
+  metadata.gz: a58a1cfffe5d2db00db303b202c951edd8a9e7a69ce5f517f5f4f82a69ad750a
+  data.tar.gz: 2305b01bac0fc96270e04a40670cb856a09611f61d6f2926b71fedc885587708
 SHA512:
-  metadata.gz: 222a13f9ebab9064b42f168717f4edf8dac04234d69430665df3c9c38954beaf0a53a0a74aa9486152011885b68fc1c81154a657fca1bfa62ac86a578451adc9
-  data.tar.gz: aa0803f76fe32ee201c7a2d874c1400b8789e65f7dc992e31949d8a3b64fb7d6d354c1be3bd31f4833a6440467b2682f7f8257d4a41d42c630b9bea5f12afad9
+  metadata.gz: e9ebbe4323c35e43abe2d5340094a7ea239a21445a257a687f8a45e68538e5d7caa4f94600db1e95161d6cb7d2cf3cbb858580b2bca3761b8e9ab3e6ef2dc2d6
+  data.tar.gz: 6e9bd26350107d4c1f181254f46af87905fa57ae86f1db6ab9b85dcaec6739468c8b16419405c337434cd6045ae73072914bd15222f27d164653b0790da64648

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

@@ -1,6 +1,8 @@
 module ActiveRecord::ConnectionHandling
   def firebird_connection(config)
-    config = config.symbolize_keys.dup.reverse_merge(downcase_names: true, port: 3050, encoding: 'Windows-1252')
+    require 'active_record/extensions'
+    
+    config = config.symbolize_keys.dup.reverse_merge(downcase_names: true, port: 3050, encoding: ActiveRecord::ConnectionAdapters::FirebirdAdapter::DEFAULT_ENCODING)
 
     if config[:host]
       config[:database] = "#{config[:host]}/#{config[:port]}:#{config[:database]}"

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

@@ -9,7 +9,10 @@ module ActiveRecord::ConnectionAdapters::Firebird::DatabaseStatements
   end
 
   def exec_query(sql, name = 'SQL', binds = [], prepare: false)
-    type_casted_binds = type_casted_binds(binds)
+    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
 
     log(sql, name, binds, type_casted_binds) do
       ActiveSupport::Dependencies.interlock.permit_concurrent_loads do

data/lib/active_record/connection_adapters/firebird_adapter.rb

@@ -1,7 +1,6 @@
 require 'fb'
 
 require 'active_record/connection_adapters/firebird/connection'
-require 'active_record/connection_adapters/firebird/calculations'
 require 'active_record/connection_adapters/firebird/database_limits'
 require 'active_record/connection_adapters/firebird/database_statements'
 require 'active_record/connection_adapters/firebird/schema_statements'
@@ -11,6 +10,7 @@ require 'arel/visitors/firebird'
 class ActiveRecord::ConnectionAdapters::FirebirdAdapter < ActiveRecord::ConnectionAdapters::AbstractAdapter
 
   ADAPTER_NAME = "Firebird".freeze
+  DEFAULT_ENCODING = "Windows-1252".freeze
 
   include ActiveRecord::ConnectionAdapters::Firebird::DatabaseLimits
   include ActiveRecord::ConnectionAdapters::Firebird::DatabaseStatements

data/lib/active_record/extensions.rb

@@ -0,0 +1,24 @@
+ActiveRecord::Calculations.module_eval do
+  def count(column_name = nil)
+    return super() if block_given?
+    calculate(:count, column_name || 1)
+  end
+end
+
+ActiveRecord::FinderMethods.module_eval do
+  def second
+    order(primary_key).limit(2).offset(2).to_a.first
+  end
+
+  def third
+    order(primary_key).limit(3).offset(3).to_a.first
+  end
+
+  def fourth
+    order(primary_key).limit(4).offset(4).to_a.first
+  end
+
+  def fifth
+    order(primary_key).limit(5).offset(5).to_a.first
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firebird_adapter
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Fábio Rodrigues
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-30 00:00:00.000000000 Z
+date: 2019-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -115,12 +115,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/active_record/connection_adapters/firebird/calculations.rb
 - lib/active_record/connection_adapters/firebird/connection.rb
 - lib/active_record/connection_adapters/firebird/database_limits.rb
 - lib/active_record/connection_adapters/firebird/database_statements.rb
 - lib/active_record/connection_adapters/firebird/schema_statements.rb
 - lib/active_record/connection_adapters/firebird_adapter.rb
+- lib/active_record/extensions.rb
 - lib/arel/visitors/firebird.rb
 homepage: https://github.com/FabioMR/firebird_adapter
 licenses:
@@ -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.

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

@@ -1,6 +0,0 @@
-ActiveRecord::Calculations.module_eval do
-  def count(column_name = nil)
-    return super() if block_given?
-    calculate(:count, column_name || 1)
-  end
-end