firebird_adapter 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9862bb89f1ee8b387ce778ea0289a0101b7ee385804b3e3e2af62a28415d522d
-  data.tar.gz: af120e7dba499c2c75114eb91fc82975e0e328222bd8a51e1609bf3aa87f9620
+  metadata.gz: 3b0c7e1978e039950b5bb14813682b01ce6779a039c4690f93a829a8623d8e54
+  data.tar.gz: 67df3f9d4a025f40c422b0bcb35a7ae338ea3eb76eb5e6be9480ca46727d48a5
 SHA512:
-  metadata.gz: 1c2b392daa062e95906a2d138f12cd8fa4e21a76c6d3375ebc93b398fd30c150507d7f5c3264405f552c150aaa125c151cfa12f873f7ee86385e2117663c0be1
-  data.tar.gz: 980d8174f6ae3ee40286686fe1efee4e73dd1fd5e049e562ee915463196743ad8590951611ed473811092047861e4d9eb4b83216176692430661a2537e82973b
+  metadata.gz: 991f13fb8e58126d2f240026462db3fbfa16e20e20dfa3d80706078548cf4947d1ec395e758366fbf62070ce02f064916630b68695ead7df57391bb67e20aa70
+  data.tar.gz: 8306b2a48746dff1f29959ffce9e76be801f7c3531289fc792700cf190e1459b148ba58fd5fb997ed6865af9fe680d47fdcf37a64cd35c71bd7516c4cc1d8bfe

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

@@ -1,5 +1,21 @@
 module ActiveRecord::ConnectionAdapters::Firebird::DatabaseStatements
-
+  
+  def native_database_types
+    {
+      primary_key: 'integer not null primary key',
+      string:      { name: 'varchar', limit: 255 },
+      text:        { name: 'blob sub_type text' },
+      integer:     { name: 'integer' },
+      float:       { name: 'float' },
+      decimal:     { name: 'decimal' },
+      datetime:    { name: 'timestamp' },
+      timestamp:   { name: 'timestamp' },
+      date:        { name: 'date' },
+      binary:      { name: 'blob' },
+      boolean:     { name: 'smallint' }
+    }
+  end
+  
   def execute(sql, name = nil)
     log(sql, name) do
       ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
@@ -48,6 +64,36 @@ module ActiveRecord::ConnectionAdapters::Firebird::DatabaseStatements
     log("rollback transaction", nil) { @connection.rollback }
   end
 
+  def create_table(table_name, **options)
+    super
+
+    if options[:sequence] != false && options[:id] != false
+      sequence_name = options[:sequence] || default_sequence_name(table_name)
+      create_sequence(sequence_name)
+    end
+  end
+
+  def drop_table(table_name, options = {})
+    if options[:sequence] != false
+      sequence_name = options[:sequence] || default_sequence_name(table_name)
+      drop_sequence(sequence_name) if sequence_exists?(sequence_name)
+    end
+
+    super
+  end
+
+  def create_sequence(sequence_name)
+    execute("CREATE SEQUENCE #{sequence_name}") rescue nil
+  end
+
+  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
+
   def default_sequence_name(table_name, _column = nil)
     "#{table_name}_g01"
   end

data/lib/active_record/connection_adapters/firebird_adapter.rb

@@ -46,6 +46,24 @@ 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 
+        s.rdb$field_name
+      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 
+        i.rdb$relation_name = '#{table_name.upcase}'
+        AND c.rdb$constraint_type = 'PRIMARY KEY';
+    SQL
+
+    names.map(&:strip).map(&:downcase)
+  end
 
 protected
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firebird_adapter
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Fábio Rodrigues
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-21 00:00:00.000000000 Z
+date: 2019-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails