Ticket #11604: add_pk_and_sequence_for_to_sqlite.patch

a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb

@@ -199 +199 @@
-          index
-        end
-      end
+      
+      def pk_and_sequence_for(table) #:nodoc:
+        return [primary_key(table), nil]
+      end
-
-      def primary_key(table_name) #:nodoc:
-        column = table_structure(table_name).find {|field| field['pk'].to_i == 1}

a/activerecord/test/cases/schema_dumper_test.rb

@@ -103 +103 @@
-      end
-    end
-
+    if current_adapter?(:SQLiteAdapter) || current_adapter?(:SQLite3Adapter)
+      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
-        output = standard_dump