summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjfd <jfd@underverse>2012-07-30 20:52:11 +0200
committerJörn Friedrich Dreyer <jfd@butonic.de>2012-07-31 19:00:54 +0200
commit3aff7a298c23837b070507a0644b89a8a5c026be (patch)
treea5aaa7fe10276bfc38a7ce40bd699121791cdad2
parent727f4357fb900eed691167ca9559e3c0771f77af (diff)
downloadnextcloud-server-3aff7a298c23837b070507a0644b89a8a5c026be.tar.gz
nextcloud-server-3aff7a298c23837b070507a0644b89a8a5c026be.zip
use CURRENT_TIMESTAMP in default column definitions (sqlite, mysql, postgres and oracle DO understand it), change clob columns to text (clob will give sorting and uniqueness problems and in general is not what we want)
-rw-r--r--apps/calendar/appinfo/database.xml8
-rw-r--r--apps/contacts/appinfo/database.xml4
-rw-r--r--db_structure.xml12
3 files changed, 12 insertions, 12 deletions
diff --git a/apps/calendar/appinfo/database.xml b/apps/calendar/appinfo/database.xml
index 5a3ad32dc24..f60319ad432 100644
--- a/apps/calendar/appinfo/database.xml
+++ b/apps/calendar/appinfo/database.xml
@@ -43,14 +43,14 @@
<field>
<name>startdate</name>
<type>timestamp</type>
- <default>0000-00-00 00:00:00</default>
+ <default>CURRENT_TIMESTAMP</default>
<notnull>false</notnull>
</field>
<field>
<name>enddate</name>
<type>timestamp</type>
- <default>0000-00-00 00:00:00</default>
+ <default>CURRENT_TIMESTAMP</default>
<notnull>false</notnull>
</field>
@@ -72,7 +72,7 @@
<field>
<name>calendardata</name>
- <type>clob</type>
+ <type>text</type>
<notnull>false</notnull>
</field>
@@ -172,7 +172,7 @@
<field>
<name>timezone</name>
- <type>clob</type>
+ <type>text</type>
<notnull>false</notnull>
</field>
diff --git a/apps/contacts/appinfo/database.xml b/apps/contacts/appinfo/database.xml
index 7c8268d71f5..f83a04b8f47 100644
--- a/apps/contacts/appinfo/database.xml
+++ b/apps/contacts/appinfo/database.xml
@@ -49,7 +49,7 @@
<field>
<name>description</name>
- <type>clob</type>
+ <type>text</type>
<notnull>false</notnull>
</field>
@@ -101,7 +101,7 @@
<field>
<name>carddata</name>
- <type>clob</type>
+ <type>text</type>
<notnull>false</notnull>
</field>
diff --git a/db_structure.xml b/db_structure.xml
index 94567b4d539..992d1db4141 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -31,7 +31,7 @@
<field>
<name>configvalue</name>
- <type>clob</type>
+ <type>text</type>
<notnull>true</notnull>
</field>
@@ -335,7 +335,7 @@
<field>
<name>uri</name>
- <type>clob</type>
+ <type>text</type>
<notnull>false</notnull>
</field>
@@ -362,7 +362,7 @@
<field>
<name>moment</name>
<type>timestamp</type>
- <default>0000-00-00 00:00:00</default>
+ <default>CURRENT_TIMESTAMP</default>
<notnull>true</notnull>
</field>
@@ -392,7 +392,7 @@
<field>
<name>info</name>
- <type>clob</type>
+ <type>text</type>
<notnull>true</notnull>
</field>
@@ -432,7 +432,7 @@
<field>
<name>configvalue</name>
- <type>clob</type>
+ <type>text</type>
<notnull>true</notnull>
</field>
@@ -472,7 +472,7 @@
<field>
<name>propertyvalue</name>
- <type>clob</type>
+ <type>text</type>
<notnull>true</notnull>
</field>