firebird_adapter 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f46cae1f98cb70fc48708f3601515888fcf7b9a8ddb653481f35abeed91944e
-  data.tar.gz: 5f1329081189c33a4666dafd7bdf5a5e78fdca673986291257ab1359f1e1eaf6
+  metadata.gz: 84e152eafb3ac4ec3815a9db822e0af3f78ef8b2bebc6a9ab146c0d8d6f2db2a
+  data.tar.gz: 7be80a59b8b9783d5406f6c020fdcb6456d5d33bf60d3836bb92587d07baaf52
 SHA512:
-  metadata.gz: 7a2ebdc870225a7339e0ba4b872b2a29d27995885ef582c99f68a2690036ece3619f1dd4320a1c3b89b4155d5181f613478303b5c8dc56d91adeb5fc2e121b88
-  data.tar.gz: b0ef7b0c854b149ba7fb4041a7371c142cf02c75f3de701eaeb5b7c915ab75bcd8f8d3445fa04cabc7e81ba1034496c408f84520f0a60eb6c1b09d6c5700a054
+  metadata.gz: bdb14f1266f7de57c93afe4e7efcbd37d4e2b0e46421e97061cdeaf8858fee054b2c0dc58ed03176c4374bddb06cf7d25b1bee04efe77d1fc37fef321c1f2839
+  data.tar.gz: 77f23df54f7a892117b9fe5976c95857db49dd3471c52a62bc9904aaf24bfc61c1e5ecb726c3b093a066a1b73d63875aa42f787676d7073e36f3b78b523c9bf7

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

@@ -1,7 +1,8 @@
 module ActiveRecord::ConnectionHandling
   def firebird_connection(config)
     require 'active_record/extensions'
-    
+    require 'active_record/internal_metadata_extensions'
+
     config = config.symbolize_keys.dup.reverse_merge(downcase_names: true, port: 3050, encoding: ActiveRecord::ConnectionAdapters::FirebirdAdapter::DEFAULT_ENCODING)
 
     if config[:host]

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

@@ -35,22 +35,24 @@ module ActiveRecord::ConnectionAdapters::Firebird::DatabaseStatements
 
     log(sql, name, binds, type_casted_binds) do
       ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
-        result = @connection.execute(sql, *type_casted_binds)
-        if result.is_a?(Fb::Cursor)
-          fields = result.fields.map(&:name)
-          rows = result.fetchall.map do |row|
-            row.map do |col|
-              col.encode('UTF-8', @connection.encoding) rescue col
+        begin
+          result = @connection.execute(sql, *type_casted_binds)
+          if result.is_a?(Fb::Cursor)
+            fields = result.fields.map(&:name)
+            rows = result.fetchall.map do |row|
+              row.map do |col|
+                col.encode('UTF-8', @connection.encoding) rescue col
+              end
             end
-          end
 
-          result.close
-          ActiveRecord::Result.new(fields, rows)
-        else
-          result
+            result.close
+            ActiveRecord::Result.new(fields, rows)
+          else
+            result
+          end
+        rescue Exception => e
+          raise e.message.encode('UTF-8', @connection.encoding)
         end
-      rescue Exception => e
-        raise e.message.encode('UTF-8', @connection.encoding)
       end
     end
   end

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

@@ -0,0 +1,5 @@
+module ActiveRecord::ConnectionAdapters::Firebird::Quoting
+  def quoted_date(value)
+    super.sub(/(\.\d{6})\z/, $1.to_s.first(5))
+  end
+end

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

@@ -8,6 +8,105 @@ module ActiveRecord::ConnectionAdapters::Firebird::SchemaStatements
     @connection.view_names
   end
 
+  def indexes(table_name)
+    result = query(<<~SQL, "SCHEMA")
+      SELECT
+        rdb$index_name,
+        rdb$unique_flag
+      FROM
+        rdb$indices
+      WHERE
+        rdb$relation_name = '#{table_name.upcase}';
+    SQL
+
+    result.map do |row|
+      index_name = row[0].strip
+      unique = row[1] == 1
+      columns = query_values(<<~SQL, "SCHEMA")
+        SELECT
+          rdb$field_name
+        FROM
+          rdb$index_segments
+        WHERE
+          rdb$index_name = '#{index_name}'
+        ORDER BY
+          rdb$field_position
+      SQL
+
+      ActiveRecord::ConnectionAdapters::IndexDefinition.new(
+        table_name.downcase,
+        index_name.downcase,
+        unique,
+        columns.map(&:strip).map(&:downcase),
+      )
+    end
+  end
+
+  def remove_index(table_name, options = {})
+    index_name = index_name_for_remove(table_name, options)
+    execute "DROP INDEX #{quote_column_name(index_name)}"
+  end
+
+  def foreign_keys(table_name)
+    result = query(<<-SQL.strip_heredoc, "SCHEMA")
+      WITH FK_FIELDS AS (
+        SELECT
+          AA2.RDB$RELATION_NAME,
+          AA2.RDB$CONSTRAINT_NAME,
+          BB2.RDB$CONST_NAME_UQ AS LINK_UK_OR_PK,
+          EE2.RDB$RELATION_NAME AS REFERENCE_TABLE,
+          CC2.RDB$FIELD_NAME,
+          AA2.RDB$CONSTRAINT_TYPE
+        FROM
+          RDB$RELATION_CONSTRAINTS AA2
+          LEFT JOIN RDB$REF_CONSTRAINTS BB2 ON BB2.RDB$CONSTRAINT_NAME = AA2.RDB$CONSTRAINT_NAME
+          LEFT JOIN RDB$INDEX_SEGMENTS CC2 ON CC2.RDB$INDEX_NAME = AA2.RDB$INDEX_NAME
+          LEFT JOIN RDB$RELATION_FIELDS DD2 ON DD2.RDB$FIELD_NAME = CC2.RDB$FIELD_NAME AND DD2.RDB$RELATION_NAME = AA2.RDB$RELATION_NAME
+          LEFT JOIN RDB$RELATION_CONSTRAINTS EE2 ON EE2.RDB$CONSTRAINT_NAME = BB2.RDB$CONST_NAME_UQ
+      )
+      SELECT
+        AA.RDB$CONSTRAINT_NAME,
+        BB.REFERENCE_TABLE,
+        BB.FIELDS,
+        BB.REFERENCE_FIELDS
+      FROM
+        RDB$RELATION_CONSTRAINTS AA
+        LEFT JOIN (
+          SELECT
+            AA1.RDB$RELATION_NAME,
+            AA1.RDB$CONSTRAINT_NAME,
+            AA1.LINK_UK_OR_PK,
+            AA1.REFERENCE_TABLE,
+            (
+              SELECT LIST(TRIM(AA3.RDB$FIELD_NAME), ', ') FROM FK_FIELDS AA3 WHERE AA3.RDB$CONSTRAINT_NAME = AA1.RDB$CONSTRAINT_NAME ROWS 1
+            ) AS FIELDS,
+            (
+              SELECT LIST(TRIM(AA4.RDB$FIELD_NAME), ', ') FROM FK_FIELDS AA4 WHERE AA4.RDB$CONSTRAINT_NAME = AA1.LINK_UK_OR_PK ROWS 1
+            ) AS REFERENCE_FIELDS
+          FROM
+            FK_FIELDS AA1
+          GROUP BY
+            AA1.RDB$RELATION_NAME,
+            AA1.RDB$CONSTRAINT_NAME,
+            AA1.REFERENCE_TABLE,
+            AA1.LINK_UK_OR_PK
+        ) BB ON BB.RDB$RELATION_NAME = AA.RDB$RELATION_NAME AND BB.RDB$CONSTRAINT_NAME = AA.RDB$CONSTRAINT_NAME
+      WHERE
+        AA.RDB$CONSTRAINT_TYPE = 'FOREIGN KEY'
+        AND AA.RDB$RELATION_NAME = '#{table_name.upcase}';
+    SQL
+
+    result.map do |row|
+      options = {
+        column: row[2].downcase,
+        name: row[0].strip.downcase,
+        primary_key: row[3].downcase
+      }
+
+      ActiveRecord::ConnectionAdapters::ForeignKeyDefinition.new(table_name, row[1].strip.downcase, options)
+    end
+  end
+
 private
 
   def column_definitions(table_name)

data/lib/active_record/connection_adapters/firebird_adapter.rb

@@ -4,6 +4,7 @@ require 'active_record/connection_adapters/firebird/connection'
 require 'active_record/connection_adapters/firebird/database_limits'
 require 'active_record/connection_adapters/firebird/database_statements'
 require 'active_record/connection_adapters/firebird/schema_statements'
+require 'active_record/connection_adapters/firebird/quoting'
 
 require 'arel/visitors/firebird'
 
@@ -15,6 +16,7 @@ class ActiveRecord::ConnectionAdapters::FirebirdAdapter < ActiveRecord::Connecti
   include ActiveRecord::ConnectionAdapters::Firebird::DatabaseLimits
   include ActiveRecord::ConnectionAdapters::Firebird::DatabaseStatements
   include ActiveRecord::ConnectionAdapters::Firebird::SchemaStatements
+  include ActiveRecord::ConnectionAdapters::Firebird::Quoting
 
   def arel_visitor
     @arel_visitor ||= Arel::Visitors::Firebird.new(self)
@@ -66,7 +68,7 @@ class ActiveRecord::ConnectionAdapters::FirebirdAdapter < ActiveRecord::Connecti
   end
 
   def encoding
-    ActiveRecord::Base.connection_config[:encoding] || ActiveRecord::ConnectionAdapters::FirebirdAdapter::DEFAULT_ENCODING
+    @connection.encoding
   end
 
   def log(sql, name = "SQL", binds = [], type_casted_binds = [], statement_name = nil) # :doc:
@@ -74,6 +76,10 @@ class ActiveRecord::ConnectionAdapters::FirebirdAdapter < ActiveRecord::Connecti
     super
   end
 
+  def supports_foreign_keys?
+    true
+  end
+
 protected
 
   def translate_exception(e, message)

data/lib/active_record/internal_metadata_extensions.rb

@@ -0,0 +1,31 @@
+class ActiveRecord::InternalMetadata
+  class << self
+    def adapter_name
+      connection.adapter_name.downcase.to_sym
+    end
+
+    def value_name
+      adapter_name == :firebird ? :value_ : :value
+    end
+
+    def []=(key, value)
+      find_or_initialize_by(key: key).update!(value_name => value)
+    end
+
+    def [](key)
+      where(key: key).pluck(value_name).first
+    end
+
+    def create_table
+      unless table_exists?
+        key_options = connection.internal_string_options_for_primary_key
+
+        connection.create_table(table_name, id: false) do |t|
+          t.string :key, key_options
+          t.string value_name
+          t.timestamps
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firebird_adapter
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Fábio Rodrigues
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-10 00:00:00.000000000 Z
+date: 2019-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -118,9 +118,11 @@ files:
 - 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/quoting.rb
 - lib/active_record/connection_adapters/firebird/schema_statements.rb
 - lib/active_record/connection_adapters/firebird_adapter.rb
 - lib/active_record/extensions.rb
+- lib/active_record/internal_metadata_extensions.rb
 - lib/arel/visitors/firebird.rb
 homepage: https://github.com/FabioMR/firebird_adapter
 licenses: