Ticket #11604: add_pk_and_sequence_for_method_to_sqlite_adapter.diff

test/cases/schema_dumper_test.rb

@@ -102 +102 @@
-        ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
-      end
-    end
+    
+    if current_adapter?(:SQLite3Adapter) || current_adapter?(:SQLiteAdapter)
+      def test_sqlite_schema_dump_should_honor_nonstandard_primary_keys
+        output = standard_dump
+        match = output.match(%r{create_table "movies"(.*)do})
+        assert_not_nil(match, "nonstandardpk table not found")
+        assert_match %r(:primary_key => "movieid"), match[1], "non-standard primary key not preserved"
+      end
+    end
-
-    if current_adapter?(:MysqlAdapter)
-      def test_schema_dump_should_not_add_default_value_for_mysql_text_field

lib/active_record/connection_adapters/sqlite_adapter.rb

@@ -184 +184 @@
-          row[0]
-        end
-      end
+      
+      # Returns the name of the primary key column for the given table
+      # *NOTE* this will always return nil for the sequence name
+      def pk_and_sequence_for(table) #:nodoc:
+        return [primary_key(table), nil]
+      end
-
-      def columns(table_name, name = nil) #:nodoc:
-        table_structure(table_name).map do |field|