0
@@ -97,8 +97,8 @@ module ActiveRecord
0
 
0
         yield table_definition
0
 
0
-        if options[:force]
0
-          drop_table(table_name, options) rescue nil
0
+        if options[:force] && table_exists?(table_name)
0
+          drop_table(table_name, options)
0
         end
0
 
0
         create_sql = "CREATE#{' TEMPORARY' if options[:temporary]} TABLE "

0
@@ -209,6 +209,24 @@ if ActiveRecord::Base.connection.supports_migrations?
0
       ActiveRecord::Base.primary_key_prefix_type = nil
0
     end
0
 
0
+    uses_mocha('test_create_table_with_force_true_does_not_drop_nonexisting_table') do
0
+      def test_create_table_with_force_true_does_not_drop_nonexisting_table
0
+        if Person.connection.table_exists?(:testings2)
0
+          Person.connection.drop_table :testings2
0
+        end
0
+
0
+        # using a copy as we need the drop_table method to
0
+        # continue to work for the ensure block of the test
0
+        temp_conn = Person.connection.dup
0
+        temp_conn.expects(:drop_table).never
0
+        temp_conn.create_table :testings2, :force => true do |t|
0
+          t.column :foo, :string
0
+        end
0
+      ensure
0
+        Person.connection.drop_table :testings2 rescue nil
0
+      end
0
+    end
0
+
0
 
0
     # SQL Server, Sybase, and SQLite3 will not allow you to add a NOT NULL
0
     # column to a table without a default value.