activerecord-jdbc-adapter 1.2.2 → 1.2.2.1

data/lib/arjdbc/postgresql/adapter.rb

@@ -330,6 +330,42 @@ module ::ArJdbc
       nil
     end
 
+    # Insert logic for pre-AR-3.1 adapters
+    def insert_sql(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil, binds = [])
+      # Extract the table from the insert sql. Yuck.
+      table = sql.split(" ", 4)[2].gsub('"', '')
+
+      # Try an insert with 'returning id' if available (PG >= 8.2)
+      if supports_insert_with_returning? && id_value.nil?
+        pk, sequence_name = *pk_and_sequence_for(table) unless pk
+        if pk
+          sql = substitute_binds(sql, binds)
+          id_value = select_value("#{sql} RETURNING #{quote_column_name(pk)}")
+          clear_query_cache #FIXME: Why now?
+          return id_value
+        end
+      end
+
+      # Otherwise, plain insert
+      execute(sql, name, binds)
+
+      # Don't need to look up id_value if we already have it.
+      # (and can't in case of non-sequence PK)
+      unless id_value
+        # If neither pk nor sequence name is given, look them up.
+        unless pk || sequence_name
+          pk, sequence_name = *pk_and_sequence_for(table)
+        end
+
+        # If a pk is given, fallback to default sequence name.
+        # Don't fetch last insert id for a table without a pk.
+        if pk && sequence_name ||= default_sequence_name(table, pk)
+          id_value = last_insert_id(table, sequence_name)
+        end
+      end
+      id_value
+    end
+
     def primary_key(table)
       pk_and_sequence = pk_and_sequence_for(table)
       pk_and_sequence && pk_and_sequence.first

data/lib/arjdbc/version.rb

@@ -1,6 +1,6 @@
 module ArJdbc
   module Version
-    VERSION = "1.2.2"
+    VERSION = "1.2.2.1"
   end
 end
 # Compatibility with older versions of ar-jdbc for other extensions out there

data/test/helper.rb

@@ -15,73 +15,90 @@ module Kernel
   end
 end
 
-# assert_queries and SQLCounter taken from rails active_record tests
-require 'test/unit'
-class Test::Unit::TestCase
-  def assert_queries(num = 1, matching = nil)
-    ActiveRecord::SQLCounter.log = []
-    yield
-  ensure
-    queries = nil
-    ActiveRecord::SQLCounter.log.tap {|log| queries = (matching ? log.select {|s| s =~ matching } : log) }
-    assert_equal num, queries.size, "#{queries.size} instead of #{num} queries were executed.#{queries.size == 0 ? '' : "\nQueries:\n#{queries.join("\n")}"}"
-  end
-end
+if defined?(::ActiveRecord::ConnectionAdapters)
 
-require 'active_support/notifications'
-module ActiveRecord
-  class SQLCounter
-    def self.ignored_sql
-      @@ignored_sql
+  # assert_queries and SQLCounter taken from rails active_record tests
+  require 'test/unit'
+  class Test::Unit::TestCase
+    def assert_queries(num = 1, matching = nil)
+      ActiveRecord::SQLCounter.log = []
+      yield
+    ensure
+      queries = nil
+      ActiveRecord::SQLCounter.log.tap {|log| queries = (matching ? log.select {|s| s =~ matching } : log) }
+      assert_equal num, queries.size, "#{queries.size} instead of #{num} queries were executed.#{queries.size == 0 ? '' : "\nQueries:\n#{queries.join("\n")}"}"
     end
+  end
 
-    def self.ignored_sql=(value)
-      @@ignored_sql = value
-    end
+  module ActiveRecord
+    class SQLCounter
+      def self.ignored_sql
+        @@ignored_sql
+      end
 
-    self.ignored_sql = [
-      /^PRAGMA (?!(table_info))/,
-      /^SELECT currval/,
-      /^SELECT CAST/,
-      /^SELECT @@IDENTITY/,
-      /^SELECT @@ROWCOUNT/,
-      /^SAVEPOINT/,
-      /^ROLLBACK TO SAVEPOINT/,
-      /^RELEASE SAVEPOINT/,
-      /^SHOW max_identifier_length/,
-      /^BEGIN/,
-      /^COMMIT/
-    ]
+      def self.ignored_sql=(value)
+        @@ignored_sql = value
+      end
 
-    # FIXME: this needs to be refactored so specific database can add their own
-    # ignored SQL.  This ignored SQL is for Oracle.
-    ignored_sql.concat [/^select .*nextval/i,
-      /^SAVEPOINT/,
-      /^ROLLBACK TO/,
-      /^\s*select .* from all_triggers/im
-    ]
+      self.ignored_sql = [
+        /^PRAGMA (?!(table_info))/,
+        /^SELECT currval/,
+        /^SELECT CAST/,
+        /^SELECT @@IDENTITY/,
+        /^SELECT @@ROWCOUNT/,
+        /^SAVEPOINT/,
+        /^ROLLBACK TO SAVEPOINT/,
+        /^RELEASE SAVEPOINT/,
+        /^SHOW max_identifier_length/,
+        /^BEGIN/,
+        /^COMMIT/
+      ]
 
-    def self.log=(v)
-      @@log = v
-    end
+      # FIXME: this needs to be refactored so specific database can add their own
+      # ignored SQL.  This ignored SQL is for Oracle.
+      ignored_sql.concat [/^select .*nextval/i,
+        /^SAVEPOINT/,
+        /^ROLLBACK TO/,
+        /^\s*select .* from all_triggers/im
+      ]
 
-    def self.log
-      @@log
-    end
+      def self.log=(v)
+        @@log = v
+      end
+
+      def self.log
+        @@log
+      end
+
+      self.log = []
 
-    self.log = []
+      def call(name, start, finish, message_id, values)
+        sql = values[:sql]
 
-    def call(name, start, finish, message_id, values)
-      sql = values[:sql]
+        # FIXME: this seems bad. we should probably have a better way to indicate
+        # the query was cached
+        unless 'CACHE' == values[:name]
+          self.class.log << sql unless self.class.ignored_sql.
+            any? { |r| sql =~ r }
+        end
+      end
+
+      def self.instance
+        @instance || self.new
+      end
+    end
 
-      # FIXME: this seems bad. we should probably have a better way to indicate
-      # the query was cached
-      unless 'CACHE' == values[:name]
-        self.class.log << sql unless self.class.ignored_sql.
-          any? { |r| sql =~ r }
+    begin
+      require 'active_support/notifications'
+      ActiveSupport::Notifications.subscribe('sql.active_record', SQLCounter.new)
+    rescue LoadError
+      class ActiveRecord::ConnectionAdapters::JdbcAdapter
+        def log_info(sql, name, ms)
+          ActiveRecord::SQLCounter.instance.call(name, ms, ms, nil, :sql => sql)
+          super
+        end
       end
     end
   end
 
-  ActiveSupport::Notifications.subscribe('sql.active_record', SQLCounter.new)
 end

metadata

@@ -2,7 +2,7 @@
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.2
+  version: 1.2.2.1
 platform: ruby
 authors: 
   - Nick Sieger, Ola Bini and JRuby contributors
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-28 00:00:00 Z
+date: 2012-10-19 00:00:00 Z
 dependencies: []
 
 description: |-
@@ -273,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: jruby-extras
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: JDBC adapter for ActiveRecord, for use within JRuby on Rails.