When dealing with SQLite3, use the table_info pragma helper, so that the bindings can do some translation for when sqlite3 breaks incompatibly between point releases. Also, make current_adapter? use is_a? instead of instance_of? to account correctly for adapter subclassing.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6091 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

3 files changed, 12 insertions, 2 deletions

diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index d1504d8486..741a546993 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* When dealing with SQLite3, use the table_info pragma helper, so that the bindings can do some translation for when sqlite3 breaks incompatibly between point releases. [Jamis Buck]
+
 * Oracle: fix lob and text default handling.  #7344 [gfriedrich, Michael Schoen]
 
 * SQLServer: don't choke on strings containing 'null'.  #7083 [Jakob S]
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
index 199f53b8a7..da4efd394f 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -22,7 +22,7 @@ module ActiveRecord
 
         db.busy_timeout(config[:timeout]) unless config[:timeout].nil?
 
-        ConnectionAdapters::SQLiteAdapter.new(db, logger)
+        ConnectionAdapters::SQLite3Adapter.new(db, logger)
       end
 
       # Establishes a connection to the database that's used by all Active Record objects
@@ -381,6 +381,14 @@ module ActiveRecord
         end
     end
 
+    class SQLite3Adapter < SQLiteAdapter # :nodoc:
+      def table_structure(table_name)
+        returning structure = @connection.table_info(table_name) do
+          raise ActiveRecord::StatementInvalid if structure.empty?
+        end
+      end
+    end
+
     class SQLite2Adapter < SQLiteAdapter # :nodoc:
       def supports_count_distinct? #:nodoc:
         false
diff --git a/activerecord/test/abstract_unit.rb b/activerecord/test/abstract_unit.rb
index 5108988a88..3fd94afc00 100755
--- a/activerecord/test/abstract_unit.rb
+++ b/activerecord/test/abstract_unit.rb
@@ -56,7 +56,7 @@ end
 def current_adapter?(*types)
   types.any? do |type|
     ActiveRecord::ConnectionAdapters.const_defined?(type) &&
-      ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters.const_get(type))
+      ActiveRecord::Base.connection.is_a?(ActiveRecord::ConnectionAdapters.const_get(type))
   end
 end