diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-06-10 08:38:54 -0700 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-06-10 08:38:54 -0700 |
| commit | b66559247a3d4f40a8275e4c199d06763a7957d2 (patch) | |
| tree | ccb6d376bd8118792da7e9bcbfca10800c3640c9 | |
| parent | 1da112750e1c32ab50980434fea56c5d32723b6f (diff) | |
| parent | fc27052887edc0475eafed87a5673ef5ab74536c (diff) | |
| download | nextcloud-server-b66559247a3d4f40a8275e4c199d06763a7957d2.tar.gz nextcloud-server-b66559247a3d4f40a8275e4c199d06763a7957d2.zip | |
Merge pull request #3653 from owncloud/shorten_identifiers_in_tests
shorten table identifiers in tests
| -rw-r--r-- | tests/data/db_structure.xml | 4 | ||||
| -rw-r--r-- | tests/data/db_structure2.xml | 2 | ||||
| -rw-r--r-- | tests/lib/db.php | 4 | ||||
| -rw-r--r-- | tests/lib/dbschema.php | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/tests/data/db_structure.xml b/tests/data/db_structure.xml index af2e5ce3439..8f6dc5e2ecd 100644 --- a/tests/data/db_structure.xml +++ b/tests/data/db_structure.xml @@ -9,7 +9,7 @@ <table> - <name>*dbprefix*contacts_addressbooks</name> + <name>*dbprefix*cntcts_addrsbks</name> <declaration> @@ -77,7 +77,7 @@ <table> - <name>*dbprefix*contacts_cards</name> + <name>*dbprefix*cntcts_cards</name> <declaration> diff --git a/tests/data/db_structure2.xml b/tests/data/db_structure2.xml index c1bbb550483..fc6fe0bba7d 100644 --- a/tests/data/db_structure2.xml +++ b/tests/data/db_structure2.xml @@ -9,7 +9,7 @@ <table> - <name>*dbprefix*contacts_addressbooks</name> + <name>*dbprefix*cntcts_addrsbks</name> <declaration> diff --git a/tests/lib/db.php b/tests/lib/db.php index eff01bd9065..7b2a5e309f0 100644 --- a/tests/lib/db.php +++ b/tests/lib/db.php @@ -22,8 +22,8 @@ class Test_DB extends PHPUnit_Framework_TestCase { OC_DB::createDbFromStructure(self::$schema_file); $this->test_prefix = $r; - $this->table1 = $this->test_prefix.'contacts_addressbooks'; - $this->table2 = $this->test_prefix.'contacts_cards'; + $this->table1 = $this->test_prefix.'cntcts_addrsbks'; + $this->table2 = $this->test_prefix.'cntcts_cards'; $this->table3 = $this->test_prefix.'vcategory'; } diff --git a/tests/lib/dbschema.php b/tests/lib/dbschema.php index e20a04ef7fd..dbc1283964f 100644 --- a/tests/lib/dbschema.php +++ b/tests/lib/dbschema.php @@ -26,8 +26,8 @@ class Test_DBSchema extends PHPUnit_Framework_TestCase { file_put_contents( self::$schema_file2, $content ); $this->test_prefix = $r; - $this->table1 = $this->test_prefix.'contacts_addressbooks'; - $this->table2 = $this->test_prefix.'contacts_cards'; + $this->table1 = $this->test_prefix.'cntcts_addrsbks'; + $this->table2 = $this->test_prefix.'cntcts_cards'; } public function tearDown() { |