Ticket #2292: pg_seq.2363.diff

activerecord/test/fixtures_test.rb

@@ -5 +5 @@
-require 'fixtures/task'
-require 'fixtures/reply'
-
+# Dummy model used to test fixtures loaded from a model
+module TestModule
+  class Task < ActiveRecord::Base
+  end
+end
+
-class FixturesTest < Test::Unit::TestCase
-  self.use_instantiated_fixtures = true
-  self.use_transactional_fixtures = false
-
-
+, TestModule::Task
-
-  FIXTURES = %w( accounts companies customers
-                 developers developers_projects entrants

activerecord/test/adapter_test.rb

@@ -35 +35 @@
-  ensure
-    @connection.remove_index :accounts, :firm_id rescue nil
-  end
+  
+  # test resetting sequences in odd tables in postgreSQL
+  if ActiveRecord::Base.connection.respond_to?(:reset_sequences)
+    require 'fixtures/movie'
+    require 'fixtures/subscriber'
+    def test_reset_empty_table_with_custom_pk
+      Movie.destroy_all
+      Movie.connection.reset_sequences 'movies'
+      assert_equal 1, Movie.create(:name => 'fight club').id
+    end
+    
+    def test_reset_table_with_non_integer_pk
+      Subscriber.destroy_all
+      Subscriber.connection.reset_sequences 'sequences'
+      assert Subscriber.new(:id => 'bob drake', :name => 'robert drake').save
+    end
+  end
-end

activerecord/test/inheritance_test.rb

@@ -11 +11 @@
-    if ActiveRecord::ConnectionAdapters.const_defined? :SQLServerAdapter and ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters::SQLServerAdapter)
-      Company.connection.execute "SET IDENTITY_INSERT companies ON"
-    end
-
+, nil, 'id', 100
-    #We then need to turn it back Off before continuing.
-    if ActiveRecord::ConnectionAdapters.const_defined? :SQLServerAdapter and ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters::SQLServerAdapter)
-      Company.connection.execute "SET IDENTITY_INSERT companies OFF"

activerecord/test/fixtures/db_definitions/postgresql.sql

@@ -6 +6 @@
-);
-SELECT setval('accounts_id_seq', 100);
-
+CREATE SEQUENCE companies_nonstd_seq START 101;
+
-CREATE TABLE companies (
-serial
+integer DEFAULT nextval('companies_nonstd_seq')
-    "type" character varying(50),
-    "ruby_type" character varying(50),
-    firm_id integer,
@@ -16 +18 @@
-    rating integer default 1,
-    PRIMARY KEY (id)
-);
-SELECT setval('companies_id_seq', 100);
-
-CREATE TABLE developers_projects (
-    developer_id integer NOT NULL,

activerecord/test/pk_test.rb

@@ -32 +32 @@
-    subscriber.id = "jdoe"
-    assert_equal("jdoe", subscriber.id)
-    subscriber.name = "John Doe"
-
+!
-
-    subscriberReloaded = Subscriber.find("jdoe")
-    assert_equal("John Doe", subscriberReloaded.name)

activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

@@ -104 +104 @@
-      def insert(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil) #:nodoc:
-        execute(sql, name)
-        table = sql.split(" ", 4)[2]
-pk
+sequence_name
-      end
-
-      def query(sql, name = nil) #:nodoc:
@@ -200 +200 @@
-      def schema_search_path #:nodoc:
-        @schema_search_path ||= query('SHOW search_path')[0][0]
-      end
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      def add_column(table_name, column_name, type, options = {})
-        native_type = native_database_types[type]
-        sql_commands = ["ALTER TABLE #{table_name} ADD #{column_name} #{type_to_sql(type, options[:limit])}"]
@@ -240 +278 @@
-      private
-        BYTEA_COLUMN_TYPE_OID = 17
-
-
-
+
-          @connection.exec("SELECT currval('#{sequence_name}')")[0][0].to_i
-        end
-

activerecord/lib/active_record/connection_adapters/oci_adapter.rb

@@ -263 +263 @@
-        def adapter_name()
-          'OCI'
-        end
-
+
+
+
+
+
-        private
-          # Oracle column names by default are case-insensitive, but treated as upcase;
-          # for neatness, we'll downcase within Rails. EXCEPT that folks CAN quote

activerecord/lib/active_record/fixtures.rb

@@ -220 +220 @@
-  self.all_loaded_fixtures = {}
-
-  def self.create_fixtures(fixtures_directory, *table_names)
+    class_mapping = table_names.last.is_a?(Hash) ? table_names.pop : {}
-    connection = block_given? ? yield : ActiveRecord::Base.connection
-    old_logger_level = ActiveRecord::Base.logger.level
-
@@ -237 +238 @@
-        fixtures.reverse.each { |fixture| fixture.delete_existing_fixtures }
-        fixtures.each { |fixture| fixture.insert_fixtures }
-      end
-      
-      reset_sequences(connection, table_names) if connection.is_a?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
-
+      if connection.respond_to?(:reset_sequences)
+        connection.reset_sequences(*(table_names.flatten.collect { |t| t.respond_to?(:table_name) ? t.table_name : t  }))
+      end
+
-      return fixtures.size > 1 ? fixtures : fixtures.first
-    ensure
-      ActiveRecord::Base.logger.level = old_logger_level
-    end
-  end
-
-  # Start PostgreSQL fixtures at id 1.  Skip tables without models
-  # and models with nonstandard primary keys.
-  def self.reset_sequences(connection, table_names)
-    table_names.flatten.each do |table|
-      if table_class = table.to_s.classify.constantize rescue nil
-        pk = table_class.columns_hash[table_class.primary_key]
-        if pk and pk.type == :integer
-          connection.execute(
-            "SELECT setval('#{table}_#{pk.name}_seq', (SELECT COALESCE(0, MAX(#{pk.name}))+1 FROM #{table}), false)", 
-            'Setting Sequence'
-          )
-        end
-      end
-    end
-  end
-
-  attr_reader :table_name
-
-  def initialize(connection, table_name, fixture_path, file_filter = DEFAULT_FILTER_RE)
@@ -404 +391 @@
-      class_inheritable_accessor :use_transactional_fixtures
-      class_inheritable_accessor :use_instantiated_fixtures   # true, false, or :no_instances
-      class_inheritable_accessor :pre_loaded_fixtures
+      class_inheritable_accessor :fixture_class_mapping
-
-      self.fixture_table_names = []
+      self.fixture_class_mapping = {}
-      self.use_transactional_fixtures = false
-      self.use_instantiated_fixtures = true
-      self.pre_loaded_fixtures = false
@@ -414 +403 @@
-
-      def self.fixtures(*table_names)
-        table_names = table_names.flatten
-
+
+
+
+
+
-        require_fixture_classes(table_names)
-(table_names)
+
-      end
-
-      def self.require_fixture_classes(table_names=nil)
-        (table_names || fixture_table_names).each do |table_name| 
+          next if table_name.respond_to?(:table_name) # skip if it's an AR model instead of a table name string
-          begin
-            require Inflector.singularize(table_name.to_s)
-          rescue LoadError
@@ -519 +513 @@
-      private
-        def load_fixtures
-          @loaded_fixtures = {}
-
+, fixture_class_mapping
-          unless fixtures.nil?
-            if fixtures.instance_of?(Fixtures)
-              @loaded_fixtures[fixtures.table_name] = fixtures

activerecord/lib/active_record/base.rb

@@ -566 +566 @@
-        "type"
-      end
-
-
+ and PostgreSQL
-      def sequence_name
-
+
+
+
-      end
-
-      # Sets the table name to use to the given value, or (if the value
@@ -616 +618 @@
-
-      # Sets the name of the sequence to use when generating ids to the given
-      # value, or (if the value is nil or false) to the value returned by the
-, which requires
-
+ and PostgreSQL, 
+which require 
-      #
-      # Setting the sequence name when using other dbs will have no effect.
-
-
+
+
+
-      #
-      # Example:
-      #