activerecord-rdb-adapter 0.9.4 → 0.9.6.beta2

data/lib/active_record/connection_adapters/rdb/table_definition.rb

@@ -1,28 +1,28 @@
-module ActiveRecord
-  module ConnectionAdapters
-    module Rdb
-      module ColumnMethods # :nodoc:
-
-        attr_accessor :needs_sequence
-
-        def primary_key(name, type = :primary_key, **options)
-          self.needs_sequence = true
-          super
-        end
-
-      end
-
-      class TableDefinition < ActiveRecord::ConnectionAdapters::TableDefinition # :nodoc:
-        include ColumnMethods
-
-        def new_column_definition(name, type, **options)
-          super
-        end
-      end
-
-      class Table < ActiveRecord::ConnectionAdapters::Table # :nodoc:
-        include ColumnMethods
-      end
-    end
-  end
-end
+module ActiveRecord
+  module ConnectionAdapters
+    module Rdb
+      module ColumnMethods # :nodoc:
+
+        attr_accessor :needs_sequence
+
+        def primary_key(name, type = :primary_key, **options)
+          self.needs_sequence = true
+          super
+        end
+
+      end
+
+      class TableDefinition < ActiveRecord::ConnectionAdapters::TableDefinition # :nodoc:
+        include ColumnMethods
+
+        def new_column_definition(name, type, **options)
+          super
+        end
+      end
+
+      class Table < ActiveRecord::ConnectionAdapters::Table # :nodoc:
+        include ColumnMethods
+      end
+    end
+  end
+end

data/lib/active_record/connection_adapters/rdb_adapter.rb

@@ -1,163 +1,160 @@
-require 'fb'
-require 'base64'
-require 'arel'
-require 'arel/visitors/rdb_visitor'
-
-require 'active_record'
-require 'active_record/base'
-require 'active_record/connection_adapters/abstract_adapter'
-require 'active_record/connection_adapters/rdb/database_statements'
-require 'active_record/connection_adapters/rdb/database_limits'
-require 'active_record/connection_adapters/rdb/schema_creation'
-require 'active_record/connection_adapters/rdb/schema_dumper'
-require 'active_record/connection_adapters/rdb/schema_statements'
-require 'active_record/connection_adapters/rdb/quoting'
-require 'active_record/connection_adapters/rdb/table_definition'
-require 'active_record/connection_adapters/rdb_column'
-require 'active_record/rdb_base'
-
-module ActiveRecord
-  module ConnectionAdapters
-    class RdbAdapter < AbstractAdapter # :nodoc:
-      include Rdb::DatabaseLimits
-      include Rdb::DatabaseStatements
-      include Rdb::Quoting
-      include Rdb::SchemaStatements
-
-      @@default_transaction_isolation = :read_committed
-      cattr_accessor :default_transaction_isolation
-
-      ADAPTER_NAME = 'rdb'.freeze
-
-      def initialize(connection, logger = nil, config = {})
-        super(connection, logger, config)
-        # Our Responsibility
-        @config = config
-        @visitor = Arel::Visitors::Rdb.new self
-        @prepared_statements = true
-        @visitor.extend(DetermineIfPreparableVisitor)
-      end
-
-      def arel_visitor
-        Arel::Visitors::Rdb.new self
-      end
-
-      def valid_type?(type)
-        !native_database_types[type].nil? || !native_database_types[type.type].nil?
-      end
-
-      def adapter_name
-        ADAPTER_NAME
-      end
-
-      def schema_creation
-        Rdb::SchemaCreation.new self
-      end
-
-      def supports_migrations?
-        true
-      end
-
-      def supports_primary_key?
-        true
-      end
-
-      def supports_count_distinct?
-        true
-      end
-
-      def supports_ddl_transactions?
-        true
-      end
-
-      def supports_transaction_isolation?
-        true
-      end
-
-      def supports_savepoints?
-        true
-      end
-
-      def prefetch_primary_key?(_table_name = nil)
-        true
-      end
-
-      def ids_in_list_limit
-        1499
-      end
-
-      def supports_multi_insert?
-        false
-      end
-
-      def active?
-        return false unless @connection.open?
-        # return true if @connection.transaction_started
-        @connection.query('SELECT 1 FROM RDB$DATABASE')
-        true
-      rescue StandardError
-        false
-      end
-
-      def reconnect!
-        disconnect!
-        @connection = ::Fb::Database.connect(@config)
-      end
-
-      def disconnect!
-        super
-        begin
-          @connection.close
-        rescue StandardError
-          nil
-        end
-      end
-
-      def reset!
-        reconnect!
-      end
-
-      def requires_reloading?
-        false
-      end
-
-      def create_savepoint(name = current_savepoint_name)
-        execute("SAVEPOINT #{name}")
-      end
-
-      def rollback_to_savepoint(name = current_savepoint_name)
-        execute("ROLLBACK TO SAVEPOINT #{name}")
-      end
-
-      def release_savepoint(name = current_savepoint_name)
-        execute("RELEASE SAVEPOINT #{name}")
-      end
-
-      protected
-
-      def initialize_type_map(map)
-        super
-        map.register_type(/timestamp/i, Type::DateTime.new)
-        map.alias_type(/blob sub_type text/i, 'text')
-      end
-
-      def translate_exception(e, message)
-        case e.message
-        when /violation of FOREIGN KEY constraint/
-          ActiveRecord::InvalidForeignKey.new(message)
-        when /violation of PRIMARY or UNIQUE KEY constraint/, /attempt to store duplicate value/
-          ActiveRecord::RecordNotUnique.new(message)
-        when /This operation is not defined for system tables/
-          ActiveRecord::ActiveRecordError.new(message)
-        when /Column does not belong to referenced table/,
-            /Unsuccessful execution caused by system error that does not preclude successful execution of subsequent statements/,
-            /The cursor identified in the UPDATE or DELETE statement is not positioned on a row/,
-            /Overflow occurred during data type conversion/
-          ActiveRecord::StatementInvalid.new(message)
-        else
-          super
-        end
-      end
-    end
-  end
-end
+require 'fb'
+require 'base64'
+require 'arel'
+require 'arel/visitors/rdb_visitor'
+
+require 'active_record'
+require 'active_record/base'
+require 'active_record/connection_adapters/abstract_adapter'
+require 'active_record/connection_adapters/rdb/database_statements'
+require 'active_record/connection_adapters/rdb/database_limits'
+require 'active_record/connection_adapters/rdb/schema_creation'
+require 'active_record/connection_adapters/rdb/schema_dumper'
+require 'active_record/connection_adapters/rdb/schema_statements'
+require 'active_record/connection_adapters/rdb/quoting'
+require 'active_record/connection_adapters/rdb/table_definition'
+require 'active_record/connection_adapters/rdb_column'
+require 'active_record/rdb_base'
+
+module ActiveRecord
+  module ConnectionAdapters
+    class RdbAdapter < AbstractAdapter # :nodoc:
+      include Rdb::DatabaseLimits
+      include Rdb::DatabaseStatements
+      include Rdb::Quoting
+      include Rdb::SchemaStatements
+
+      @@default_transaction_isolation = :read_committed
+      cattr_accessor :default_transaction_isolation
+
+      ADAPTER_NAME = 'rdb'.freeze
+
+      def initialize(connection, logger = nil, config = {})
+        super(connection, logger, config)
+        # Our Responsibility
+        @config = config
+      end
+
+      def arel_visitor
+        Arel::Visitors::Rdb.new self
+      end
+
+      def valid_type?(type)
+        !native_database_types[type].nil? || !native_database_types[type.type].nil?
+      end
+
+      def adapter_name
+        ADAPTER_NAME
+      end
+
+      def schema_creation
+        Rdb::SchemaCreation.new self
+      end
+
+      def supports_migrations?
+        true
+      end
+
+      def supports_primary_key?
+        true
+      end
+
+      def supports_count_distinct?
+        true
+      end
+
+      def supports_ddl_transactions?
+        true
+      end
+
+      def supports_transaction_isolation?
+        true
+      end
+
+      def supports_savepoints?
+        true
+      end
+
+      def prefetch_primary_key?(_table_name = nil)
+        true
+      end
+
+      def ids_in_list_limit
+        1499
+      end
+
+      def supports_multi_insert?
+        false
+      end
+
+      def active?
+        return false unless @connection.open?
+
+        @connection.query('SELECT 1 FROM RDB$DATABASE')
+        true
+      rescue StandardError
+        false
+      end
+
+      def reconnect!
+        disconnect!
+        @connection = ::Fb::Database.connect(@config)
+      end
+
+      def disconnect!
+        super
+        begin
+          @connection.close
+        rescue StandardError
+          nil
+        end
+      end
+
+      def reset!
+        reconnect!
+      end
+
+      def requires_reloading?
+        false
+      end
+
+      def create_savepoint(name = current_savepoint_name)
+        execute("SAVEPOINT #{name}")
+      end
+
+      def rollback_to_savepoint(name = current_savepoint_name)
+        execute("ROLLBACK TO SAVEPOINT #{name}")
+      end
+
+      def release_savepoint(name = current_savepoint_name)
+        execute("RELEASE SAVEPOINT #{name}")
+      end
+
+      protected
+
+      def initialize_type_map(map)
+        super
+        map.register_type(/timestamp/i, Type::DateTime.new)
+        map.alias_type(/blob sub_type text/i, 'text')
+      end
+
+      def translate_exception(e, message)
+        case e.message
+        when /violation of FOREIGN KEY constraint/
+          ActiveRecord::InvalidForeignKey.new(message)
+        when /violation of PRIMARY or UNIQUE KEY constraint/, /attempt to store duplicate value/
+          ActiveRecord::RecordNotUnique.new(message)
+        when /This operation is not defined for system tables/
+          ActiveRecord::ActiveRecordError.new(message)
+        when /Column does not belong to referenced table/,
+            /Unsuccessful execution caused by system error that does not preclude successful execution of subsequent statements/,
+            /The cursor identified in the UPDATE or DELETE statement is not positioned on a row/,
+            /Overflow occurred during data type conversion/
+          ActiveRecord::StatementInvalid.new(message)
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/lib/active_record/connection_adapters/rdb_column.rb

@@ -1,69 +1,69 @@
-module ActiveRecord
-  module ConnectionAdapters
-    class RdbColumn < Column # :nodoc:
-      class << self
-        def sql_type_for(field)
-          sql_type = field[:sql_type]
-          sub_type = field[:sql_subtype]
-
-          sql_type << case sql_type
-                      when /(numeric|decimal)/i
-                        "(#{field[:precision]},#{field[:scale].abs})"
-                      when /(int|float|double|char|varchar|bigint)/i
-                        "(#{field[:length]})"
-                      else
-                        ''
-                      end
-
-          sql_type << ' sub_type text' if /blob/i.match?(sql_type) && sub_type == 1
-          sql_type
-        end
-      end
-
-      attr_reader :sub_type, :domain
-
-      def initialize(name, default, sql_type_metadata = nil, null = true, table_name = nil, rdb_options = {})
-        @domain, @sub_type = rdb_options.values_at(:domain, :sub_type)
-        name = name.dup
-        name.downcase!
-        super(name, parse_default(default), sql_type_metadata, null, table_name)
-      end
-
-      def sql_type
-        @sql_type_metadata[:sql_type]
-      end
-
-      def type
-        @sql_type_metadata[:type]
-      end
-
-      def precision
-        @sql_type_metadata[:precision]
-      end
-
-      def scale
-        @sql_type_metadata[:scale]
-      end
-
-      def limit
-        @sql_type_metadata[:limit]
-      end
-
-      private
-
-      def parse_default(default)
-        return if default.nil? || /null/i.match?(default)
-        d = default.dup
-        d.gsub!(/^\s*DEFAULT\s+/i, '')
-        d.gsub!(/(^'|'$)/, '')
-        d
-      end
-
-      def simplified_type(field_type)
-        return :datetime if /timestamp/i.match?(field_type)
-        return :text if /blob sub_type text/i.match?(field_type)
-        super
-      end
-    end
-  end
-end
+module ActiveRecord
+  module ConnectionAdapters
+    class RdbColumn < Column # :nodoc:
+      class << self
+        def sql_type_for(field)
+          sql_type = field[:sql_type]
+          sub_type = field[:sql_subtype]
+
+          sql_type << case sql_type
+                      when /(numeric|decimal)/i
+                        "(#{field[:precision]},#{field[:scale].abs})"
+                      when /(int|float|double|char|varchar|bigint)/i
+                        "(#{field[:length]})"
+                      else
+                        ''
+                      end
+
+          sql_type << ' sub_type text' if /blob/i.match?(sql_type) && sub_type == 1
+          sql_type
+        end
+      end
+
+      attr_reader :sub_type, :domain
+
+      def initialize(name, default, sql_type_metadata = nil, null = true, table_name = nil, rdb_options = {})
+        @domain, @sub_type = rdb_options.values_at(:domain, :sub_type)
+        name = name.dup
+        name.downcase!
+        super(name, parse_default(default), sql_type_metadata, null, table_name)
+      end
+
+      def sql_type
+        @sql_type_metadata[:sql_type]
+      end
+
+      def type
+        @sql_type_metadata[:type]
+      end
+
+      def precision
+        @sql_type_metadata[:precision]
+      end
+
+      def scale
+        @sql_type_metadata[:scale]
+      end
+
+      def limit
+        @sql_type_metadata[:limit]
+      end
+
+      private
+
+      def parse_default(default)
+        return if default.nil? || /null/i.match?(default)
+        d = default.dup
+        d.gsub!(/^\s*DEFAULT\s+/i, '')
+        d.gsub!(/(^'|'$)/, '')
+        d
+      end
+
+      def simplified_type(field_type)
+        return :datetime if /timestamp/i.match?(field_type)
+        return :text if /blob sub_type text/i.match?(field_type)
+        super
+      end
+    end
+  end
+end

data/lib/active_record/rdb_base.rb

@@ -1,34 +1,34 @@
-module ActiveRecord
-  module ConnectionHandling # :nodoc:
-    def rdb_connection(config)
-      require 'fb'
-      config = rdb_connection_config(config)
-      db = ::Fb::Database.new(config)
-      @database = db
-      begin
-        connection = db.connect
-      rescue StandardError
-        unless config[:create]
-          require 'pp'
-          pp config
-          raise ConnectionNotEstablished, 'No Firebird connections established.'
-        end
-        connection = db.create.connect
-      end
-      ConnectionAdapters::RdbAdapter.new(connection, logger, config)
-    end
-
-    def rdb_connection_config(config)
-      config = config.symbolize_keys.dup.reverse_merge(downcase_names: true)
-      port = config[:port] || 3050
-      raise ArgumentError, 'No database specified. Missing argument: database.' unless config[:database]
-      config[:database] = File.expand_path(config[:database], defined?(Rails) && Rails.root) if config[:host].nil? || /localhost/i.match?(config[:host])
-      config[:database] = "#{config[:host]}/#{port}:#{config[:database]}" if config[:host]
-      # config[:charset] = config[:charset].gsub(/-/, '') if config[:charset]
-      # config[:encoding] = config[:encoding].gsub(/-/, '') if config[:encoding]
-      config[:page_size] = 8192 unless config[:page_size]
-      config[:readonly_selects] = true unless config[:readonly_selects].present?
-      config
-    end
-  end
-end
+module ActiveRecord
+  module ConnectionHandling # :nodoc:
+    def rdb_connection(config)
+      require 'fb'
+      config = rdb_connection_config(config)
+      db = ::Fb::Database.new(config)
+      @database = db
+      begin
+        connection = db.connect
+      rescue StandardError
+        unless config[:create]
+          require 'pp'
+          pp config
+          raise ConnectionNotEstablished, 'No Firebird connections established.'
+        end
+        connection = db.create.connect
+      end
+      ConnectionAdapters::RdbAdapter.new(connection, logger, config)
+    end
+
+    def rdb_connection_config(config)
+      config = config.symbolize_keys.dup.reverse_merge(downcase_names: true)
+      port = config[:port] || 3050
+      raise ArgumentError, 'No database specified. Missing argument: database.' unless config[:database]
+      config[:database] = File.expand_path(config[:database], defined?(Rails) && Rails.root) if config[:host].nil? || /localhost/i.match?(config[:host])
+      config[:database] = "#{config[:host]}/#{port}:#{config[:database]}" if config[:host]
+      # config[:charset] = config[:charset].gsub(/-/, '') if config[:charset]
+      # config[:encoding] = config[:encoding].gsub(/-/, '') if config[:encoding]
+      config[:page_size] = 8192 unless config[:page_size]
+      config[:readonly_selects] = true unless config[:readonly_selects].present?
+      config
+    end
+  end
+end