activerecord-fb-adapter 0.8.7 → 0.8.8

data/lib/active_record/connection_adapters/fb_adapter.rb

@@ -3,7 +3,6 @@
 # Based originally on FireRuby extension by Ken Kunz <kennethkunz@gmail.com>
 
 require 'active_record/connection_adapters/abstract_adapter'
-# require 'active_support/core_ext/kernel/requires'
 require 'base64'
 
 module Arel
@@ -160,7 +159,7 @@ module ActiveRecord
     #
     # === Sequence (Generator) Names
     # The Fb adapter supports the same approach adopted for the Oracle
-    # adapter. See ActiveRecord::Base#set_sequence_name for more details.
+    # adapter. See ActiveRecord::ModelSchema::ClassMethods#sequence_name= for more details.
     #
     # Note that in general there is no need to create a <tt>BEFORE INSERT</tt>
     # trigger corresponding to a Firebird sequence generator when using
@@ -257,9 +256,9 @@ module ActiveRecord
       @@boolean_domain = { :true => 1, :false => 0, :name => 'BOOLEAN', :type => 'integer' }
       cattr_accessor :boolean_domain
 
-      def initialize(connection, logger, connection_params=nil)
+      def initialize(connection, logger, config=nil)
         super(connection, logger)
-        @connection_params = connection_params
+        @config = config
         @visitor = Arel::Visitors::FB.new(self)
       end
 
@@ -299,8 +298,7 @@ module ActiveRecord
         false
       end
 
-      # Does this adapter support savepoints? PostgreSQL and MySQL do, SQLite
-      # does not.
+      # Does this adapter support savepoints? FirebirdSQL does
       def supports_savepoints?
         true
       end
@@ -343,7 +341,7 @@ module ActiveRecord
       # new connection with the database.
       def reconnect!
         disconnect!
-        @connection = Fb::Database.connect(@connection_params)
+        @connection = Fb::Database.connect(@config)
       end
 
       # Disconnects from the database if already connected. Otherwise, this
@@ -363,10 +361,10 @@ module ActiveRecord
       end
 
       # Returns true if its required to reload the connection between requests for development mode.
-      # This is not the case for Ruby/MySQL and it's not necessary for any adapters except SQLite.
-      # def requires_reloading?
-      #   false
-      # end
+      # This is not the case for FirebirdSQL and it's not necessary for any adapters except SQLite.
+      def requires_reloading?
+         false
+      end
 
       # Checks whether the connection to the database is still active (i.e. not stale).
       # This is done under the hood by calling <tt>active?</tt>. If the connection
@@ -685,9 +683,9 @@ module ActiveRecord
         end
         sql
       end
-
-      def default_sequence_name(table_name, column=nil)
-        "#{table_name}_seq"
+      
+      def default_sequence_name(table_name, column = nil)
+        "#{table_name.to_s[0, table_name_length - 4]}_seq"
       end
 
       # Set the sequence to the max value of the table's column.
@@ -697,7 +695,7 @@ module ActiveRecord
       end
 
       def next_sequence_value(sequence_name)
-        select_one("SELECT GEN_ID(#{sequence_name}, 1) FROM RDB$DATABASE").values.first
+        select_one("SELECT NEXT VALUE FOR #{sequence_name} FROM RDB$DATABASE").values.first
       end
 
       # Inserts the given fixture into the table. Overridden in adapters that require

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-fb-adapter
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fb
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.1
 description: 
 email: rowland@rowlandresearch.com
 executables: []