diff options
author | Amenadiel <amenadiel@gmail.com> | 2019-08-02 22:26:35 +0300 |
---|---|---|
committer | Amenadiel <amenadiel@gmail.com> | 2019-08-02 22:26:35 +0300 |
commit | fcc268948d4c512e3e86daf4bb11ca431ce641ad (patch) | |
tree | eb8aea2283f326a7a4c81f58eeba7417da992dca /src/database | |
parent | 5e22d718f22528c93428ba6e3ffdbff2e46ece59 (diff) |
Tag v 6.0.0-beta.52v6.0.0-beta.52
Diffstat (limited to 'src/database')
38 files changed, 66 insertions, 65 deletions
diff --git a/src/database/ADOdbBase.php b/src/database/ADOdbBase.php index cb18d805..bfeb1346 100644 --- a/src/database/ADOdbBase.php +++ b/src/database/ADOdbBase.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database; @@ -234,7 +234,7 @@ class ADOdbBase return $this->conn->ErrorNo(); } - if ($rs->RecordCount() == 0) { + if ($rs->recordCount() == 0) { return -1; } diff --git a/src/database/Connection.php b/src/database/Connection.php index a18cdd93..67630acd 100644 --- a/src/database/Connection.php +++ b/src/database/Connection.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres.php b/src/database/Postgres.php index 0716aa15..42634867 100644 --- a/src/database/Postgres.php +++ b/src/database/Postgres.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database; @@ -358,7 +358,7 @@ class Postgres extends ADOdbBase AND attnum IN ('".join("','", $atts)."')"; $rs = $this->selectSet($sql); - if ($rs->RecordCount() != sizeof($atts)) { + if ($rs->recordCount() != sizeof($atts)) { return -2; } diff --git a/src/database/Postgres10.php b/src/database/Postgres10.php index ae1c62a5..1af7d5f4 100644 --- a/src/database/Postgres10.php +++ b/src/database/Postgres10.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres11.php b/src/database/Postgres11.php index d3badfe1..72a932db 100644 --- a/src/database/Postgres11.php +++ b/src/database/Postgres11.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres74.php b/src/database/Postgres74.php index dbf0b855..bedf1bce 100644 --- a/src/database/Postgres74.php +++ b/src/database/Postgres74.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres80.php b/src/database/Postgres80.php index 8918edcb..b58dcab3 100644 --- a/src/database/Postgres80.php +++ b/src/database/Postgres80.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres81.php b/src/database/Postgres81.php index f27bb1a1..50081c7b 100644 --- a/src/database/Postgres81.php +++ b/src/database/Postgres81.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database; @@ -203,7 +203,7 @@ class Postgres81 extends Postgres82 WHERE vacrelid = {$toid};"); $status = -1; // ini - if ($rs->RecordCount() and ($rs->fields['vacrelid'] == $toid)) { + if ($rs->recordCount() and ($rs->fields['vacrelid'] == $toid)) { // table exists in pg_autovacuum, UPDATE $sql = sprintf( "UPDATE \"pg_catalog\".\"pg_autovacuum\" SET diff --git a/src/database/Postgres82.php b/src/database/Postgres82.php index c83208f5..65bb8563 100644 --- a/src/database/Postgres82.php +++ b/src/database/Postgres82.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres83.php b/src/database/Postgres83.php index 30f54ded..d823bb01 100644 --- a/src/database/Postgres83.php +++ b/src/database/Postgres83.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database; @@ -216,7 +216,7 @@ class Postgres83 extends Postgres84 WHERE vacrelid = {$toid};"); $status = -1; // ini - if ($rs->RecordCount() and ($rs->fields['vacrelid'] == $toid)) { + if ($rs->recordCount() and ($rs->fields['vacrelid'] == $toid)) { // table exists in pg_autovacuum, UPDATE $sql = sprintf( "UPDATE \"pg_catalog\".\"pg_autovacuum\" SET diff --git a/src/database/Postgres84.php b/src/database/Postgres84.php index aed669a5..25e0e09c 100644 --- a/src/database/Postgres84.php +++ b/src/database/Postgres84.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres90.php b/src/database/Postgres90.php index 450b85e0..316e172d 100644 --- a/src/database/Postgres90.php +++ b/src/database/Postgres90.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres91.php b/src/database/Postgres91.php index 456b188d..03188635 100644 --- a/src/database/Postgres91.php +++ b/src/database/Postgres91.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres92.php b/src/database/Postgres92.php index a43420fe..d507f7cb 100644 --- a/src/database/Postgres92.php +++ b/src/database/Postgres92.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres93.php b/src/database/Postgres93.php index 829616fe..93304ae9 100644 --- a/src/database/Postgres93.php +++ b/src/database/Postgres93.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres94.php b/src/database/Postgres94.php index c31a09ca..a60e6871 100644 --- a/src/database/Postgres94.php +++ b/src/database/Postgres94.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres95.php b/src/database/Postgres95.php index 69e043ec..a59b6fc4 100644 --- a/src/database/Postgres95.php +++ b/src/database/Postgres95.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres96.php b/src/database/Postgres96.php index 748f3b0e..f06fb763 100644 --- a/src/database/Postgres96.php +++ b/src/database/Postgres96.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database; diff --git a/src/database/databasetraits/AggregateTrait.php b/src/database/databasetraits/AggregateTrait.php index 07ea417b..fb7294b0 100644 --- a/src/database/databasetraits/AggregateTrait.php +++ b/src/database/databasetraits/AggregateTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/ColumnTrait.php b/src/database/databasetraits/ColumnTrait.php index dd8d8199..253ec255 100644 --- a/src/database/databasetraits/ColumnTrait.php +++ b/src/database/databasetraits/ColumnTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/DatabaseTrait.php b/src/database/databasetraits/DatabaseTrait.php index 680a6f6f..668769f9 100644 --- a/src/database/databasetraits/DatabaseTrait.php +++ b/src/database/databasetraits/DatabaseTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/DomainTrait.php b/src/database/databasetraits/DomainTrait.php index 35705c7e..e8c74c22 100644 --- a/src/database/databasetraits/DomainTrait.php +++ b/src/database/databasetraits/DomainTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/FtsTrait.php b/src/database/databasetraits/FtsTrait.php index b2a0c5a0..a0d88ef4 100644 --- a/src/database/databasetraits/FtsTrait.php +++ b/src/database/databasetraits/FtsTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/FunctionTrait.php b/src/database/databasetraits/FunctionTrait.php index cce2dfa1..660eac6c 100644 --- a/src/database/databasetraits/FunctionTrait.php +++ b/src/database/databasetraits/FunctionTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; @@ -62,7 +62,8 @@ trait FunctionTrait } /** - * Returns a list of all functions that can be used in triggers + * Returns a list of all functions that can be used in triggers. + * * @return \PHPPgAdmin\ADORecordSet Functions that can be used in a trigger */ public function getTriggerFunctions() @@ -273,13 +274,13 @@ trait FunctionTrait if (is_array($definition)) { $this->arrayClean($definition); - $sql .= "'" . $definition[0] . "'"; + $sql .= "'".$definition[0]."'"; if ($definition[1]) { - $sql .= ",'" . $definition[1] . "'"; + $sql .= ",'".$definition[1]."'"; } } else { $this->clean($definition); - $sql .= "'" . $definition . "'"; + $sql .= "'".$definition."'"; } $sql .= " LANGUAGE \"{$language}\""; diff --git a/src/database/databasetraits/HasTrait.php b/src/database/databasetraits/HasTrait.php index 8df8afbe..491fc95a 100644 --- a/src/database/databasetraits/HasTrait.php +++ b/src/database/databasetraits/HasTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/IndexTrait.php b/src/database/databasetraits/IndexTrait.php index 2ec7ef01..a4c19382 100644 --- a/src/database/databasetraits/IndexTrait.php +++ b/src/database/databasetraits/IndexTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; @@ -34,7 +34,7 @@ trait IndexTrait $v = $this->selectSet($sql); - return !($v->RecordCount() == 0); + return !($v->recordCount() == 0); } /** diff --git a/src/database/databasetraits/OperatorTrait.php b/src/database/databasetraits/OperatorTrait.php index 7f82b25f..cb0c3708 100644 --- a/src/database/databasetraits/OperatorTrait.php +++ b/src/database/databasetraits/OperatorTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/PrivilegesTrait.php b/src/database/databasetraits/PrivilegesTrait.php index 07ccf2cd..f514cc5d 100644 --- a/src/database/databasetraits/PrivilegesTrait.php +++ b/src/database/databasetraits/PrivilegesTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/RoleTrait.php b/src/database/databasetraits/RoleTrait.php index 534c7390..97a1bf07 100644 --- a/src/database/databasetraits/RoleTrait.php +++ b/src/database/databasetraits/RoleTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; @@ -185,15 +185,15 @@ trait RoleTrait } if (is_array($new_roles_to_add) && sizeof($new_roles_to_add) > 0) { - $sql .= ' IN ROLE "' . join('", "', $new_roles_to_add) . '"'; + $sql .= ' IN ROLE "'.join('", "', $new_roles_to_add).'"'; } if (is_array($new_members_of_role) && sizeof($new_members_of_role) > 0) { - $sql .= ' ROLE "' . join('", "', $new_members_of_role) . '"'; + $sql .= ' ROLE "'.join('", "', $new_members_of_role).'"'; } if (is_array($new_admins_of_role) && sizeof($new_admins_of_role) > 0) { - $sql .= ' ADMIN "' . join('", "', $new_admins_of_role) . '"'; + $sql .= ' ADMIN "'.join('", "', $new_admins_of_role).'"'; } return $this->execute($sql); @@ -209,7 +209,7 @@ trait RoleTrait */ public function _encryptPassword($username, $password) { - return 'md5' . md5($password . $username); + return 'md5'.md5($password.$username); } /** @@ -590,7 +590,7 @@ trait RoleTrait $sql .= $createdb ? ' CREATEDB' : ' NOCREATEDB'; $sql .= $createuser ? ' CREATEUSER' : ' NOCREATEUSER'; if (is_array($groups) && sizeof($groups) > 0) { - $sql .= ' IN GROUP "' . join('", "', $groups) . '"'; + $sql .= ' IN GROUP "'.join('", "', $groups).'"'; } if ($expiry != '') { @@ -859,7 +859,7 @@ trait RoleTrait if (is_array($users) && sizeof($users) > 0) { $this->fieldArrayClean($users); - $sql .= ' WITH USER "' . join('", "', $users) . '"'; + $sql .= ' WITH USER "'.join('", "', $users).'"'; } return $this->execute($sql); diff --git a/src/database/databasetraits/RowTrait.php b/src/database/databasetraits/RowTrait.php index bd3ebe9e..11fd453c 100644 --- a/src/database/databasetraits/RowTrait.php +++ b/src/database/databasetraits/RowTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; @@ -74,7 +74,7 @@ trait RowTrait // If none, check for an OID column. Even though OIDs can be duplicated, the edit and delete row // functions check that they're only modiying a single row. Otherwise, return empty array. - if ($rs->RecordCount() == 0) { + if ($rs->recordCount() == 0) { // Check for OID column $temp = []; if ($this->hasObjectID($table)) { diff --git a/src/database/databasetraits/SchemaTrait.php b/src/database/databasetraits/SchemaTrait.php index c280918b..f28926d4 100644 --- a/src/database/databasetraits/SchemaTrait.php +++ b/src/database/databasetraits/SchemaTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/SequenceTrait.php b/src/database/databasetraits/SequenceTrait.php index 398ef876..4740204c 100644 --- a/src/database/databasetraits/SequenceTrait.php +++ b/src/database/databasetraits/SequenceTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; @@ -114,7 +114,7 @@ trait SequenceTrait { // Get the minimum value of the sequence $seq = $this->getSequence($sequence); - if ($seq->RecordCount() != 1) { + if ($seq->recordCount() != 1) { return -1; } @@ -253,7 +253,7 @@ trait SequenceTrait $data = $this->getSequence($sequence); - if ($data->RecordCount() != 1) { + if ($data->recordCount() != 1) { return -2; } diff --git a/src/database/databasetraits/StatsTrait.php b/src/database/databasetraits/StatsTrait.php index 8eec79f1..e753bf3b 100644 --- a/src/database/databasetraits/StatsTrait.php +++ b/src/database/databasetraits/StatsTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/TableTrait.php b/src/database/databasetraits/TableTrait.php index d4edf3ec..a3f4c641 100644 --- a/src/database/databasetraits/TableTrait.php +++ b/src/database/databasetraits/TableTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; @@ -151,7 +151,7 @@ trait TableTrait { // Fetch table $t = $this->getTable($table); - if (!is_object($t) || $t->RecordCount() != 1) { + if (!is_object($t) || $t->recordCount() != 1) { $this->rollbackTransaction(); return null; @@ -182,7 +182,7 @@ trait TableTrait // Output all table columns $col_comments_sql = ''; // Accumulate comments on columns - $num = $atts->RecordCount() + $cons->RecordCount(); + $num = $atts->recordCount() + $cons->recordCount(); $i = 1; $sql = $this->_dumpSerials($atts, $t, $sql, $col_comments_sql, $i, $num); @@ -205,7 +205,7 @@ trait TableTrait * as inherited NOT NULL and CHECK constraints. So for the time being, we just do * not claim to support inheritance. * $parents = $this->getTableParents($table); - * if ($parents->RecordCount() > 0) { + * if ($parents->recordCount() > 0) { * $sql .= " INHERITS ("; * while (!$parents->EOF) { * $this->fieldClean($parents->fields['relname']); @@ -798,7 +798,7 @@ trait TableTrait AND relnamespace = (SELECT oid FROM pg_catalog.pg_namespace WHERE nspname='{$c_schema}')"; $rs = $this->selectSet($sql); - if ($rs->RecordCount() != 1) { + if ($rs->recordCount() != 1) { return null; } @@ -827,7 +827,7 @@ trait TableTrait return null; } - if ($indexes->RecordCount() > 0) { + if ($indexes->recordCount() > 0) { $sql .= "\n-- Indexes\n\n"; while (!$indexes->EOF) { $sql .= $indexes->fields['inddef'].";\n"; @@ -844,7 +844,7 @@ trait TableTrait return null; } - if ($triggers->RecordCount() > 0) { + if ($triggers->recordCount() > 0) { $sql .= "\n-- Triggers\n\n"; while (!$triggers->EOF) { $sql .= $triggers->fields['tgdef']; @@ -862,7 +862,7 @@ trait TableTrait return null; } - if ($rules->RecordCount() > 0) { + if ($rules->recordCount() > 0) { $sql .= "\n-- Rules\n\n"; while (!$rules->EOF) { $sql .= $rules->fields['definition']."\n"; @@ -1216,7 +1216,7 @@ trait TableTrait { $data = $this->getTable($table); - if ($data->RecordCount() != 1) { + if ($data->recordCount() != 1) { return -2; } diff --git a/src/database/databasetraits/TablespaceTrait.php b/src/database/databasetraits/TablespaceTrait.php index 5e5a757c..8d258543 100644 --- a/src/database/databasetraits/TablespaceTrait.php +++ b/src/database/databasetraits/TablespaceTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/TriggerTrait.php b/src/database/databasetraits/TriggerTrait.php index 95bef505..42b010fb 100644 --- a/src/database/databasetraits/TriggerTrait.php +++ b/src/database/databasetraits/TriggerTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/TypeTrait.php b/src/database/databasetraits/TypeTrait.php index be4ba9a7..7f6947d1 100644 --- a/src/database/databasetraits/TypeTrait.php +++ b/src/database/databasetraits/TypeTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/ViewTrait.php b/src/database/databasetraits/ViewTrait.php index 35585be8..d4ab55f4 100644 --- a/src/database/databasetraits/ViewTrait.php +++ b/src/database/databasetraits/ViewTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; @@ -132,7 +132,7 @@ trait ViewTrait { $data = $this->getView($view); - if ($data->RecordCount() != 1) { + if ($data->recordCount() != 1) { return -2; } |