Merge branch 'dev' of https://github.com/inthepoche/poche into dev

diff --git a/install/mysql.sql b/install/mysql.sql
index d16381d83b3df33fcff5ddfd6cd8cbd869831472..de5640e4a6e13b63b8c61dd4e289ee7750177399 100644 (file)
--- a/install/mysql.sql
+++ b/install/mysql.sql
@@ -9,8 +9,8 @@ CREATE TABLE IF NOT EXISTS `entries` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `title` varchar(255) NOT NULL,
   `url` varchar(255) NOT NULL,
-  `is_read` tinyint(1) NOT NULL,
-  `is_fav` tinyint(1) NOT NULL,
+  `is_read` tinyint(1) NOT NULL DEFAULT 0,
+  `is_fav` tinyint(1) NOT NULL DEFAULT 0,
   `content` blob NOT NULL,
   `user_id` int(11) NOT NULL,
   PRIMARY KEY (`id`)
@@ -20,7 +20,7 @@ CREATE TABLE IF NOT EXISTS `users` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `username` varchar(255) NOT NULL,
   `password` varchar(255) NOT NULL,
-  `name` int(255) NOT NULL,
+  `name` varchar(255) NOT NULL,
   `email` varchar(255) NOT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8;