mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8253 from owncloud/pk-on-all-tables-master 

Primary keys on all tables master
This commit is contained in:
Thomas Müller 2014-06-06 16:40:11 +02:00
parent c053f27381 fe8bae31dc
commit 647dcce514
8 changed files with 109 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/files_trashbin/appinfo/database.xml
View File

@ -13,6 +13,15 @@
<declaration> <declaration>
<field>
<name>auto_id</name>
<type>integer</type>
<default>0</default>
<notnull>true</notnull>
<autoincrement>1</autoincrement>
<length>4</length>
</field>
<field> <field>
<name>id</name> <name>id</name>
<type>text</type> <type>text</type>

2
apps/files_trashbin/appinfo/version
View File

@ -1 +1 @@
0.6 0.6.1

5
apps/user_ldap/appinfo/database.xml
View File

@ -46,6 +46,7 @@
<index> <index>
<name>owncloud_name_users</name> <name>owncloud_name_users</name>
<primary>true</primary>
<unique>true</unique> <unique>true</unique>
<field> <field>
<name>owncloud_name</name> <name>owncloud_name</name>
@ -90,6 +91,7 @@
<index> <index>
<name>ldap_dn_groups</name> <name>ldap_dn_groups</name>
<unique>true</unique> <unique>true</unique>
<primary>true</primary>
<field> <field>
<name>ldap_dn</name> <name>ldap_dn</name>
</field> </field>
@ -132,6 +134,7 @@
<index> <index>
<name>ldap_group_members_index</name> <name>ldap_group_members_index</name>
<unique>true</unique> <unique>true</unique>
<primary>true</primary>
<field> <field>
<name>owncloudname</name> <name>owncloudname</name>
</field> </field>
@ -141,4 +144,4 @@
</table> </table>
</database> </database>

2
lib/private/db/mdb2schemamanager.php
View File

@ -109,7 +109,7 @@ class MDB2SchemaManager {
*/ */
public function simulateUpdateDbFromStructure($file) { public function simulateUpdateDbFromStructure($file) {
$toSchema = $this->readSchemaFromFile($file); $toSchema = $this->readSchemaFromFile($file);
$migrator = $this->getMigrator()->checkMigrate($toSchema); $this->getMigrator()->checkMigrate($toSchema);
return true; return true;
} }

1
lib/private/updater.php
View File

@ -150,6 +150,7 @@ class Updater extends BasicEmitter {
// This is added to prevent host header poisoning // This is added to prevent host header poisoning
\OC_Config::setValue('trusted_domains', \OC_Config::getValue('trusted_domains', array(\OC_Request::serverHost()))); \OC_Config::setValue('trusted_domains', \OC_Config::getValue('trusted_domains', array(\OC_Request::serverHost())));
} }
/* /*
* STOP CONFIG CHANGES FOR OLDER VERSIONS * STOP CONFIG CHANGES FOR OLDER VERSIONS
*/ */

37
tests/lib/db/mdb2schemamanager.php Normal file
View File

@ -0,0 +1,37 @@
<?php
/**
* Copyright (c) 2014 Thomas Müller <deepdiver@owncloud.com>
* This file is licensed under the Affero General Public License version 3 or
* later.
* See the COPYING-README file.
*/
namespace Test\DB;
class MDB2SchemaManager extends \PHPUnit_Framework_TestCase {
public function tearDown() {
\OC_DB::dropTable('table');
}
public function testAutoIncrement() {
if (\OC::$server->getConfig()->getSystemValue('dbtype', 'sqlite') === 'oci') {
$this->markTestSkipped('Adding auto increment columns in Oracle is not supported.');
}
$connection = \OC_DB::getConnection();
$manager = new \OC\DB\MDB2SchemaManager($connection);
$manager->createDbFromStructure(__DIR__ . '/ts-autoincrement-before.xml');
$connection->executeUpdate('insert into `*PREFIX*table` values (?)', array('abc'));
$connection->executeUpdate('insert into `*PREFIX*table` values (?)', array('abc'));
$connection->executeUpdate('insert into `*PREFIX*table` values (?)', array('123'));
$connection->executeUpdate('insert into `*PREFIX*table` values (?)', array('123'));
$manager->updateDbFromStructure(__DIR__ . '/ts-autoincrement-after.xml');
$this->assertTrue(true);
}
}

32
tests/lib/db/ts-autoincrement-after.xml Normal file
View File

@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8" ?>
<database>
<name>*dbname*</name>
<create>true</create>
<overwrite>false</overwrite>
<charset>utf8</charset>
<table>
<name>*dbprefix*table</name>
<declaration>
<field>
<name>auto_id</name>
<type>integer</type>
<default>0</default>
<notnull>true</notnull>
<autoincrement>1</autoincrement>
<length>4</length>
</field>
<field>
<name>textfield</name>
<type>text</type>
<default>foo</default>
<notnull>true</notnull>
<length>32</length>
</field>
</declaration>
</table>
</database>

24
tests/lib/db/ts-autoincrement-before.xml Normal file
View File

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8" ?>
<database>
<name>*dbname*</name>
<create>true</create>
<overwrite>false</overwrite>
<charset>utf8</charset>
<table>
<name>*dbprefix*table</name>
<declaration>
<field>
<name>textfield</name>
<type>text</type>
<default>foo</default>
<notnull>true</notnull>
<length>32</length>
</field>
</declaration>
</table>
</database>