keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

We already have got a function to check if a table exists

Browse source
This commit is contained in:
Michael 2020-05-15 18:32:53 +00:00
parent 8b2c51baf2
commit ec3290da3b
3 changed files with 3 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Database/DBA.php
View file

@ -741,17 +741,6 @@ class DBA
return DI::dba()->processlist(); return DI::dba()->processlist();
} }
/**
* Test if the given table exists
*
* @param string $table
* @return bool
*/
public static function tableExists(string $table)
{
return DI::dba()->tableExists($table);
}
/** /**
* Fetch a database variable * Fetch a database variable
* *

6
src/Database/DBStructure.php
View file

@ -988,7 +988,7 @@ class DBStructure
*/ */
public static function checkInitialValues() public static function checkInitialValues()
{ {
if (DBA::tableExists('contact') && !DBA::exists('contact', ['id' => 0])) { if (self::existsTable('contact') && !DBA::exists('contact', ['id' => 0])) {
DBA::insert('contact', ['nurl' => '']); DBA::insert('contact', ['nurl' => '']);
$lastid = DBA::lastInsertId(); $lastid = DBA::lastInsertId();
if ($lastid != 0) { if ($lastid != 0) {
@ -996,7 +996,7 @@ class DBStructure
} }
} }
if (DBA::tableExists('permissionset') && !DBA::exists('permissionset', ['id' => 0])) { if (self::existsTable('permissionset') && !DBA::exists('permissionset', ['id' => 0])) {
DBA::insert('permissionset', ['allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '']); DBA::insert('permissionset', ['allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '']);
$lastid = DBA::lastInsertId(); $lastid = DBA::lastInsertId();
if ($lastid != 0) { if ($lastid != 0) {
@ -1004,7 +1004,7 @@ class DBStructure
} }
} }
if (DBA::tableExists('tag') && !DBA::exists('tag', ['id' => 0])) { if (self::existsTable('tag') && !DBA::exists('tag', ['id' => 0])) {
DBA::insert('tag', ['name' => '']); DBA::insert('tag', ['name' => '']);
$lastid = DBA::lastInsertId(); $lastid = DBA::lastInsertId();
if ($lastid != 0) { if ($lastid != 0) {

12
src/Database/Database.php
View file

@ -1660,18 +1660,6 @@ class Database
return (["list" => $statelist, "amount" => $processes]); return (["list" => $statelist, "amount" => $processes]);
} }
/**
* Test if the given table exists
*
* @param string $table
* @return bool
*/
public function tableExists(string $table)
{
return $this->exists(['information_schema' => 'tables'],
['table_name' => $table, 'table_schema' => $this->databaseName()]);
}
/** /**
* Fetch a database variable * Fetch a database variable
* *