RubyGems - ar_firebird_adapter - Versions diffs - 1.0.3 → 1.0.4 - Mend

ar_firebird_adapter 1.0.3 → 1.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

checksums.yaml +4 -4
data/lib/active_record/connection_adapters/ar_firebird/database_statements.rb +3 -0
data/lib/active_record/connection_adapters/ar_firebird/quoting.rb +8 -0
data/lib/active_record/connection_adapters/ar_firebird/schema_statements.rb +165 -160
data/lib/arel/visitors/ar_firebird.rb +1 -1
metadata +2 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1d31b12f68b28b88b65f3d1dbe9ba2316424758d38f0048db9e6d393325ba48
-  data.tar.gz: c88dff39a172d01ab3e85544a4d0743c2df121dbe91433bb402043ff00c87cc2
+  metadata.gz: af42ea2984ae7dd03414715ca98722150e355b3821777c6dd7c3f2b8f75068ce
+  data.tar.gz: f3c313959cdb65c12698c9b2e2914a1cb505ec61c27fc7139b4db79c9bd3a680
 SHA512:
-  metadata.gz: 1fe65acaac638e4852c4be5f4bc00d9c86af87d5898af3eb48853ac323a4e81d95a7e05e6742345f45ecb8ec8173665f361c08efcad99809924193f11b18d655
-  data.tar.gz: a411a7096d1f7337d49da8a1d4b088b3471b55ac8b6b8bd6836daf1ffb186af339e3e707a9dab85e5331225f611215cf4ca9e6fe481ce4e0632ba4e5fed2ff04
+  metadata.gz: 78b32a05c9a84554f33a0adca51ca6d8bd12baf83074facfd4ac39473c9b6c3d6bc2af914612151f2d61bc17145d9cdf0865ae953724d15fb434f6946afb4faa
+  data.tar.gz: 0d116c295ebf1f8e41df1ee189c3fafd3e977bcf1cf478a5e3c161e1ba4c6b7c0127c1bdab4491675540d2acd1557c914032b9d14d725b2de943d4c2e50491ac

data/lib/active_record/connection_adapters/ar_firebird/database_statements.rb CHANGED Viewed

@@ -93,4 +93,7 @@ module ActiveRecord::ConnectionAdapters::ArFirebird::DatabaseStatements
     @connection.query("SELECT NEXT VALUE FOR #{sequence_name} FROM RDB$DATABASE")[0][0]
   end
+  def remove_column(table_name, column_name, type = nil, options = {})
+    execute "ALTER TABLE #{table_name} DROP #{column_name}"
+  end
 end

data/lib/active_record/connection_adapters/ar_firebird/quoting.rb CHANGED Viewed

@@ -29,6 +29,14 @@ module ActiveRecord
         def quoted_date(value)
           super.sub(/(\.\d{6})\z/, $1.to_s.first(5))
         end
+        def quote_column_name(column_name)
+          if column_name.is_a?(String) || column_name.is_a?(Symbol)
+            "\"#{column_name.upcase}\""
+          else
+            column_name
+          end
+        end
       end
     end
   end

data/lib/active_record/connection_adapters/ar_firebird/schema_statements.rb CHANGED Viewed

@@ -1,163 +1,168 @@
-module ActiveRecord::ConnectionAdapters::ArFirebird::SchemaStatements
-  def tables(_name = nil)
-    @connection.table_names
-  end
-  def views
-    @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),
-      )
+module ActiveRecord
+  module ConnectionAdapters
+    module ArFirebird
+      module SchemaStatements
+        def tables(_name = nil)
+          @connection.table_names
+        end
+        def views
+          @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, "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
+        def change_column(table_name, column_name, type, options = {}) #:nodoc:
+          clear_cache!
+          type = type_to_sql(type)
+          column = column_definitions(table_name.to_sym).find {|column| column["name"] == column_name.to_s }
+          if options[:limit]
+            type = "#{type.gsub(/\(.*\)/,'')}(#{options[:limit]})"
+          end
+          sql = []
+          if type != column["sql_type"]
+            sql << "ALTER COLUMN #{column["name"]} TYPE #{type}"
+          end
+          execute "ALTER TABLE #{table_name} #{sql.join(', ')}" if sql.any?
+        end
+        private
+          def column_definitions(table_name)
+            @connection.columns(table_name)
+          end
+          def new_column_from_field(table_name, field)
+            type_metadata = fetch_type_metadata(field["sql_type"], field)
+            ActiveRecord::ConnectionAdapters::ArFirebird::FbColumn.new(
+              field["name"],
+              field["default"],
+              type_metadata,
+              field["nullable"],
+              table_name,
+              nil,
+              nil,
+              nil,
+              field
+            )
+          end
+          def fetch_type_metadata(sql_type, field = "")
+            if field['domain'] == ActiveRecord::ConnectionAdapters::ArFirebirdAdapter.boolean_domain[:name]
+              cast_type = lookup_cast_type("boolean")
+            else
+              cast_type = lookup_cast_type(sql_type)
+            end
+            ActiveRecord::ConnectionAdapters::ArFirebird::SqlTypeMetadata.new(
+              sql_type: sql_type,
+              type: cast_type.type,
+              precision: cast_type.precision,
+              scale: cast_type.scale,
+              limit: cast_type.limit,
+              field: field
+            )
+          end
+      end
     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, "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
-  def change_column(table_name, column_name, type, options = {}) #:nodoc:
-    clear_cache!
-    type = type_to_sql(type)
-    column = column_definitions(table_name.to_sym).find {|column| column["name"] == column_name.to_s }
-    if options[:limit]
-      type = "#{type.gsub(/\(.*\)/,'')}(#{options[:limit]})"
-    end
-    sql = []
-    if type != column["sql_type"]
-      sql << "ALTER COLUMN #{column["name"]} TYPE #{type}"
-    end
-    execute "ALTER TABLE #{table_name} #{sql.join(', ')}" if sql.any?
-  end
-private
-  def column_definitions(table_name)
-    @connection.columns(table_name)
-  end
-  def new_column_from_field(table_name, field)
-    type_metadata = fetch_type_metadata(field["sql_type"], field)
-    ActiveRecord::ConnectionAdapters::ArFirebird::FbColumn.new(
-      field["name"],
-      field["default"],
-      type_metadata,
-      field["nullable"],
-      table_name,
-      nil,
-      nil,
-      nil,
-      field
-    )
-  end
-  def fetch_type_metadata(sql_type, field = "")
-    if field['domain'] == ActiveRecord::ConnectionAdapters::ArFirebirdAdapter.boolean_domain[:name]
-      cast_type = lookup_cast_type("boolean")
-    else
-      cast_type = lookup_cast_type(sql_type)
-    end
-    ActiveRecord::ConnectionAdapters::ArFirebird::SqlTypeMetadata.new(
-      sql_type: sql_type,
-      type: cast_type.type,
-      precision: cast_type.precision,
-      scale: cast_type.scale,
-      limit: cast_type.limit,
-      field: field
-    )
-  end
 end

data/lib/arel/visitors/ar_firebird.rb CHANGED Viewed

@@ -18,7 +18,7 @@ class Arel::Visitors::ArFirebird < Arel::Visitors::ToSql
       collector << ' ORDER BY '
       o.orders.each_with_index do |x, i|
         collector << ', ' unless i == 0
-        collector = visit(x, collector)
+        collector = visit(quote_column_name(x), collector)
       end
     end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar_firebird_adapter
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Fábio Rodrigues
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-29 00:00:00.000000000 Z
+date: 2020-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fb