From df039e8c7460c030b2768549adf7454ee66d8b67 Mon Sep 17 00:00:00 2001
From: Miles Lott <milosch@alumni.egroupware.org>
Date: Tue, 3 Apr 2001 18:13:02 +0000
Subject: [PATCH] Add more drop tables, fix nexid def in mysql newtables

---
 setup/sql/mysql_droptables.inc.php | 5 ++++-
 setup/sql/mysql_newtables.inc.php  | 2 +-
 setup/sql/pgsql_droptables.inc.php | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/setup/sql/mysql_droptables.inc.php b/setup/sql/mysql_droptables.inc.php
index e0b8c7f44b..9e9ab04c04 100644
--- a/setup/sql/mysql_droptables.inc.php
+++ b/setup/sql/mysql_droptables.inc.php
@@ -25,6 +25,7 @@
   $phpgw_setup->db->query("DROP TABLE phpgw_addressbook");
   $phpgw_setup->db->query("DROP TABLE phpgw_addressbook_extra");
   $phpgw_setup->db->query("DROP TABLE todo");
+  $phpgw_setup->db->query("DROP TABLE phpgw_todo");
   $phpgw_setup->db->query("DROP TABLE calendar_entry");
   $phpgw_setup->db->query("DROP TABLE calendar_entry_repeats");
   $phpgw_setup->db->query("DROP TABLE calendar_entry_user");
@@ -34,6 +35,8 @@
   $phpgw_setup->db->query("DROP TABLE languages");
   $phpgw_setup->db->query("DROP TABLE customers");
   $phpgw_setup->db->query("DROP TABLE notes");
+  $phpgw_setup->db->query("DROP TABLE phpgw_notes");
+  $phpgw_setup->db->query("DROP TABLE phpgw_nextid");
 
 	/* Legacy tables */
 
@@ -42,4 +45,4 @@
   $phpgw_setup->db->query("DROP TABLE groups");
   $phpgw_setup->db->query("DROP TABLE accounts");
   $phpgw_setup->db->query("DROP TABLE preferences");
-?>
\ No newline at end of file
+?>
diff --git a/setup/sql/mysql_newtables.inc.php b/setup/sql/mysql_newtables.inc.php
index 5510c17515..8c81ab2e0d 100644
--- a/setup/sql/mysql_newtables.inc.php
+++ b/setup/sql/mysql_newtables.inc.php
@@ -342,7 +342,7 @@
   $phpgw_setup->db->query($sql); 
 
   $sql = "create table phpgw_nextid (
-           appname varchar(25),
+           appname varchar(25) NOT NULL,
            id      int(8),
 		   UNIQUE (appname)
           )";
diff --git a/setup/sql/pgsql_droptables.inc.php b/setup/sql/pgsql_droptables.inc.php
index bae1f9311a..918afabd8c 100644
--- a/setup/sql/pgsql_droptables.inc.php
+++ b/setup/sql/pgsql_droptables.inc.php
@@ -32,6 +32,7 @@
   $phpgw_setup->db->query("drop sequence calendar_entry_cal_id_seq");
   $phpgw_setup->db->query("drop sequence todo_todo_id_seq");
   $phpgw_setup->db->query("DROP TABLE todo");
+  $phpgw_setup->db->query("DROP TABLE phpgw_todo");
   $phpgw_setup->db->query("DROP TABLE calendar_entry");
   $phpgw_setup->db->query("DROP TABLE calendar_entry_user");
   $phpgw_setup->db->query("DROP TABLE calendar_entry_repeats");