From: jfd <jfd@underverse>
Date: Mon, 30 Jul 2012 18:52:11 +0000 (+0200)
Subject: use CURRENT_TIMESTAMP in default column definitions (sqlite, mysql, postgres and... 
X-Git-Tag: v4.5.0beta1~106
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3aff7a298c23837b070507a0644b89a8a5c026be;p=nextcloud-server.git

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)
---

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>