Optimize the schema class

This commit is contained in:
markjcrane
2025-11-17 14:01:45 -07:00
parent aacc41ade2
commit ce1bee4821

View File

@@ -28,16 +28,25 @@
//define the schema class //define the schema class
class schema { class schema {
//define variables //define the public variables
private $database;
public $apps;
public $db_type;
public $result;
public $data_types; public $data_types;
public $result;
//class constructor //define private variables
private $database;
private $applications;
private $db_type;
private $db_name;
private $schema_info;
/**
* called when the object is created
*/
public function __construct($setting_array = []) { public function __construct($setting_array = []) {
//set the global variables
global $db_type, $db_name;
//includes files //includes files
require dirname(__DIR__, 2) . "/resources/require.php"; require dirname(__DIR__, 2) . "/resources/require.php";
@@ -55,14 +64,40 @@
} }
$x++; $x++;
} }
$this->apps = $apps; $this->applications = $apps;
//set the db_type
$this->db_type = $db_type;
//set the db_name
$this->db_name = $db_name;
//get the table info
if ($this->db_type == "pgsql") {
$sql = "SELECT *, ordinal_position, ";
$sql .= "table_name, ";
$sql .= "column_name, ";
$sql .= "data_type, ";
$sql .= "column_default, ";
$sql .= "is_nullable, ";
$sql .= "character_maximum_length, ";
$sql .= "numeric_precision ";
$sql .= "FROM information_schema.columns ";
$sql .= "WHERE table_catalog = '" . $db_name . "' ";
$sql .= "and table_schema not in ('pg_catalog', 'information_schema') ";
$sql .= "ORDER BY ordinal_position; ";
$schema = $this->database->select($sql, null, 'all');
foreach($schema as $row) {
$this->schema_info[$row['table_name']][] = $row;
}
}
} }
//create the database schema //create the database schema
public function sql() { public function sql() {
$sql = ''; $sql = '';
$sql_schema = ''; $sql_schema = '';
foreach ($this->apps as $app) { foreach ($this->applications as $app) {
if (isset($app['db']) && count($app['db'])) { if (isset($app['db']) && count($app['db'])) {
foreach ($app['db'] as $row) { foreach ($app['db'] as $row) {
//create the sql string //create the sql string
@@ -115,7 +150,7 @@
} }
} }
//create the database schema //add the database schema
public function exec() { public function exec() {
foreach ($this->result['sql'] as $sql) { foreach ($this->result['sql'] as $sql) {
//start the sql transaction //start the sql transaction
@@ -131,21 +166,16 @@
} }
} }
//check if a column exists in sqlite
private function sqlite_column_exists($table_info, $column_name) {
foreach ($table_info as $key => $row) {
if ($row['name'] == $column_name) {
return true;
}
}
return false;
}
//check if a column exists //check if a column exists
public function column_exists($db_name, $table_name, $column_name) { public function column_exists($table_name, $column_name) {
if (empty($table_name)) {
return false;
}
if (empty($column_name)) {
return false;
}
if ($this->db_type == "sqlite") { if ($this->db_type == "sqlite") {
$table_info = $this->table_info($db_name, $table_name); $table_info = $this->table_info($table_name);
if ($this->sqlite_column_exists($table_info, $column_name)) { if ($this->sqlite_column_exists($table_info, $column_name)) {
return true; return true;
} else { } else {
@@ -153,10 +183,18 @@
} }
} }
if ($this->db_type == "pgsql") { if ($this->db_type == "pgsql") {
$sql = "SELECT attname FROM pg_attribute WHERE attrelid = (SELECT oid FROM pg_class WHERE relname = '$table_name' limit 1) AND attname = '$column_name'; "; if (!isset($this->schema_info[$table_name])) {
return false;
}
foreach($this->schema_info[$table_name] as $row) {
if ($row['column_name'] == $column_name) {
return true;
}
}
return false;
} }
if ($this->db_type == "mysql") { if ($this->db_type == "mysql") {
//$sql .= "SELECT * FROM information_schema.COLUMNS where TABLE_SCHEMA = '$db_name' and TABLE_NAME = '$table_name' and COLUMN_NAME = '$column_name' "; //$sql .= "SELECT * FROM information_schema.COLUMNS where TABLE_SCHEMA = '".$this->db_name."' and TABLE_NAME = '$table_name' and COLUMN_NAME = '$column_name' ";
$sql = "show columns from $table_name where field = '$column_name' "; $sql = "show columns from $table_name where field = '$column_name' ";
} }
@@ -164,6 +202,7 @@
$prep_statement = $this->database->db->prepare($sql); $prep_statement = $this->database->db->prepare($sql);
$prep_statement->execute(); $prep_statement->execute();
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED); $result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
unset($prep_statement);
if (!$result) { if (!$result) {
return false; return false;
} }
@@ -172,31 +211,23 @@
} else { } else {
return false; return false;
} }
unset($prep_statement);
} }
} }
//get the table information //get the table information
public function table_info($db_name, $table_name) { public function table_info($table_name) {
if (empty($table_name)) { if (empty($table_name)) {
return false; return false;
} }
if ($this->db_type == "pgsql") {
if (!isset($this->schema_info[$table_name])) {
return false;
}
return $this->schema_info[$table_name];
}
if ($this->db_type == "sqlite") { if ($this->db_type == "sqlite") {
$sql = "PRAGMA table_info(" . $table_name . ");"; $sql = "PRAGMA table_info(" . $table_name . ");";
} }
if ($this->db_type == "pgsql") {
$sql = "SELECT ordinal_position, ";
$sql .= "column_name, ";
$sql .= "data_type, ";
$sql .= "column_default, ";
$sql .= "is_nullable, ";
$sql .= "character_maximum_length, ";
$sql .= "numeric_precision ";
$sql .= "FROM information_schema.columns ";
$sql .= "WHERE table_name = '" . $table_name . "' ";
$sql .= "and table_catalog = '" . $db_name . "' ";
$sql .= "ORDER BY ordinal_position; ";
}
if ($this->db_type == "mysql") { if ($this->db_type == "mysql") {
$sql = "describe " . $table_name . ";"; $sql = "describe " . $table_name . ";";
} }
@@ -205,68 +236,43 @@
return $prep_statement->fetchAll(PDO::FETCH_ASSOC); return $prep_statement->fetchAll(PDO::FETCH_ASSOC);
} }
//database table exists alternate
private function db_table_exists_alternate($db_type, $table_name) {
$sql = "select count(*) from $table_name ";
$result = $this->database->execute($sql, null);
if ($result > 0) {
return true; //table exists
} else {
return false; //table doesn't exist
}
}
//database table exists //database table exists
private function db_table_exists($table_name) { private function table_exists($table_name) {
return $this->database->table_exists($table_name); if ($this->db_type == 'pgsql') {
} if (isset($this->schema_info[$table_name])) {
return true;
//database table information } else {
private function db_table_info($db_name, $db_type, $table_name) { return false;
if (empty($table_name)) { }
return false;
} }
if ($db_type == "sqlite") { if ($this->db_type == 'sqlite' || $this->db_type == 'msyql') {
$sql = "PRAGMA table_info(" . $table_name . ");"; $sql = "select count(*) from $table_name ";
$result = $this->database->execute($sql, null);
if ($result > 0) {
return true; //table exists
} else {
return false; //table doesn't exist
}
} }
if ($db_type == "pgsql") {
$sql = "SELECT ordinal_position, ";
$sql .= "column_name, ";
$sql .= "data_type, ";
$sql .= "column_default, ";
$sql .= "is_nullable, ";
$sql .= "character_maximum_length, ";
$sql .= "numeric_precision ";
$sql .= "FROM information_schema.columns ";
$sql .= "WHERE table_name = '" . $table_name . "' ";
$sql .= "and table_catalog = '" . $db_name . "' ";
$sql .= "ORDER BY ordinal_position; ";
}
if ($db_type == "mysql") {
$sql = "describe " . $table_name . ";";
}
$prep_statement = $this->database->db->prepare($sql);
$prep_statement->execute();
return $prep_statement->fetchAll(PDO::FETCH_ASSOC);
} }
//database type //database type
private function db_data_type($db_type, $table_info, $column_name) { private function data_type($table_info, $column_name) {
if ($db_type == "sqlite") { if ($this->db_type == "sqlite") {
foreach ($table_info as $key => $row) { foreach ($table_info as $key => $row) {
if ($row['name'] == $column_name) { if ($row['name'] == $column_name) {
return $row['type']; return $row['type'];
} }
} }
} }
if ($db_type == "pgsql") { if ($this->db_type == "pgsql") {
foreach ($table_info as $key => $row) { foreach ($table_info as $key => $row) {
if ($row['column_name'] == $column_name) { if ($row['column_name'] == $column_name) {
return $row['data_type']; return $row['data_type'];
} }
} }
} }
if ($db_type == "mysql") { if ($this->db_type == "mysql") {
foreach ($table_info as $key => $row) { foreach ($table_info as $key => $row) {
if ($row['Field'] == $column_name) { if ($row['Field'] == $column_name) {
return $row['Type']; return $row['Type'];
@@ -276,7 +282,7 @@
} }
//sqlite column exists //sqlite column exists
private function db_sqlite_column_exists($table_info, $column_name) { private function sqlite_column_exists($table_info, $column_name) {
foreach ($table_info as $key => $row) { foreach ($table_info as $key => $row) {
if ($row['name'] == $column_name) { if ($row['name'] == $column_name) {
return true; return true;
@@ -285,19 +291,14 @@
return false; return false;
} }
//database column exists
private function db_column_exists($db_type, $db_name, $table_name, $column_name) {
return $this->database->column_exists($table_name, $column_name);
}
//database column data type //database column data type
private function db_column_data_type($db_type, $db_name, $table_name, $column_name) { private function column_data_type($table_name, $column_name) {
$table_info = $this->db_table_info($db_name, $db_type, $table_name); $table_info = $this->table_info($table_name);
return $this->db_data_type($db_type, $table_info, $column_name); return $this->data_type($table_info, $column_name);
} }
//database create table //database create table
public function db_create_table($apps, $db_type, $table) { public function create_table($apps, $table) {
if (empty($apps)) { if (empty($apps)) {
return false; return false;
} }
@@ -327,7 +328,7 @@
$sql .= $field['name'] . " "; $sql .= $field['name'] . " ";
} }
if (!empty($field['type']) && is_array($field['type'])) { if (!empty($field['type']) && is_array($field['type'])) {
$sql .= $field['type'][$db_type]; $sql .= $field['type'][$this->db_type];
} else { } else {
$sql .= $field['type']; $sql .= $field['type'];
} }
@@ -348,8 +349,7 @@
} }
//database insert //database insert
private function db_insert_into($apps, $db_type, $table) { private function insert_into($apps, $table) {
global $db_name;
foreach ($apps as $x => $app) { foreach ($apps as $x => $app) {
foreach ($app['db'] as $y => $row) { foreach ($app['db'] as $y => $row) {
if ($row['table']['name'] == $table) { if ($row['table']['name'] == $table) {
@@ -385,7 +385,7 @@
if (is_array($field['name']['deprecated'])) { if (is_array($field['name']['deprecated'])) {
$found = false; $found = false;
foreach ($field['name']['deprecated'] as $row) { foreach ($field['name']['deprecated'] as $row) {
if ($this->db_column_exists($db_type, $db_name, 'tmp_' . $table, $row)) { if ($this->column_exists('tmp_' . $table, $row)) {
$sql .= $row; $sql .= $row;
$found = true; $found = true;
break; break;
@@ -395,7 +395,7 @@
$sql .= "''"; $sql .= "''";
} }
} else { } else {
if ($this->db_column_exists($db_type, $db_name, 'tmp_' . $table, $field['name']['deprecated'])) { if ($this->column_exists('tmp_' . $table, $field['name']['deprecated'])) {
$sql .= $field['name']['deprecated']; $sql .= $field['name']['deprecated'];
} else { } else {
$sql .= "''"; $sql .= "''";
@@ -432,15 +432,14 @@
//$config_exists = $config->exists(); //$config_exists = $config->exists();
//$config_path = $config->find(); //$config_path = $config->find();
//$config->get(); //$config->get();
//$db_type = $config->db_type; //$this->db_type = $config->db_type;
//$db_name = $config->db_name; //$this->db_name = $config->db_name;
//$db_username = $config->db_username; //$db_username = $config->db_username;
//$db_password = $config->db_password; //$db_password = $config->db_password;
//$db_host = $config->db_host; //$db_host = $config->db_host;
//$db_path = $config->db_path; //$db_path = $config->db_path;
//$db_port = $config->db_port; //$db_port = $config->db_port;
//includes files //includes files
require dirname(__DIR__, 2) . "/resources/require.php";
//add multi-lingual support //add multi-lingual support
if (!isset($text)) { if (!isset($text)) {
@@ -474,7 +473,7 @@
// SELECT TABLE_NAME FROM ALL_TABLES // SELECT TABLE_NAME FROM ALL_TABLES
//update the app db array add exists true or false //update the app db array add exists true or false
$sql = ''; $sql = '';
foreach ($this->apps as $x => $app) { foreach ($this->applications as $x => $app) {
if (isset($app['db'])) { if (isset($app['db'])) {
foreach ($app['db'] as $y => $row) { foreach ($app['db'] as $y => $row) {
if (isset($row['table']['name'])) { if (isset($row['table']['name'])) {
@@ -494,10 +493,10 @@
if (!empty($table_name)) { if (!empty($table_name)) {
//check if the table exists //check if the table exists
if ($this->db_table_exists($table_name)) { if ($this->table_exists($table_name)) {
$this->apps[$x]['db'][$y]['exists'] = 'true'; $this->applications[$x]['db'][$y]['exists'] = 'true';
} else { } else {
$this->apps[$x]['db'][$y]['exists'] = 'false'; $this->applications[$x]['db'][$y]['exists'] = 'false';
} }
//check if the column exists //check if the column exists
foreach ($row['fields'] as $z => $field) { foreach ($row['fields'] as $z => $field) {
@@ -510,12 +509,12 @@
$field_name = $field['name']; $field_name = $field['name'];
} }
if (!empty($field_name)) { if (!empty($field_name)) {
if ($this->db_column_exists($db_type, $db_name, $table_name, $field_name)) { if ($this->column_exists($table_name, $field_name)) {
//found //found
$this->apps[$x]['db'][$y]['fields'][$z]['exists'] = 'true'; $this->applications[$x]['db'][$y]['fields'][$z]['exists'] = 'true';
} else { } else {
//not found //not found
$this->apps[$x]['db'][$y]['fields'][$z]['exists'] = 'false'; $this->applications[$x]['db'][$y]['fields'][$z]['exists'] = 'false';
} }
} }
unset($field_name); unset($field_name);
@@ -531,32 +530,32 @@
$sql_update = ''; $sql_update = '';
//add missing tables and fields //add missing tables and fields
foreach ($this->apps as $x => $app) { foreach ($this->applications as $x => $app) {
if (isset($app['db'])) { if (isset($app['db'])) {
foreach ($app['db'] as $y => $row) { foreach ($app['db'] as $y => $row) {
if (is_array($row['table']['name'])) { if (is_array($row['table']['name'])) {
$table_name = $row['table']['name']['text']; $table_name = $row['table']['name']['text'];
if ($this->db_table_exists($row['table']['name']['deprecated'])) { if ($this->table_exists($row['table']['name']['deprecated'])) {
$row['exists'] = "false"; //testing $row['exists'] = "false"; //testing
if ($db_type == "pgsql") { if ($this->db_type == "pgsql") {
$sql_update .= "ALTER TABLE " . $row['table']['name']['deprecated'] . " RENAME TO " . $row['table']['name']['text'] . ";\n"; $sql_update .= "ALTER TABLE " . $row['table']['name']['deprecated'] . " RENAME TO " . $row['table']['name']['text'] . ";\n";
} }
if ($db_type == "mysql") { if ($this->db_type == "mysql") {
$sql_update .= "RENAME TABLE " . $row['table']['name']['deprecated'] . " TO " . $row['table']['name']['text'] . ";\n"; $sql_update .= "RENAME TABLE " . $row['table']['name']['deprecated'] . " TO " . $row['table']['name']['text'] . ";\n";
} }
if ($db_type == "sqlite") { if ($this->db_type == "sqlite") {
$sql_update .= "ALTER TABLE " . $row['table']['name']['deprecated'] . " RENAME TO " . $row['table']['name']['text'] . ";\n"; $sql_update .= "ALTER TABLE " . $row['table']['name']['deprecated'] . " RENAME TO " . $row['table']['name']['text'] . ";\n";
} }
} else { } else {
if ($this->db_table_exists($row['table']['name']['text'])) { if ($this->table_exists($row['table']['name']['text'])) {
$row['exists'] = "true"; $row['exists'] = "true";
} else { } else {
$row['exists'] = "false"; $row['exists'] = "false";
$sql_update .= $this->db_create_table($this->apps, $db_type, $row['table']['name']['text']); $sql_update .= $this->create_table($this->applications, $row['table']['name']['text']);
} }
} }
} else { } else {
if ($this->db_table_exists($row['table']['name'])) { if ($this->table_exists($row['table']['name'])) {
$row['exists'] = "true"; $row['exists'] = "true";
} else { } else {
$row['exists'] = "false"; $row['exists'] = "false";
@@ -573,7 +572,7 @@
} else { } else {
//get the data type //get the data type
if (is_array($field['type'])) { if (is_array($field['type'])) {
$field_type = $field['type'][$db_type]; $field_type = $field['type'][$this->db_type];
} else { } else {
$field_type = $field['type']; $field_type = $field['type'];
} }
@@ -585,24 +584,24 @@
} }
//check if the field exists //check if the field exists
// if ($this->db_column_exists($db_type, $db_name, $table_name, $field_name)) { // if ($this->column_exists($table_name, $field_name)) {
// $field['exists'] = "true"; // $field['exists'] = "true";
// } // }
// else { // else {
// $field['exists'] = "false"; // $field['exists'] = "false";
// } // }
//add or rename fields //add or rename fields
if (isset($field['name']['deprecated']) && $this->db_column_exists($db_type, $db_name, $table_name, $field['name']['deprecated'])) { if (isset($field['name']['deprecated']) && $this->column_exists($table_name, $field['name']['deprecated'])) {
if ($db_type == "pgsql") { if ($this->db_type == "pgsql") {
$sql_update .= "ALTER TABLE " . $table_name . " RENAME COLUMN " . $field['name']['deprecated'] . " to " . $field['name']['text'] . ";\n"; $sql_update .= "ALTER TABLE " . $table_name . " RENAME COLUMN " . $field['name']['deprecated'] . " to " . $field['name']['text'] . ";\n";
} }
if ($db_type == "mysql") { if ($this->db_type == "mysql") {
$field_type = str_replace("AUTO_INCREMENT PRIMARY KEY", "", $field_type); $field_type = str_replace("AUTO_INCREMENT PRIMARY KEY", "", $field_type);
$sql_update .= "ALTER TABLE " . $table_name . " CHANGE " . $field['name']['deprecated'] . " " . $field['name']['text'] . " " . $field_type . ";\n"; $sql_update .= "ALTER TABLE " . $table_name . " CHANGE " . $field['name']['deprecated'] . " " . $field['name']['text'] . " " . $field_type . ";\n";
} }
if ($db_type == "sqlite") { if ($this->db_type == "sqlite") {
//a change has been made to the field name //a change has been made to the field name
$this->apps[$x]['db'][$y]['rebuild'] = 'true'; $this->applications[$x]['db'][$y]['rebuild'] = 'true';
} }
} else { } else {
//find missing fields and add them //find missing fields and add them
@@ -614,11 +613,11 @@
//change the data type if it has been changed //change the data type if it has been changed
//if the data type in the app db array is different than the type in the database then change the data type //if the data type in the app db array is different than the type in the database then change the data type
if ($this->data_types) { if ($this->data_types) {
$db_field_type = $this->db_column_data_type($db_type, $db_name, $table_name, $field_name); $db_field_type = $this->column_data_type($table_name, $field_name);
$field_type_array = explode("(", $field_type); $field_type_array = explode("(", $field_type);
$field_type = $field_type_array[0]; $field_type = $field_type_array[0];
if (trim($db_field_type) != trim($field_type) && !empty($db_field_type)) { if (trim($db_field_type) != trim($field_type) && !empty($db_field_type)) {
if ($db_type == "pgsql") { if ($this->db_type == "pgsql") {
if (strtolower($field_type) == "uuid") { if (strtolower($field_type) == "uuid") {
$sql_update .= "ALTER TABLE " . $table_name . " ALTER COLUMN " . $field_name . " TYPE uuid USING\n"; $sql_update .= "ALTER TABLE " . $table_name . " ALTER COLUMN " . $field_name . " TYPE uuid USING\n";
$sql_update .= "CAST(regexp_replace(" . $field_name . ", '([A-Z0-9]{4})([A-Z0-9]{12})', E'\\1-\\2')\n"; $sql_update .= "CAST(regexp_replace(" . $field_name . ", '([A-Z0-9]{4})([A-Z0-9]{12})', E'\\1-\\2')\n";
@@ -668,7 +667,7 @@
} }
} }
} }
if ($db_type == "mysql") { if ($this->db_type == "mysql") {
$type = explode("(", $db_field_type); $type = explode("(", $db_field_type);
if ($type[0] == $field_type) { if ($type[0] == $field_type) {
//do nothing //do nothing
@@ -679,9 +678,9 @@
} }
unset($type); unset($type);
} }
if ($db_type == "sqlite") { if ($this->db_type == "sqlite") {
//a change has been made to the field type //a change has been made to the field type
$this->apps[$x]['db'][$y]['rebuild'] = 'true'; $this->applications[$x]['db'][$y]['rebuild'] = 'true';
} }
} }
} }
@@ -690,13 +689,13 @@
} }
} elseif (!is_array($row['table']['name'])) { } elseif (!is_array($row['table']['name'])) {
//create table //create table
$sql_update .= $this->db_create_table($this->apps, $db_type, $row['table']['name']); $sql_update .= $this->create_table($this->applications, $row['table']['name']);
} }
} }
} }
} }
//rebuild and populate the table //rebuild and populate the table
foreach ($this->apps as $x => $app) { foreach ($this->applications as $x => $app) {
if (isset($app['db'])) { if (isset($app['db'])) {
foreach ($app['db'] as $y => $row) { foreach ($app['db'] as $y => $row) {
if (is_array($row['table']['name'])) { if (is_array($row['table']['name'])) {
@@ -705,15 +704,15 @@
$table_name = $row['table']['name']; $table_name = $row['table']['name'];
} }
if (!empty($field['rebuild']) && $row['rebuild'] == "true") { if (!empty($field['rebuild']) && $row['rebuild'] == "true") {
if ($db_type == "sqlite") { if ($this->db_type == "sqlite") {
//start the transaction //start the transaction
//$sql_update .= "BEGIN TRANSACTION;\n"; //$sql_update .= "BEGIN TRANSACTION;\n";
//rename the table //rename the table
$sql_update .= "ALTER TABLE " . $table_name . " RENAME TO tmp_" . $table_name . ";\n"; $sql_update .= "ALTER TABLE " . $table_name . " RENAME TO tmp_" . $table_name . ";\n";
//create the table //create the table
$sql_update .= $this->db_create_table($this->apps, $db_type, $table_name); $sql_update .= $this->create_table($this->applications, $table_name);
//insert the data into the new table //insert the data into the new table
$sql_update .= $this->db_insert_into($this->apps, $db_type, $table_name); $sql_update .= $this->insert_into($this->applications, $table_name);
//drop the old table //drop the old table
$sql_update .= "DROP TABLE tmp_" . $table_name . ";\n"; $sql_update .= "DROP TABLE tmp_" . $table_name . ";\n";
//commit the transaction //commit the transaction
@@ -730,7 +729,7 @@
//display results as html //display results as html
if ($format == "html") { if ($format == "html") {
//show the database type //show the database type
$response .= "<strong>" . $text['header-database_type'] . ": " . $db_type . "</strong><br /><br />"; $response .= "<strong>" . $text['header-database_type'] . ": " . $this->db_type . "</strong><br /><br />";
//start the table //start the table
$response .= "<table width='100%' border='0' cellpadding='20' cellspacing='0'>\n"; $response .= "<table width='100%' border='0' cellpadding='20' cellspacing='0'>\n";
//show the changes //show the changes
@@ -754,7 +753,7 @@
$response .= "<tr>\n"; $response .= "<tr>\n";
//build the html while looping through the app db array //build the html while looping through the app db array
$sql = ''; $sql = '';
foreach ($this->apps as $app) { foreach ($this->applications as $app) {
if (isset($app['db'])) { if (isset($app['db'])) {
foreach ($app['db'] as $row) { foreach ($app['db'] as $row) {
if (is_array($row['table']['name'])) { if (is_array($row['table']['name'])) {
@@ -788,7 +787,7 @@
$field_name = $field['name']; $field_name = $field['name'];
} }
if (is_array($field['type'])) { if (is_array($field['type'])) {
$field_type = $field['type'][$db_type]; $field_type = $field['type'][$this->db_type];
} else { } else {
$field_type = $field['type']; $field_type = $field['type'];
} }
@@ -825,7 +824,7 @@
//loop line by line through all the lines of sql code //loop line by line through all the lines of sql code
$x = 0; $x = 0;
if (empty($sql_update) && $format == "text") { if (empty($sql_update) && $format == "text") {
$response .= " " . $text['label-schema'] . ": " . $text['label-no_change'] . "\n"; $response .= " " . $text['label-schema'] ?? '' . ": " . $text['label-no_change'] . "\n";
} else { } else {
if ($format == "text") { if ($format == "text") {
$response .= " " . $text['label-schema'] . "\n"; $response .= " " . $text['label-schema'] . "\n";
@@ -855,7 +854,7 @@
} }
//refresh each postgresql subscription with its publication //refresh each postgresql subscription with its publication
if ($db_type == "pgsql") { if ($this->db_type == "pgsql") {
//get the list of postgresql subscriptions //get the list of postgresql subscriptions
$sql = "select subname from pg_subscription; "; $sql = "select subname from pg_subscription; ";
$pg_subscriptions = $this->database->select($sql, null, 'all'); $pg_subscriptions = $this->database->select($sql, null, 'all');