From 48d555b904ea7711b4e5adbd8b540fdb0dbba687 Mon Sep 17 00:00:00 2001
From: Brian Hogan <brianhogan@napcs.com>
Date: Thu, 19 Mar 2009 21:24:18 -0500
Subject: [PATCH] Fixed #2272 - sqlite3 renaming tables now quotes table names, allowing renaming of tables which happen to be reserved words like 'references'

---
 .../connection_adapters/sqlite_adapter.rb          |    2 +-
 activerecord/test/cases/migration_test.rb          |   47 ++++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletions(-)

diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
index afd6472..d39af7a 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -234,7 +234,7 @@ module ActiveRecord
       end
 
       def rename_table(name, new_name)
-        execute "ALTER TABLE #{name} RENAME TO #{new_name}"
+        execute "ALTER TABLE '#{name}' RENAME TO '#{new_name}'"
       end
 
       # See: http://www.sqlite.org/lang_altertable.html
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 16861f2..83b7663 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -635,6 +635,53 @@ if ActiveRecord::Base.connection.supports_migrations?
       end
     end
 
+    if current_adapter?(:SQLiteAdapter)
+      def test_rename_table_for_sqlite_from_reserved_word_with_quoting
+        ActiveRecord::Base.connection.drop_table :references rescue nil
+        
+        begin
+          ActiveRecord::Base.connection.create_table :references do |t|
+            t.column :url, :string
+          end
+          ActiveRecord::Base.connection.rename_table :references, :octopi
+
+          # Using explicit id in insert for compatibility across all databases
+          con = ActiveRecord::Base.connection
+          assert_nothing_raised { con.execute "INSERT INTO octopi (#{con.quote_column_name('id')}, #{con.quote_column_name('url')}) VALUES (1, 'http://www.foreverflying.com/octopus-black7.jpg')" }
+          assert_equal 'http://www.foreverflying.com/octopus-black7.jpg', ActiveRecord::Base.connection.select_value("SELECT url FROM octopi WHERE id=1")
+
+
+        ensure
+          ActiveRecord::Base.connection.drop_table :references rescue nil
+          ActiveRecord::Base.connection.drop_table :octopi rescue nil
+        end
+      end
+
+
+      def test_rename_table_for_sqlite_to_reserved_word_with_quoting
+         ActiveRecord::Base.connection.drop_table :octopi rescue nil
+
+         begin
+           ActiveRecord::Base.connection.create_table :octopi do |t|
+             t.column :url, :string
+           end
+           ActiveRecord::Base.connection.rename_table :octopi, :references
+
+           # Using explicit id in insert for compatibility across all databases
+           con = ActiveRecord::Base.connection
+           assert_nothing_raised { con.execute "INSERT INTO 'references' (#{con.quote_column_name('id')}, #{con.quote_column_name('url')}) VALUES (1, 'http://www.foreverflying.com/octopus-black7.jpg')" }
+           assert_equal 'http://www.foreverflying.com/octopus-black7.jpg', ActiveRecord::Base.connection.select_value("SELECT url FROM 'references' WHERE id=1")
+
+         ensure
+           ActiveRecord::Base.connection.drop_table :references rescue nil
+           ActiveRecord::Base.connection.drop_table :octopi rescue nil
+         end
+       end      
+
+    
+    end
+
+
     def test_rename_table
       begin
         ActiveRecord::Base.connection.create_table :octopuses do |t|
-- 
1.5.4.5