[Rt-commit] rt branch, 4.0/upgrade-syntax-fixes, updated. rt-4.0.0-238-g90672de

[? sunnavy]

The branch, 4.0/upgrade-syntax-fixes has been updated
       via  90672de5de9f694c083218dbb8b574a671df27c4 (commit)
       via  94c82bf22abc377a2853f81a3498ff875d8aebfc (commit)
      from  1df61812c6ca35c1c52ceb8e033edf7cc2e94c97 (commit)

Summary of changes:
 etc/upgrade/3.9.5/schema.SQLite |    2 +-
 etc/upgrade/3.9.8/content       |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 94c82bf22abc377a2853f81a3498ff875d8aebfc
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Wed May 18 16:06:49 2011 +0800

    paren directly after 'alter table ... add column' is disallowed

diff --git a/etc/upgrade/3.9.5/schema.SQLite b/etc/upgrade/3.9.5/schema.SQLite
index 5804d44..c23f89b 100644
--- a/etc/upgrade/3.9.5/schema.SQLite
+++ b/etc/upgrade/3.9.5/schema.SQLite
@@ -1,4 +1,4 @@
-ALTER TABLE CustomFieldValues ADD Column (Category varchar(255));
+ALTER TABLE CustomFieldValues ADD Column Category varchar(255);
 UPDATE CustomFieldValues SET Category = (SELECT Content FROM Attributes WHERE
 Name = 'Category' AND  ObjectType = 'RT::CustomFieldValue'
 AND CustomFieldValues.id = Attributes.ObjectId);

commit 90672de5de9f694c083218dbb8b574a671df27c4
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Wed May 18 16:17:21 2011 +0800

    return if no supported rtfm is found
    
    also people may don't have rtfm installed at all.

diff --git a/etc/upgrade/3.9.8/content b/etc/upgrade/3.9.8/content
index 6726a8e..1c27b5c 100644
--- a/etc/upgrade/3.9.8/content
+++ b/etc/upgrade/3.9.8/content
@@ -9,7 +9,8 @@
     }
 
     unless ( $found_fm_tables->{fm_topics} && $found_fm_tables->{fm_objecttopics} ) {
-        $RT::Logger->error("You appear to be upgrading from RTFM 2.0 - We don't support upgrading this old of an RTFM yet");
+        $RT::Logger->error("You appear to be upgrading from RTFM 2.0 - We don't support upgrading this old of an RTFM yet. Ignore this if you don't have RTFM installed at all.");
+        return;
     }
 
     $RT::Logger->error("We found RTFM tables in your database.  Checking for content.");

-----------------------------------------------------------------------