Call the initial value check in the test

[friendica.git] / src / Database / DBStructure.php

diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index 8f599a67d72a3e15b7886531181ec285987e8e76..a02d6cf1b4e3f4452a406d84dbd20e859355e51c 100644 (file)
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -294,6 +294,10 @@ class DBStructure
                        DI::config()->set('system', 'maintenance_reason', DI::l10n()->t('%s: Database update', DateTimeFormat::utcNow() . ' ' . date('e')));
                }
 
+               // ensure that all initial values exist. This test has to be done prior and after the structure check.
+               // Prior is needed if the specific tables already exists - after is needed when they had been created.
+               self::checkInitialValues();
+
                $errors = '';
 
                Logger::log('updating structure', Logger::DEBUG);
@@ -640,6 +644,8 @@ class DBStructure
 
                View::create(false, $action);
 
+               self::checkInitialValues();
+
                if ($action && !$install) {
                        DI::config()->set('system', 'maintenance', 0);
                        DI::config()->set('system', 'maintenance_reason', '');
@@ -657,7 +663,7 @@ class DBStructure
        private static function tableStructure($table)
        {
                // This query doesn't seem to be executable as a prepared statement
-               $indexes = DBA::toArray(DBA::p(sprintf("SHOW INDEX FROM `%s`", $table)));
+               $indexes = DBA::toArray(DBA::p("SHOW INDEX FROM " . DBA::quoteIdentifier($table)));
 
                $fields = DBA::selectToArray(['INFORMATION_SCHEMA' => 'COLUMNS'],
                        ['COLUMN_NAME', 'COLUMN_TYPE', 'IS_NULLABLE', 'COLUMN_DEFAULT', 'EXTRA',
@@ -717,7 +723,7 @@ class DBStructure
                                $fielddata[$field['COLUMN_NAME']]['type'] = $field['COLUMN_TYPE'];
 
                                if ($field['IS_NULLABLE'] == 'NO') {
-                                       $fielddata[$field['COLUMN_NAME']]['not null'] = 1;
+                                       $fielddata[$field['COLUMN_NAME']]['not null'] = true;
                                }
 
                                if (isset($field['COLUMN_DEFAULT'])) {
@@ -729,7 +735,7 @@ class DBStructure
                                }
 
                                if ($field['COLUMN_KEY'] == 'PRI') {
-                                       $fielddata[$field['COLUMN_NAME']]['primary'] = 1;
+                                       $fielddata[$field['COLUMN_NAME']]['primary'] = true;
                                }
 
                                $fielddata[$field['COLUMN_NAME']]['Collation'] = $field['COLLATION_NAME'];
@@ -976,4 +982,34 @@ class DBStructure
                $stmtColumns = DBA::p("SHOW COLUMNS FROM `" . $table . "`");
                return DBA::toArray($stmtColumns);
        }
+
+       /**
+        * Check if initial database values do exist - or create them
+        */
+       public static function checkInitialValues()
+       {
+               if (DBA::tableExists('contact') && !DBA::exists('contact', ['id' => 0])) {
+                       DBA::insert('contact', ['nurl' => '']);
+                       $lastid = DBA::lastInsertId();
+                       if ($lastid != 0) {
+                               DBA::update('contact', ['id' => 0], ['id' => $lastid]);
+                       }               
+               }
+
+               if (DBA::tableExists('permissionset') && !DBA::exists('permissionset', ['id' => 0])) {
+                       DBA::insert('permissionset', ['allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '']);       
+                       $lastid = DBA::lastInsertId();
+                       if ($lastid != 0) {
+                               DBA::update('permissionset', ['id' => 0], ['id' => $lastid]);
+                       }
+               }
+       
+               if (DBA::tableExists('tag') && !DBA::exists('tag', ['id' => 0])) {
+                       DBA::insert('tag', ['name' => '']);
+                       $lastid = DBA::lastInsertId();
+                       if ($lastid != 0) {
+                               DBA::update('tag', ['id' => 0], ['id' => $lastid]);
+                       }
+               }       
+       }
 }