diff options
| author | Frank Karlitschek <frank@owncloud.org> | 2013-12-14 23:31:20 +0400 |
|---|---|---|
| committer | Frank Karlitschek <frank@owncloud.org> | 2013-12-14 23:31:20 +0400 |
| commit | e8a696cff9abbd535125f49f3154c944f00b9dd8 (patch) | |
| tree | a8551be8bf7bc249f5fbbe16e09834e64b268467 | |
| parent | 0b665700b5259fb80a16e1fde607394e4840bec7 (diff) | |
| parent | 811ef19adac4fb717907064515de993db7975228 (diff) | |
Merge pull request #6389 from owncloud/ignore_comments_on_columns
ignore comments on schema as a quickfix for oc6
| -rw-r--r-- | apps/files_encryption/appinfo/database.xml | 5 | ||||
| -rw-r--r-- | lib/private/db/mdb2schemareader.php | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/apps/files_encryption/appinfo/database.xml b/apps/files_encryption/appinfo/database.xml index 4587930da0a..099534e3242 100644 --- a/apps/files_encryption/appinfo/database.xml +++ b/apps/files_encryption/appinfo/database.xml @@ -18,22 +18,19 @@ <type>text</type> <notnull>true</notnull> <length>64</length> - <comments>What client-side / server-side configuration is used</comments> </field> <field> <name>recovery_enabled</name> <type>integer</type> <notnull>true</notnull> <default>0</default> - <comments>Whether encryption key recovery is enabled</comments> </field> <field> <name>migration_status</name> <type>integer</type> <notnull>true</notnull> <default>0</default> - <comments>Whether encryption migration has been performed</comments> </field> </declaration> </table> -</database>
\ No newline at end of file +</database> diff --git a/lib/private/db/mdb2schemareader.php b/lib/private/db/mdb2schemareader.php index 511bd1c90bd..fef24adad98 100644 --- a/lib/private/db/mdb2schemareader.php +++ b/lib/private/db/mdb2schemareader.php @@ -176,8 +176,9 @@ class MDB2SchemaReader { $options['default'] = $default; break; case 'comments': - $comment = (string)$child; - $options['comment'] = $comment; + //FIXME for now we ignore comments https://github.com/doctrine/dbal/pull/407 + //$comment = (string)$child; + //$options['comment'] = $comment; break; case 'primary': $primary = $this->asBool($child); |