From 3e3804e8aaa7f3aa1a9170a81569aae07c77da1c Mon Sep 17 00:00:00 2001
From: Jordi Bunster <jordi@bunster.org>
Date: Thu, 17 Jul 2008 13:14:09 -0400
Subject: [PATCH] Adds a comment in schema.rb for easier manual merging.

---
 activerecord/lib/active_record/schema_dumper.rb |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/activerecord/lib/active_record/schema_dumper.rb b/activerecord/lib/active_record/schema_dumper.rb
index 2181bdf..ed5b2f1 100644
--- a/activerecord/lib/active_record/schema_dumper.rb
+++ b/activerecord/lib/active_record/schema_dumper.rb
@@ -34,7 +34,14 @@ module ActiveRecord
       end
 
       def header(stream)
-        define_params = @version ? ":version => #{@version}" : ""
+        utc_comment = if @version && (@version.to_s.length == 14) # UTC
+
+          # Makes reading the UTC timestamp a lot easier:
+          timestamp = Time.utc(*@version.to_s.unpack('a4a2a2a2a2a2'))
+          "\n# " + timestamp.strftime("%B %d, %Y at %H:%M:%S")
+        else
+          "\n"
+        end
 
         stream.puts <<HEADER
 # This file is auto-generated from the current state of the database. Instead of editing this file, 
@@ -47,8 +54,8 @@ module ActiveRecord
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
 # It's strongly recommended to check this file into your version control system.
-
-ActiveRecord::Schema.define(#{define_params}) do
+#{utc_comment}
+ActiveRecord::Schema.define(#{":version => #{@version}" if @version}) do
 
 HEADER
       end
-- 
1.6.0.3