From bc3c404eed426de50b2cc3493744fa1de172edb5 Mon Sep 17 00:00:00 2001
From: Chris Dent <chris.dent@gmail.com>
Date: Mon, 26 Mar 2012 21:02:24 +0100
Subject: [PATCH] Update deploy.sh to reflect new data handling.

* The database is now called tiddlyspace2
* For now we must use DELETE IGNORE until
  https://github.com/cdent/tiddlywebplugins.sqlalchemy/issues/2
  is fixed.
---
 deploy.sh | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/deploy.sh b/deploy.sh
index 6cac9d7b4..effddf317 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -26,17 +26,12 @@ if [ -n "$1" ]; then
 fi
 
 host="${log_name}${host}"
-sql="DELETE FROM revision WHERE bag_name='system' OR bag_name='tiddlyspace' \
-    OR bag_name='system-plugins_public' \
-    OR bag_name='system-info_public' \
-    OR bag_name='system-images_public' \
-    OR bag_name='system-theme_public'; \
-    DELETE FROM tiddler WHERE bag_name='system' OR bag_name='tiddlyspace' \
-    OR bag_name='system-plugins_public' \
-    OR bag_name='system-info_public' \
-    OR bag_name='system-images_public' \
-    OR bag_name='system-theme_public';"
+sql="DELETE IGNORE FROM tiddler WHERE bag='system' OR bag='tiddlyspace' \
+    OR bag='system-plugins_public' \
+    OR bag='system-info_public' \
+    OR bag='system-images_public' \
+    OR bag='system-theme_public';"
 ssh $host "sudo pip install --upgrade $pip_options $package_name && " \
-    "mysql -u tiddlyweb tiddlyspace -e \"${sql}\" && " \
+    "mysql -u tiddlyweb tiddlyspace2 -e \"${sql}\" && " \
     "cd $instance_dir && sudo -u $remote_sudo_id twanager update && " \
     "sudo apache2ctl restart && echo INFO: deployment complete"