<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -402,6 +402,10 @@ module ActiveRecord
       end
 
       def add_column(table_name, column_name, type, options = {}) #:nodoc:
+        if @connection.respond_to?(:transaction_active?) &amp;&amp; @connection.transaction_active?
+          raise StatementInvalid, 'Cannot add columns to a SQLite database while inside a transaction'
+        end
+
         alter_table(table_name) do |definition|
           definition.column(column_name, type, options)
         end</diff>
      <filename>activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>558ab327b733717f4a8de3ed62b8dcd62e9ff9c3</id>
    </parent>
  </parents>
  <author>
    <name>Mike Gunderloy</name>
    <login>ffmike</login>
    <email>MikeG1@larkfarm.com</email>
  </author>
  <url>http://github.com/rails/rails/commit/220dff4c3b58b7becb587ee6f2434b2ca720f7c3</url>
  <id>220dff4c3b58b7becb587ee6f2434b2ca720f7c3</id>
  <committed-date>2008-12-29T19:07:30-08:00</committed-date>
  <authored-date>2008-12-29T18:46:20-08:00</authored-date>
  <message>Add transaction check to SQLite2 adapter to fix test_sqlite_add_column_in_transaction_raises_statement_invalid [#1669 state:resolved]

Signed-off-by: Pratik Naik &lt;pratiknaik@gmail.com&gt;</message>
  <tree>ec9ad586b43e872d1abc6016f36958f1384c64b9</tree>
  <committer>
    <name>Pratik Naik</name>
    <login>lifo</login>
    <email>pratiknaik@gmail.com</email>
  </committer>
</commit>
