move to sqlite merged

3 files changed, 30 insertions, 63 deletions

diff --git a/docs/INSTALL b/docs/INSTALL
index 6a31bc57f01..f8509f363a2 100755
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -1,34 +1,18 @@
 == PREREQUISITS ==
 php5
-currently mysql, should optionally be sqlite
+sqlite
 
 == SETUP ==
-Set up your paths in:
-config/config.php
-
-Your data will be in:
-$CONFIG_DATADIRECTORY = '/www/testy';
-Apache needs to have write permissions to this directory.
-
-And the ownCloud path is:
-$CONFIG_DOCUMENTROOT = '/www/owncloud/htdocs';
-The ownCloud checkout should be in the root of "htdocs".
-
-Both are absolute paths, so if your server is in /var/www, you need to add the /var
+Place owncloud in a subdirectory of your web server. Go to that directory with
+a web browser and the first run wizard should take it from there.
 
 
 == Database ==
-The database should by default be sqlite. No configuration there.
-
-But until then you need some setup with mysql:
-
-Create a table "owncloud":
-mysqladmin create owncloud -u root -p
+The database is sqlite. If you are having trouble make sure that the line
 
-Dump the default database schema:
-mysql owncloud -u root -p < owncloud.sql
+extension=sqlite.so
 
-TODO: you also need to create a mysql user that is configured in config/config.php
+appears in your php.ini
 
 
 Please help improving this documentation!
diff --git a/docs/TODO b/docs/TODO
index b04bd735c89..aba8f8345a9 100755
--- a/docs/TODO
+++ b/docs/TODO
@@ -1,8 +1,3 @@
-
-- remove dependency on mysql. replace with sqlite to make it easier to install
-
-- simplify installation
-
 - write installation documentation
 
 - better ajax web gui
diff --git a/docs/owncloud.sql b/docs/owncloud.sql
index f7b6b010e0e..5ef008b62f4 100755
--- a/docs/owncloud.sql
+++ b/docs/owncloud.sql
@@ -1,39 +1,27 @@
+CREATE TABLE 'locks' (
+  'token' VARCHAR(255) NOT NULL DEFAULT '',
+  'path' varchar(200) NOT NULL DEFAULT '',
+  'expires' int(11) NOT NULL DEFAULT '0',
+  'owner' varchar(200) DEFAULT NULL,
+  'recursive' int(11) DEFAULT '0',
+  'writelock' int(11) DEFAULT '0',
+  'exclusivelock' int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY ('token'),
+  UNIQUE ('token')
+ );
 
-SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
-
-CREATE TABLE IF NOT EXISTS `locks` (
-  `token` varchar(255) NOT NULL DEFAULT '',
-  `path` varchar(200) NOT NULL DEFAULT '',
-  `expires` int(11) NOT NULL DEFAULT '0',
-  `owner` varchar(200) DEFAULT NULL,
-  `recursive` int(11) DEFAULT '0',
-  `writelock` int(11) DEFAULT '0',
-  `exclusivelock` int(11) NOT NULL DEFAULT '0',
-  PRIMARY KEY (`token`),
-  UNIQUE KEY `token` (`token`),
-  KEY `path` (`path`),
-  KEY `path_2` (`path`),
-  KEY `path_3` (`path`,`token`),
-  KEY `expires` (`expires`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
-CREATE TABLE IF NOT EXISTS `log` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `timestamp` int(11) NOT NULL,
-  `user` varchar(250) NOT NULL,
-  `type` int(11) NOT NULL,
-  `message` varchar(250) NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=MyISAM  DEFAULT CHARSET=latin1 AUTO_INCREMENT=15 ;
-
-
-CREATE TABLE IF NOT EXISTS `properties` (
-  `path` varchar(255) NOT NULL DEFAULT '',
-  `name` varchar(120) NOT NULL DEFAULT '',
-  `ns` varchar(120) NOT NULL DEFAULT 'DAV:',
-  `value` text,
-  PRIMARY KEY (`path`,`name`,`ns`),
-  KEY `path` (`path`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+CREATE TABLE 'log' (
+  'timestamp' int(11) NOT NULL,
+  'user' varchar(250) NOT NULL,
+  'type' int(11) NOT NULL,
+  'message' varchar(250) NOT NULL
+);
 
 
+CREATE TABLE  'properties' (
+  'path' varchar(255) NOT NULL DEFAULT '',
+  'name' varchar(120) NOT NULL DEFAULT '',
+  'ns' varchar(120) NOT NULL DEFAULT 'DAV:',
+  'value' text,
+  PRIMARY KEY ('path','name','ns')
+);