From 8c5b3cbe581811b137ecbc7945921b468662288f Mon Sep 17 00:00:00 2001 From: ffflabs Date: Mon, 19 Oct 2020 15:24:34 -0300 Subject: repair db creation --- .php_cs.php | 2 +- composer.json | 2 +- composer.lock | 2 +- index.php | 2 +- src/classes/ADONewConnection.php | 2 +- src/classes/ADORecordSet.php | 2 +- src/classes/ADOdbException.php | 2 +- src/classes/ArrayRecordSet.php | 2 +- src/classes/Connection.php | 2 +- src/classes/ContainerHandlers.php | 2 +- src/classes/ContainerUtils.php | 2 +- src/classes/Misc.php | 2 +- src/classes/Translations.php | 2 +- src/classes/ViewManager.php | 2 +- src/controllers/AcinsertController.php | 2 +- src/controllers/AggregatesController.php | 2 +- src/controllers/AlldbController.php | 10 +++++----- src/controllers/BaseController.php | 2 +- src/controllers/BrowserController.php | 2 +- src/controllers/CastsController.php | 2 +- src/controllers/ColpropertiesController.php | 2 +- src/controllers/ConstraintsController.php | 2 +- src/controllers/ConversionsController.php | 2 +- src/controllers/DatabaseController.php | 2 +- src/controllers/DataexportController.php | 2 +- src/controllers/DataimportController.php | 2 +- src/controllers/DbexportController.php | 2 +- src/controllers/DisplayController.php | 2 +- src/controllers/DomainsController.php | 2 +- src/controllers/FulltextController.php | 2 +- src/controllers/FunctionsController.php | 2 +- src/controllers/GroupsController.php | 2 +- src/controllers/HelpController.php | 2 +- src/controllers/HistoryController.php | 2 +- src/controllers/IndexesController.php | 2 +- src/controllers/InfoController.php | 2 +- src/controllers/IntroController.php | 2 +- src/controllers/LanguagesController.php | 2 +- src/controllers/LoginController.php | 2 +- src/controllers/MaterializedviewpropertiesController.php | 2 +- src/controllers/MaterializedviewsController.php | 2 +- src/controllers/OpclassesController.php | 2 +- src/controllers/OperatorsController.php | 2 +- src/controllers/PrivilegesController.php | 2 +- src/controllers/RolesController.php | 2 +- src/controllers/RulesController.php | 2 +- src/controllers/SchemasController.php | 2 +- src/controllers/SequencesController.php | 2 +- src/controllers/ServersController.php | 2 +- src/controllers/SqlController.php | 2 +- src/controllers/SqleditController.php | 2 +- src/controllers/TablesController.php | 2 +- src/controllers/TablespacesController.php | 2 +- src/controllers/TblpropertiesController.php | 2 +- src/controllers/TreeController.php | 2 +- src/controllers/TriggersController.php | 2 +- src/controllers/TypesController.php | 2 +- src/controllers/UsersController.php | 2 +- src/controllers/ViewpropertiesController.php | 2 +- src/controllers/ViewsController.php | 2 +- src/database/ADOdbBase.php | 2 +- src/database/Postgres.php | 2 +- src/database/Postgres10.php | 2 +- src/database/Postgres11.php | 2 +- src/database/Postgres12.php | 2 +- src/database/Postgres13.php | 2 +- src/database/Postgres90.php | 2 +- src/database/Postgres91.php | 2 +- src/database/Postgres92.php | 2 +- src/database/Postgres93.php | 2 +- src/database/Postgres94.php | 2 +- src/database/Postgres95.php | 2 +- src/database/Postgres96.php | 2 +- src/database/databasetraits/AggregateTrait.php | 2 +- src/database/databasetraits/ColumnTrait.php | 2 +- src/database/databasetraits/DatabaseTrait.php | 2 +- src/database/databasetraits/DomainTrait.php | 2 +- src/database/databasetraits/FtsTrait.php | 2 +- src/database/databasetraits/FunctionTrait.php | 2 +- src/database/databasetraits/HasTrait.php | 2 +- src/database/databasetraits/IndexTrait.php | 2 +- src/database/databasetraits/OperatorTrait.php | 2 +- src/database/databasetraits/PrivilegesTrait.php | 2 +- src/database/databasetraits/RoleTrait.php | 2 +- src/database/databasetraits/RowTrait.php | 2 +- src/database/databasetraits/SchemaTrait.php | 2 +- src/database/databasetraits/SequenceTrait.php | 2 +- src/database/databasetraits/StatsTrait.php | 2 +- src/database/databasetraits/TableTrait.php | 4 ++-- src/database/databasetraits/TablespaceTrait.php | 2 +- src/database/databasetraits/TriggerTrait.php | 2 +- src/database/databasetraits/TypeTrait.php | 2 +- src/database/databasetraits/ViewTrait.php | 2 +- src/decorators/ActionUrlDecorator.php | 2 +- src/decorators/ArrayMergeDecorator.php | 2 +- src/decorators/BranchUrlDecorator.php | 2 +- src/decorators/CallbackDecorator.php | 2 +- src/decorators/ConcatDecorator.php | 2 +- src/decorators/Decorator.php | 2 +- src/decorators/FieldDecorator.php | 2 +- src/decorators/IfEmptyDecorator.php | 2 +- src/decorators/RedirectUrlDecorator.php | 2 +- src/decorators/ReplaceDecorator.php | 2 +- src/decorators/UrlDecorator.php | 2 +- src/help/PostgresDoc.php | 2 +- src/help/PostgresDoc10.php | 2 +- src/help/PostgresDoc11.php | 2 +- src/help/PostgresDoc12.php | 2 +- src/help/PostgresDoc90.php | 2 +- src/help/PostgresDoc91.php | 2 +- src/help/PostgresDoc92.php | 2 +- src/help/PostgresDoc93.php | 2 +- src/help/PostgresDoc94.php | 2 +- src/help/PostgresDoc95.php | 2 +- src/help/PostgresDoc96.php | 2 +- src/lib.inc.php | 2 +- src/middleware/Middleware.php | 2 +- src/middleware/PopulateRequestResponse.php | 2 +- src/router.php | 2 +- src/traits/AdminTrait.php | 2 +- src/traits/ExportTrait.php | 2 +- src/traits/FormTrait.php | 2 +- src/traits/HelperTrait.php | 2 +- src/traits/InsertEditRowTrait.php | 2 +- src/traits/MiscTrait.php | 2 +- src/traits/ServersTrait.php | 2 +- src/traits/ViewsMatViewsPropertiesTrait.php | 2 +- src/traits/ViewsMatviewsTrait.php | 2 +- src/translations/AbstractLang.php | 2 +- src/translations/Afrikaans.php | 2 +- src/translations/Arabic.php | 2 +- src/translations/Catalan.php | 2 +- src/translations/ChineseSim.php | 2 +- src/translations/ChineseTr.php | 2 +- src/translations/ChineseUtf8ZhCn.php | 2 +- src/translations/ChineseUtf8ZhTw.php | 2 +- src/translations/Czech.php | 2 +- src/translations/Danish.php | 2 +- src/translations/Dutch.php | 2 +- src/translations/English.php | 2 +- src/translations/French.php | 2 +- src/translations/Galician.php | 2 +- src/translations/German.php | 2 +- src/translations/Greek.php | 2 +- src/translations/Hebrew.php | 2 +- src/translations/Hungarian.php | 2 +- src/translations/Italian.php | 2 +- src/translations/Japanese.php | 2 +- src/translations/Lithuanian.php | 2 +- src/translations/Mongol.php | 2 +- src/translations/Polish.php | 2 +- src/translations/PortugueseBr.php | 2 +- src/translations/PortuguesePt.php | 2 +- src/translations/Romanian.php | 2 +- src/translations/Russian.php | 2 +- src/translations/RussianUtf8.php | 2 +- src/translations/Slovak.php | 2 +- src/translations/Spanish.php | 2 +- src/translations/Swedish.php | 2 +- src/translations/Turkish.php | 2 +- src/translations/Ukrainian.php | 2 +- src/xhtml/HTMLController.php | 2 +- src/xhtml/HTMLFooterController.php | 2 +- src/xhtml/HTMLHeaderController.php | 2 +- src/xhtml/HTMLNavbarController.php | 2 +- src/xhtml/HTMLTableController.php | 2 +- src/xhtml/XHtmlButton.php | 2 +- src/xhtml/XHtmlElement.php | 2 +- src/xhtml/XHtmlOption.php | 2 +- src/xhtml/XHtmlSelect.php | 2 +- src/xhtml/XHtmlSimpleElement.php | 2 +- tests/_support/AcceptanceTester.php | 2 +- tests/_support/FunctionalTester.php | 2 +- tests/_support/Helper/Acceptance.php | 2 +- tests/_support/Helper/Functional.php | 2 +- tests/_support/Helper/Unit.php | 2 +- tests/_support/UnitTester.php | 2 +- tests/_support/_generated/UnitTesterActions.php | 2 +- tests/unit/DataEntitiesTest.php | 2 +- tests/unit/PublicSectionsTest.php | 2 +- tests/unit/TablesAndViewsTest.php | 2 +- tests/unit/UserEntitiesTest.php | 2 +- tests/unit/ViewTest.php | 2 +- tests/views/acinsert.php | 2 +- tests/views/aggregates.php | 2 +- tests/views/alldb.php | 2 +- tests/views/browser.php | 2 +- tests/views/casts.php | 2 +- tests/views/colproperties.php | 2 +- tests/views/constraints.php | 2 +- tests/views/conversions.php | 2 +- tests/views/database.php | 2 +- tests/views/dataexport.php | 2 +- tests/views/dataimport.php | 2 +- tests/views/dbexport.php | 2 +- tests/views/display.php | 2 +- tests/views/domains.php | 2 +- tests/views/fulltext.php | 2 +- tests/views/functions.php | 2 +- tests/views/groups.php | 2 +- tests/views/help.php | 2 +- tests/views/history.php | 2 +- tests/views/indexes.php | 2 +- tests/views/info.php | 2 +- tests/views/intro.php | 2 +- tests/views/languages.php | 2 +- tests/views/login.php | 2 +- tests/views/materializedviewproperties.php | 2 +- tests/views/materializedviews.php | 2 +- tests/views/opclasses.php | 2 +- tests/views/operators.php | 2 +- tests/views/privileges.php | 2 +- tests/views/roles.php | 2 +- tests/views/rules.php | 2 +- tests/views/schemas.php | 2 +- tests/views/sequences.php | 2 +- tests/views/servers.php | 2 +- tests/views/sql.php | 2 +- tests/views/sqledit.php | 2 +- tests/views/tables.php | 2 +- tests/views/tablespaces.php | 2 +- tests/views/tblproperties.php | 2 +- tests/views/triggers.php | 2 +- tests/views/types.php | 2 +- tests/views/users.php | 2 +- tests/views/viewproperties.php | 2 +- tests/views/views.php | 2 +- 227 files changed, 232 insertions(+), 232 deletions(-) diff --git a/.php_cs.php b/.php_cs.php index 7bfb36ba..725fbd43 100644 --- a/.php_cs.php +++ b/.php_cs.php @@ -3,7 +3,7 @@ declare(strict_types=1); /** - * PHPPgAdmin 6.1.0 + * PHPPgAdmin 6.1.2 */ use Ergebnis\PhpCsFixer\Config; diff --git a/composer.json b/composer.json index 42b20739..8e5f638f 100644 --- a/composer.json +++ b/composer.json @@ -42,7 +42,7 @@ "vimeo/psalm": "~3.9.3" }, "extra": { - "version": "6.1.1" + "version": "6.1.2" }, "autoload": { "psr-4": { diff --git a/composer.lock b/composer.lock index 67bb04df..4ce66bf2 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "cf20ece0c269c7ba3fe2b902c7fd6dd2", + "content-hash": "c3fdb52d13846b3dccf4c3180b895732", "packages": [ { "name": "adodb/adodb-php", diff --git a/index.php b/index.php index 8ef839bf..b29d3c9b 100644 --- a/index.php +++ b/index.php @@ -3,7 +3,7 @@ declare(strict_types=1); /** - * PHPPgAdmin 6.1.0 + * PHPPgAdmin 6.1.2 */ // This section is made to be able to parse requests coming from PHP Builtin webserver diff --git a/src/classes/ADONewConnection.php b/src/classes/ADONewConnection.php index 1f68ab8f..13b3f8cf 100644 --- a/src/classes/ADONewConnection.php +++ b/src/classes/ADONewConnection.php @@ -1,7 +1,7 @@ misc->getDatabaseAccessor(); // Default tablespace to null if it isn't set - $this->coalesceArr($_POST, 'formSpc', null); + $this->coalesceArr($_POST, 'formSpc', ''); // Default comment to blank if it isn't set - $this->coalesceArr($_POST, 'formComment', null); + $this->coalesceArr($_POST, 'formComment', ''); // Default collate to blank if it isn't set - $this->coalesceArr($_POST, 'formCollate', null); + $this->coalesceArr($_POST, 'formCollate', ''); // Default ctype to blank if it isn't set - $this->coalesceArr($_POST, 'formCType', null); + $this->coalesceArr($_POST, 'formCType', ''); // Check that they've given a name and a definition if ('' === $_POST['formName']) { diff --git a/src/controllers/BaseController.php b/src/controllers/BaseController.php index 4b1e9ee1..016ca602 100644 --- a/src/controllers/BaseController.php +++ b/src/controllers/BaseController.php @@ -1,7 +1,7 @@