sqltable_to_php.php does not always generate valid table data arrays

[ddb4github]

Describe the bug db_update_table function does not support table data array that is generated by sqltable_to_php.php with args '--plugin' and '--update'

• In lib/database.php: function db_update_table(...): $data['primary'] is always considered as array:

  if (isset($data['primary'])) {
      if (!isset($allindexes['PRIMARY'])) {
          // No current primary key, so add it
          if (!db_execute("ALTER TABLE `$table` ADD PRIMARY KEY(" . db_format_index_create($data['primary']) . ')', $log, $db_conn)) {
              return false;
          }
      } else {
          $add = array_diff($data['primary'], $allindexes['PRIMARY']);
          $del = array_diff($allindexes['PRIMARY'], $data['primary']);
          if (!empty($add) || !empty($del)) {
              if (!db_execute("ALTER TABLE `$table` DROP PRIMARY KEY", $log, $db_conn) ||
                  !db_execute("ALTER TABLE `$table` ADD PRIMARY KEY(" . db_format_index_create($data['primary']) . ')', $log, $db_conn)) {
                  return false;
              }
          }
      }
  }

• sqltable_to_php.php output $data['primary'] depend arg '--plugin'

          if (!empty($pri)) {
              if ($plugin != '') {
                  $text .= "\$data['primary'] = '" . implode("`,`", $pri) . "';\n";
              } else {
                  $text .= "\$data['primary'] = array('" . implode("','", $pri) . "');\n";
              }
          }

Expected behavior sqltable_to_php.php always output primary key as below if '--update' is specified: $data['primary'] = 'host,graph';

[cigamit]

Should be resolved.

[ddb4github]

Should be resolved.

After review my message. I found I make misleading between "Describe the bug" and "Expected behavior".

Actually, current function 'db_update_table' use 'array_diff' to compare PK. so sqltable_to_php.php should always output a array if the latest line of output is db_update_table, like

db_update_table ('plugin_mikrotik_users', $data, false);

So suggest diff as below, base on ad50326:

--- sqltable_to_php.php 2019-05-25 19:42:53.000000000 +0800
+++ sqltable_to_php.php 2019-05-28 13:22:50.264353736 +0800
@@ -155,7 +155,7 @@
                        }

                        if (!empty($pri)) {
-                               if ($plugin != '' || !$create) {
+                               if ($plugin != '' && $create) {
                                        $text .= "\$data['primary'] = '" . implode("`,`", $pri) . "';\n";
                                } else {
                                        $text .= "\$data['primary'] = array('" . implode("','", $pri) . "');\n";

[cigamit]

Okay, fixed up.