From b00c2f37b7f00355599a9e68aa8e7c39e1eb01d2 Mon Sep 17 00:00:00 2001
From: Evert Pot <me@evertpot.com>
Date: Thu, 17 Mar 2016 17:13:29 -0400
Subject: [PATCH] Fixed upgrades from pre-0.3.x tables.

Should fix #506.
---
 CHANGELOG.md                                                  | 2 ++
 .../BaikalAdmin/Controller/Install/VersionUpgrade.php         | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3330c01e..24b803f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@ ChangeLog
 0.4.1 (2016-??-??)
 ------------------
 
+* #506: Fix Sqlite upgrades from people that are upgrading from 0.2.7 or
+  earlier.
 
 
 0.4.0 (2016-03-15)
diff --git a/Core/Frameworks/BaikalAdmin/Controller/Install/VersionUpgrade.php b/Core/Frameworks/BaikalAdmin/Controller/Install/VersionUpgrade.php
index 40253d55..e3ae6d52 100644
--- a/Core/Frameworks/BaikalAdmin/Controller/Install/VersionUpgrade.php
+++ b/Core/Frameworks/BaikalAdmin/Controller/Install/VersionUpgrade.php
@@ -419,8 +419,8 @@ protected function upgrade($sVersionFrom, $sVersionTo) {
     transparent bool
 );');
 
-                $pdo->exec('INSERT INTO calendars SELECT * FROM calendars' . $tmpTable);
-                $pdo->exec('INSERT INTO addressbooks SELECT * FROM addressbooks' . $tmpTable);
+                $pdo->exec('INSERT INTO calendars SELECT id, principaluri, displayname, uri, synctoken, description, calendarorder, calendarcolor, timezone, components, transparent FROM calendars' . $tmpTable);
+                $pdo->exec('INSERT INTO addressbooks SELECT id, principaluri, displayname, uri, description, synctoken FROM addressbooks' . $tmpTable);
 
                 $this->aSuccess[] = 'Updated calendars and addressbooks tables';