diff options
| author | Felipe Figueroa <amenadiel@gmail.com> | 2018-08-22 22:21:21 +0300 |
|---|---|---|
| committer | Felipe Figueroa <amenadiel@gmail.com> | 2018-08-22 22:21:21 +0300 |
| commit | d782640f5ec561d9088facb2bd162c37b4917fdb (patch) | |
| tree | 13292dd48cfe0ce74a375dcf3e7b5418e6904a1c | |
| parent | a9e85588a5d5885673888245ae9b816c48eecf07 (diff) | |
Tag v 6.0.0-beta.49 adds role group and function definitionv6.0.0-beta.49
281 files changed, 1231 insertions, 970 deletions
diff --git a/.php_cs.cache b/.php_cs.cache index 5c4fc919..d0c22cd2 100644 --- a/.php_cs.cache +++ b/.php_cs.cache @@ -1 +1 @@ -{"php":"7.1.19-1+ubuntu17.10.1+deb.sury.org+1","version":"2.12.1:v2.12.1#beef6cbe6dec7205edcd143842a49f9a691859a6","rules":{"no_php4_constructor":true,"php_unit_namespaced":{"target":"6.0"},"php_unit_dedicate_assert":{"target":"5.6"},"php_unit_expectation":{"target":"5.6"},"php_unit_mock":{"target":"5.5"},"php_unit_no_expectation_annotation":{"target":"4.3"},"binary_operator_spaces":{"align_double_arrow":true,"align_equals":true},"blank_line_after_opening_tag":true,"blank_line_before_statement":true,"braces":true,"cast_spaces":true,"class_attributes_separation":{"elements":["method"]},"class_definition":true,"concat_space":{"spacing":"none"},"declare_equal_normalize":true,"function_typehint_space":true,"include":true,"increment_style":true,"lowercase_cast":true,"lowercase_static_reference":true,"magic_constant_casing":true,"method_argument_space":{"ensure_fully_multiline":true},"native_function_casing":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_blank_lines_after_phpdoc":true,"no_empty_comment":true,"no_empty_phpdoc":true,"no_empty_statement":true,"no_extra_blank_lines":{"tokens":["break","continue","extra","return","throw","use","parenthesis_brace_block","square_brace_block","curly_brace_block"]},"no_leading_import_slash":true,"no_leading_namespace_whitespace":true,"no_mixed_echo_print":{"use":"echo"},"no_multiline_whitespace_around_double_arrow":true,"no_short_bool_cast":true,"no_singleline_whitespace_before_semicolons":true,"no_spaces_around_offset":true,"no_trailing_comma_in_list_call":true,"no_trailing_comma_in_singleline_array":true,"no_unneeded_control_parentheses":true,"no_unneeded_curly_braces":true,"no_unneeded_final_method":true,"no_unused_imports":true,"no_whitespace_before_comma_in_array":true,"no_whitespace_in_blank_line":true,"normalize_index_brace":true,"object_operator_without_whitespace":true,"php_unit_fqcn_annotation":true,"phpdoc_align":true,"phpdoc_annotation_without_dot":true,"phpdoc_indent":true,"phpdoc_inline_tag":true,"phpdoc_no_access":true,"phpdoc_no_alias_tag":true,"phpdoc_no_empty_return":true,"phpdoc_no_useless_inheritdoc":true,"phpdoc_return_self_reference":true,"phpdoc_scalar":true,"phpdoc_separation":true,"phpdoc_single_line_var_spacing":true,"phpdoc_summary":true,"phpdoc_to_comment":true,"phpdoc_trim":true,"phpdoc_types":true,"phpdoc_var_without_name":true,"protected_to_private":true,"return_type_declaration":true,"semicolon_after_instruction":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_class_element_per_statement":{"elements":["property"]},"single_quote":true,"space_after_semicolon":{"remove_in_empty_for_expressions":true},"standardize_increment":true,"standardize_not_equals":true,"ternary_operator_spaces":true,"trailing_comma_in_multiline_array":true,"trim_array_spaces":true,"unary_operator_spaces":true,"whitespace_after_comma_in_array":true,"blank_line_after_namespace":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_constants":true,"lowercase_keywords":true,"no_break_comment":true,"no_closing_tag":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":true,"encoding":true,"full_opening_tag":true,"modernize_types_casting":true,"align_multiline_comment":true,"array_syntax":{"syntax":"short"},"combine_consecutive_issets":true,"combine_consecutive_unsets":true,"compact_nullable_typehint":true,"escape_implicit_backslashes":true,"explicit_indirect_variable":true,"explicit_string_variable":true,"final_internal_class":true,"header_comment":{"commentType":"PHPDoc","header":"PHPPgAdmin v6.0.0-beta.48"},"heredoc_to_nowdoc":true,"list_syntax":{"syntax":"long"},"method_chaining_indentation":true,"multiline_comment_opening_closing":true,"no_null_property_initialization":true,"no_short_echo_tag":true,"no_superfluous_elseif":true,"no_unreachable_default_argument_value":true,"no_useless_else":true,"no_useless_return":true,"ordered_imports":true,"php_unit_strict":true,"php_unit_test_annotation":true,"php_unit_test_class_requires_covers":true,"phpdoc_add_missing_param_annotation":true,"phpdoc_order":true,"phpdoc_types_order":true,"strict_param":true},"hashes":{"src\/classes\/ADONewConnection.php":4096316758,"src\/classes\/ADOdbException.php":100396519,"src\/classes\/PluginManager.php":1384214029,"src\/classes\/ADORecordSet.php":488270830,"src\/classes\/ContainerUtils.php":3635454798,"src\/classes\/Translations.php":1397061203,"src\/classes\/ArrayRecordSet.php":293574394,"src\/classes\/Misc.php":42169524,"src\/controllers\/GroupsController.php":2647219580,"src\/controllers\/DbexportController.php":3134795853,"src\/controllers\/RulesController.php":1856488613,"src\/controllers\/OperatorsController.php":1500933488,"src\/controllers\/AlldbController.php":3015774586,"src\/controllers\/LanguagesController.php":2341692510,"src\/controllers\/TypesController.php":680494710,"src\/controllers\/SequencesController.php":2112180046,"src\/controllers\/ServersController.php":2621044212,"src\/controllers\/AcinsertController.php":1680958736,"src\/controllers\/ConversionsController.php":2296230048,"src\/controllers\/SqleditController.php":2980935885,"src\/controllers\/BaseController.php":2643732437,"src\/controllers\/UsersController.php":2170590144,"src\/controllers\/SqlController.php":2720291032,"src\/controllers\/DatabaseController.php":3304174523,"src\/controllers\/TblpropertiesController.php":2820302657,"src\/controllers\/TablespacesController.php":1433882413,"src\/controllers\/DataimportController.php":1766002180,"src\/controllers\/OpclassesController.php":1684304452,"src\/controllers\/HelpController.php":3783648717,"src\/controllers\/ViewsController.php":683976001,"src\/controllers\/DataexportController.php":66279999,"src\/controllers\/ColpropertiesController.php":2832915996,"src\/controllers\/TriggersController.php":3067032466,"src\/controllers\/FunctionsController.php":1489127392,"src\/controllers\/AggregatesController.php":3056156201,"src\/controllers\/SchemasController.php":1494244019,"src\/controllers\/IntroController.php":162204634,"src\/controllers\/DisplayController.php":1067248232,"src\/controllers\/ViewpropertiesController.php":2310391046,"src\/controllers\/InfoController.php":3144559618,"src\/controllers\/TablesController.php":2385551010,"src\/controllers\/FulltextController.php":3834566007,"src\/controllers\/CastsController.php":215694299,"src\/controllers\/LoginController.php":1890792333,"src\/controllers\/DomainsController.php":1461379043,"src\/controllers\/MaterializedviewsController.php":1904438396,"src\/controllers\/BrowserController.php":3172823640,"src\/controllers\/HistoryController.php":3458216549,"src\/controllers\/MaterializedviewpropertiesController.php":3990816451,"src\/controllers\/PrivilegesController.php":3153373008,"src\/controllers\/ConstraintsController.php":3926585956,"src\/controllers\/IndexesController.php":4093570872,"src\/controllers\/RolesController.php":700719971,"src\/database\/Postgres84.php":3167760414,"src\/database\/Postgres81.php":265817261,"src\/database\/Postgres92.php":680691126,"src\/database\/Postgres94.php":3022977465,"src\/database\/Postgres93.php":3816088927,"src\/database\/Postgres83.php":2625090093,"src\/database\/Postgres95.php":1388564181,"src\/database\/Postgres90.php":216599773,"src\/database\/Postgres96.php":655168023,"src\/database\/Postgres74.php":3943631796,"src\/database\/Postgres80.php":156617740,"src\/database\/ADOdbBase.php":1923763512,"src\/database\/Postgres10.php":2569950303,"src\/database\/databasetraits\/OperatorTrait.php":1020030201,"src\/database\/databasetraits\/StatsTrait.php":285383545,"src\/database\/databasetraits\/DatabaseTrait.php":2075553533,"src\/database\/databasetraits\/SequenceTrait.php":2939667975,"src\/database\/databasetraits\/TableTrait.php":2694232022,"src\/database\/databasetraits\/AggregateTrait.php":2097051574,"src\/database\/databasetraits\/TypeTrait.php":2372169338,"src\/database\/databasetraits\/FtsTrait.php":564275068,"src\/database\/databasetraits\/PrivilegesTrait.php":1918659733,"src\/database\/databasetraits\/TablespaceTrait.php":684446378,"src\/database\/databasetraits\/DomainTrait.php":3366342625,"src\/database\/databasetraits\/TriggerTrait.php":1744117428,"src\/database\/databasetraits\/RoleTrait.php":1504872321,"src\/database\/databasetraits\/RowTrait.php":1164049703,"src\/database\/databasetraits\/SchemaTrait.php":710671293,"src\/database\/databasetraits\/ColumnTrait.php":2902049268,"src\/database\/databasetraits\/IndexTrait.php":620119052,"src\/database\/databasetraits\/HasTrait.php":3598621893,"src\/database\/databasetraits\/FunctionTrait.php":763933600,"src\/database\/databasetraits\/ViewTrait.php":2693913279,"src\/database\/Postgres82.php":400682628,"src\/database\/Postgres91.php":3727878865,"src\/database\/Postgres.php":2540440223,"src\/database\/Connection.php":2272604507,"src\/decorators\/ReplaceDecorator.php":3863875947,"src\/decorators\/Decorator.php":531662910,"src\/decorators\/IfEmptyDecorator.php":2167870023,"src\/decorators\/ActionUrlDecorator.php":3133539308,"src\/decorators\/BranchUrlDecorator.php":2989114152,"src\/decorators\/UrlDecorator.php":1088236816,"src\/decorators\/ConcatDecorator.php":1355841812,"src\/decorators\/RedirectUrlDecorator.php":4033347890,"src\/decorators\/ArrayMergeDecorator.php":541211573,"src\/decorators\/CallbackDecorator.php":500383442,"src\/decorators\/FieldDecorator.php":46992872,"src\/help\/PostgresDoc96.php":959593337,"src\/help\/PostgresDoc84.php":365749331,"src\/help\/PostgresDoc80.php":3982184460,"src\/help\/PostgresDoc81.php":1846790493,"src\/help\/PostgresDoc90.php":4087234001,"src\/help\/PostgresDoc83.php":3435761563,"src\/help\/PostgresDoc92.php":1634344585,"src\/help\/PostgresDoc82.php":3799362078,"src\/help\/PostgresDoc95.php":556302625,"src\/help\/PostgresDoc94.php":1250455669,"src\/help\/PostgresDoc91.php":353975383,"src\/help\/PostgresDoc74.php":3828548974,"src\/help\/PostgresDoc93.php":2642761661,"src\/help\/PostgresDoc10.php":4081860562,"src\/translations\/Hebrew.php":2158848479,"src\/translations\/Italian.php":2826054224,"src\/translations\/Galician.php":2062734524,"src\/translations\/Japanese.php":2876334042,"src\/translations\/Dutch.php":702271259,"src\/translations\/Catalan.php":756721383,"src\/translations\/Lithuanian.php":2186202581,"src\/translations\/Mongol.php":3139066440,"src\/translations\/ChineseUtf8ZhTw.php":2823315740,"src\/translations\/ChineseUtf8ZhCn.php":3796928791,"src\/translations\/Ukrainian.php":1141856691,"src\/translations\/PortuguesePt.php":4011861978,"src\/translations\/ChineseTr.php":197001,"src\/translations\/PortugueseBr.php":3669760972,"src\/translations\/RussianUtf8.php":3406732568,"src\/translations\/Greek.php":1861147663,"src\/translations\/Danish.php":1308430745,"src\/translations\/Arabic.php":3736317850,"src\/translations\/Hungarian.php":1887566737,"src\/translations\/Polish.php":2858428984,"src\/translations\/English.php":3079754610,"src\/translations\/Swedish.php":3471972141,"src\/translations\/Romanian.php":2051462386,"src\/translations\/Afrikaans.php":10492947,"src\/translations\/German.php":785142920,"src\/translations\/French.php":2733693086,"src\/translations\/Czech.php":1650652538,"src\/translations\/Spanish.php":1615607016,"src\/translations\/ChineseSim.php":1987357729,"src\/translations\/Russian.php":1794413818,"src\/translations\/Slovak.php":1681929508,"src\/translations\/Turkish.php":2859443267,"src\/xhtml\/HTMLNavbarController.php":1638706140,"src\/xhtml\/HTMLTableController.php":706589469,"src\/xhtml\/HTMLController.php":2240986768,"src\/xhtml\/XHtmlOption.php":1978312352,"src\/xhtml\/XHtmlButton.php":1182895055,"src\/xhtml\/XHtmlSimpleElement.php":3300989242,"src\/xhtml\/XHtmlSelect.php":3881350506,"src\/xhtml\/HTMLFooterController.php":1412248418,"src\/xhtml\/HTMLHeaderController.php":877465411,"src\/xhtml\/TreeController.php":1156598161,"src\/xhtml\/XHtmlElement.php":936323053,"src\/traits\/ExportTrait.php":3149099482,"src\/traits\/ViewsMatViewsPropertiesTrait.php":1078303700,"src\/traits\/ServersTrait.php":3952287451,"src\/traits\/FormTrait.php":2003316482,"src\/traits\/AdminTrait.php":3738204482,"src\/traits\/HelperTrait.php":2351541973,"src\/traits\/ViewsMatviewsTrait.php":3442322761,"src\/traits\/InsertEditRowTrait.php":2055878850,"src\/traits\/MiscTrait.php":16416016,"tests\/simpletest\/config.tests.php":1923893501,"tests\/simpletest\/testcase\/Schemas\/ConversionTest.php":2742425878,"tests\/simpletest\/testcase\/Schemas\/OperatorTest.php":3456930271,"tests\/simpletest\/testcase\/Schemas\/AggregateTest.php":2726971738,"tests\/simpletest\/testcase\/Schemas\/FunctionTest.php":1998965669,"tests\/simpletest\/testcase\/Schemas\/DomainTest.php":4223608383,"tests\/simpletest\/testcase\/Schemas\/TypeTest.php":537433576,"tests\/simpletest\/testcase\/Schemas\/TableTest.php":1954116921,"tests\/simpletest\/testcase\/Schemas\/SequenceTest.php":225733670,"tests\/simpletest\/testcase\/Schemas\/OpClassTest.php":1730415348,"tests\/simpletest\/testcase\/Schemas\/SchemasGroupTest.php":615548268,"tests\/simpletest\/testcase\/Schemas\/ViewTest.php":346217315,"tests\/simpletest\/testcase\/Server\/ServerGroupTest.php":445516021,"tests\/simpletest\/testcase\/Server\/GroupsTest.php":1247948417,"tests\/simpletest\/testcase\/Server\/ReportsTest.php":2208404187,"tests\/simpletest\/testcase\/Server\/UsersTest.php":1262723322,"tests\/simpletest\/testcase\/Server\/TableSpacesTest.php":1935135490,"tests\/simpletest\/testcase\/Databases\/FindObjectsTest.php":3828157655,"tests\/simpletest\/testcase\/Databases\/SqlTest.php":744376525,"tests\/simpletest\/testcase\/Databases\/CastsTest.php":3880622904,"tests\/simpletest\/testcase\/Databases\/LanguageTest.php":1071478996,"tests\/simpletest\/testcase\/Databases\/SchemaBasicTest.php":2796167061,"tests\/simpletest\/testcase\/Databases\/AdminTest.php":3286558137,"tests\/simpletest\/testcase\/Databases\/DatabaseTest.php":1204778496,"tests\/simpletest\/testcase\/Databases\/VariablesTest.php":1902017632,"tests\/simpletest\/testcase\/Databases\/DatabaseGroupTest.php":1162303846,"tests\/simpletest\/testcase\/Databases\/HelpTest.php":1754594659,"tests\/simpletest\/testcase\/Databases\/ProcessesTest.php":1384289381,"tests\/simpletest\/testcase\/Public\/common.php":724275870,"tests\/simpletest\/testcase\/Public\/SetPrecondition.php":287755464,"tests\/simpletest\/testcase\/Tables\/IndexesTest.php":3004158790,"tests\/simpletest\/testcase\/Tables\/ConstraintsTest.php":3158271202,"tests\/simpletest\/testcase\/Tables\/TableGroupTest.php":503995497,"tests\/simpletest\/testcase\/Tables\/DeadlockTest.php":944417422,"tests\/simpletest\/testcase\/Tables\/RulesTest.php":3092169208,"tests\/simpletest\/testcase\/Tables\/ColumnTest.php":2807416621,"tests\/simpletest\/testcase\/Tables\/InfoTest.php":932924755,"tests\/simpletest\/testcase\/Tables\/TriggersTest.php":2740144965,"tests\/simpletest\/testcase\/simpletest.inc.php":2274415542,"tests\/simpletest\/testcase\/phpcoverage.inc.php":3621930486,"tests\/simpletest\/testcase\/testphpPgAdminMain.php":2166081531,"tests\/simpletest\/testcase\/coveragephpPgAdminMain.php":14946206,"tests\/simpletest\/testcase\/Common\/ExportTest.php":703993964,"tests\/simpletest\/testcase\/Common\/ImportTest.php":3855838210,"tests\/simpletest\/testcase\/Common\/CommonGroupTest.php":1714840910,"tests\/simpletest\/testcase\/Common\/SecurityTest.php":1631613606,"tests\/simpletest\/tests.php":107928663,"tests\/unit\/ViewTest.php":2673528129,"tests\/_support\/UnitTester.php":398613712,"tests\/_support\/FunctionalTester.php":3676850534,"tests\/_support\/Helper\/Unit.php":742967139,"tests\/_support\/Helper\/Functional.php":533470627,"tests\/_support\/Helper\/Acceptance.php":911966767,"tests\/_support\/AcceptanceTester.php":426822250,"tests\/_support\/_generated\/UnitTesterActions.php":687463826,"tests\/views\/rules.php":3058733465,"tests\/views\/info.php":4037670760,"tests\/views\/intro.php":526669642,"tests\/views\/database.php":2360309891,"tests\/views\/triggers.php":2692367197,"tests\/views\/functions.php":2434991956,"tests\/views\/dbexport.php":2116017890,"tests\/views\/sql.php":2267095871,"tests\/views\/display.php":1149654908,"tests\/views\/acinsert.php":651131447,"tests\/views\/languages.php":3132439141,"tests\/views\/views.php":2648375649,"tests\/views\/types.php":3020631356,"tests\/views\/conversions.php":2914087046,"tests\/views\/users.php":597235160,"tests\/views\/indexes.php":2708564835,"tests\/views\/login.php":2793558492,"tests\/views\/tables.php":1872736916,"tests\/views\/servers.php":1617707997,"tests\/views\/tblproperties.php":2559134674,"tests\/views\/tablespaces.php":2946864565,"tests\/views\/privileges.php":675172464,"tests\/views\/casts.php":323284439,"tests\/views\/sqledit.php":1432945672,"tests\/views\/fulltext.php":1609314796,"tests\/views\/browser.php":684856377,"tests\/views\/colproperties.php":867432412,"tests\/views\/roles.php":3753603223,"tests\/views\/groups.php":1394613650,"tests\/views\/operators.php":380626684,"tests\/views\/domains.php":1708997660,"tests\/views\/materializedviews.php":1660184202,"tests\/views\/history.php":2383776486,"tests\/views\/alldb.php":4091041976,"tests\/views\/opclasses.php":334951770,"tests\/views\/constraints.php":124359845,"tests\/views\/sequences.php":1623082782,"tests\/views\/schemas.php":3898746384,"tests\/views\/dataimport.php":805632048,"tests\/views\/help.php":577136235,"tests\/views\/dataexport.php":1801006823,"tests\/views\/viewproperties.php":1981160112,"tests\/views\/aggregates.php":676357191,"tests\/views\/materializedviewproperties.php":3379187357,"tests\/selenium\/src\/12-admin.php":2820924158,"tests\/selenium\/src\/01-roles.php":1265283360,"tests\/selenium\/src\/30-view.php":1770282554,"tests\/selenium\/src\/99-cleantests.php":100662185,"tests\/selenium\/src\/15-sequence.php":814291931,"tests\/selenium\/src\/20-constraint.php":1675872666,"tests\/selenium\/src\/25-column.php":4189414868,"tests\/selenium\/src\/06-schema.php":3561568600,"tests\/selenium\/src\/35-index.php":934770155,"tests\/selenium\/src\/04-database.php":1716015625,"tests\/selenium\/src\/10-table.php":2742440982,"tests\/selenium\/src\/08-domaine.php":3906084812,"tests\/selenium\/testBuilder.class.php":2884530163,"tests\/selenium\/TestSuite.php":3264000616}}
\ No newline at end of file +{"php":"7.1.19-1+ubuntu17.10.1+deb.sury.org+1","version":"2.12.1:v2.12.1#beef6cbe6dec7205edcd143842a49f9a691859a6","rules":{"no_php4_constructor":true,"php_unit_namespaced":{"target":"6.0"},"php_unit_dedicate_assert":{"target":"5.6"},"php_unit_expectation":{"target":"5.6"},"php_unit_mock":{"target":"5.5"},"php_unit_no_expectation_annotation":{"target":"4.3"},"binary_operator_spaces":{"align_double_arrow":true,"align_equals":true},"blank_line_after_opening_tag":true,"blank_line_before_statement":true,"braces":true,"cast_spaces":true,"class_attributes_separation":{"elements":["method"]},"class_definition":true,"concat_space":{"spacing":"none"},"declare_equal_normalize":true,"function_typehint_space":true,"include":true,"increment_style":true,"lowercase_cast":true,"lowercase_static_reference":true,"magic_constant_casing":true,"method_argument_space":{"ensure_fully_multiline":true},"native_function_casing":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_blank_lines_after_phpdoc":true,"no_empty_comment":true,"no_empty_phpdoc":true,"no_empty_statement":true,"no_extra_blank_lines":{"tokens":["break","continue","extra","return","throw","use","parenthesis_brace_block","square_brace_block","curly_brace_block"]},"no_leading_import_slash":true,"no_leading_namespace_whitespace":true,"no_mixed_echo_print":{"use":"echo"},"no_multiline_whitespace_around_double_arrow":true,"no_short_bool_cast":true,"no_singleline_whitespace_before_semicolons":true,"no_spaces_around_offset":true,"no_trailing_comma_in_list_call":true,"no_trailing_comma_in_singleline_array":true,"no_unneeded_control_parentheses":true,"no_unneeded_curly_braces":true,"no_unneeded_final_method":true,"no_unused_imports":true,"no_whitespace_before_comma_in_array":true,"no_whitespace_in_blank_line":true,"normalize_index_brace":true,"object_operator_without_whitespace":true,"php_unit_fqcn_annotation":true,"phpdoc_align":true,"phpdoc_annotation_without_dot":true,"phpdoc_indent":true,"phpdoc_inline_tag":true,"phpdoc_no_access":true,"phpdoc_no_alias_tag":true,"phpdoc_no_empty_return":true,"phpdoc_no_useless_inheritdoc":true,"phpdoc_return_self_reference":true,"phpdoc_scalar":true,"phpdoc_separation":true,"phpdoc_single_line_var_spacing":true,"phpdoc_summary":true,"phpdoc_to_comment":true,"phpdoc_trim":true,"phpdoc_types":true,"phpdoc_var_without_name":true,"protected_to_private":true,"return_type_declaration":true,"semicolon_after_instruction":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_class_element_per_statement":{"elements":["property"]},"single_quote":true,"space_after_semicolon":{"remove_in_empty_for_expressions":true},"standardize_increment":true,"standardize_not_equals":true,"ternary_operator_spaces":true,"trailing_comma_in_multiline_array":true,"trim_array_spaces":true,"unary_operator_spaces":true,"whitespace_after_comma_in_array":true,"blank_line_after_namespace":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_constants":true,"lowercase_keywords":true,"no_break_comment":true,"no_closing_tag":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":true,"encoding":true,"full_opening_tag":true,"modernize_types_casting":true,"align_multiline_comment":true,"array_syntax":{"syntax":"short"},"combine_consecutive_issets":true,"combine_consecutive_unsets":true,"compact_nullable_typehint":true,"escape_implicit_backslashes":true,"explicit_indirect_variable":true,"explicit_string_variable":true,"final_internal_class":true,"header_comment":{"commentType":"PHPDoc","header":"PHPPgAdmin v6.0.0-beta.49"},"heredoc_to_nowdoc":true,"list_syntax":{"syntax":"long"},"method_chaining_indentation":true,"multiline_comment_opening_closing":true,"no_null_property_initialization":true,"no_short_echo_tag":true,"no_superfluous_elseif":true,"no_unreachable_default_argument_value":true,"no_useless_else":true,"no_useless_return":true,"ordered_imports":true,"php_unit_strict":true,"php_unit_test_annotation":true,"php_unit_test_class_requires_covers":true,"phpdoc_add_missing_param_annotation":true,"phpdoc_order":true,"phpdoc_types_order":true,"strict_param":true},"hashes":{"src\/classes\/ADONewConnection.php":910426500,"src\/classes\/ADOdbException.php":4069627789,"src\/classes\/PluginManager.php":259760447,"src\/classes\/ADORecordSet.php":1616984565,"src\/classes\/ContainerUtils.php":3506316097,"src\/classes\/Translations.php":1878657610,"src\/classes\/ArrayRecordSet.php":2681189369,"src\/classes\/Misc.php":3632430557,"src\/controllers\/GroupsController.php":2733768813,"src\/controllers\/DbexportController.php":852634226,"src\/controllers\/RulesController.php":2266493266,"src\/controllers\/OperatorsController.php":1164930754,"src\/controllers\/AlldbController.php":982187324,"src\/controllers\/LanguagesController.php":697417686,"src\/controllers\/TypesController.php":69939620,"src\/controllers\/SequencesController.php":2345434986,"src\/controllers\/ServersController.php":3383683444,"src\/controllers\/AcinsertController.php":4220443524,"src\/controllers\/ConversionsController.php":738494657,"src\/controllers\/SqleditController.php":4226242229,"src\/controllers\/BaseController.php":1831131165,"src\/controllers\/UsersController.php":224743327,"src\/controllers\/SqlController.php":4234240745,"src\/controllers\/DatabaseController.php":1234215433,"src\/controllers\/TblpropertiesController.php":363700682,"src\/controllers\/TablespacesController.php":1693938639,"src\/controllers\/DataimportController.php":1260889734,"src\/controllers\/OpclassesController.php":704610060,"src\/controllers\/HelpController.php":264401408,"src\/controllers\/ViewsController.php":3616891814,"src\/controllers\/DataexportController.php":3241512249,"src\/controllers\/ColpropertiesController.php":3383410235,"src\/controllers\/TriggersController.php":3440167130,"src\/controllers\/FunctionsController.php":3832117688,"src\/controllers\/AggregatesController.php":23642680,"src\/controllers\/SchemasController.php":2705062177,"src\/controllers\/IntroController.php":740042277,"src\/controllers\/DisplayController.php":1465979582,"src\/controllers\/ViewpropertiesController.php":676558364,"src\/controllers\/InfoController.php":116987667,"src\/controllers\/TablesController.php":978259845,"src\/controllers\/FulltextController.php":358132307,"src\/controllers\/CastsController.php":4210567206,"src\/controllers\/LoginController.php":1706917705,"src\/controllers\/DomainsController.php":1997297395,"src\/controllers\/MaterializedviewsController.php":3559461098,"src\/controllers\/BrowserController.php":288634423,"src\/controllers\/HistoryController.php":1892951305,"src\/controllers\/MaterializedviewpropertiesController.php":834151968,"src\/controllers\/PrivilegesController.php":1963198696,"src\/controllers\/ConstraintsController.php":900511488,"src\/controllers\/IndexesController.php":3061466969,"src\/controllers\/RolesController.php":3107558635,"src\/database\/Postgres84.php":1345709332,"src\/database\/Postgres81.php":1029904387,"src\/database\/Postgres92.php":1374051338,"src\/database\/Postgres94.php":3958351149,"src\/database\/Postgres93.php":3130696157,"src\/database\/Postgres83.php":1760295605,"src\/database\/Postgres95.php":1418528360,"src\/database\/Postgres90.php":246142843,"src\/database\/Postgres96.php":1421955445,"src\/database\/Postgres74.php":304518586,"src\/database\/Postgres80.php":4277672606,"src\/database\/ADOdbBase.php":4124734626,"src\/database\/Postgres10.php":200425745,"src\/database\/databasetraits\/OperatorTrait.php":3070813288,"src\/database\/databasetraits\/StatsTrait.php":1334669721,"src\/database\/databasetraits\/DatabaseTrait.php":3853368732,"src\/database\/databasetraits\/SequenceTrait.php":1396303736,"src\/database\/databasetraits\/TableTrait.php":914448660,"src\/database\/databasetraits\/AggregateTrait.php":1244078387,"src\/database\/databasetraits\/TypeTrait.php":1028349578,"src\/database\/databasetraits\/FtsTrait.php":1421309302,"src\/database\/databasetraits\/PrivilegesTrait.php":357582326,"src\/database\/databasetraits\/TablespaceTrait.php":2751055293,"src\/database\/databasetraits\/DomainTrait.php":611887803,"src\/database\/databasetraits\/TriggerTrait.php":4270018562,"src\/database\/databasetraits\/RoleTrait.php":1047784178,"src\/database\/databasetraits\/RowTrait.php":3513582548,"src\/database\/databasetraits\/SchemaTrait.php":1140918976,"src\/database\/databasetraits\/ColumnTrait.php":629976537,"src\/database\/databasetraits\/IndexTrait.php":94773081,"src\/database\/databasetraits\/HasTrait.php":3206242940,"src\/database\/databasetraits\/FunctionTrait.php":1276265818,"src\/database\/databasetraits\/ViewTrait.php":3504404958,"src\/database\/Postgres82.php":3901139703,"src\/database\/Postgres91.php":1977298833,"src\/database\/Postgres.php":615429650,"src\/database\/Connection.php":3901160671,"src\/decorators\/ReplaceDecorator.php":3333924392,"src\/decorators\/Decorator.php":1128661457,"src\/decorators\/IfEmptyDecorator.php":2868208149,"src\/decorators\/ActionUrlDecorator.php":2336496621,"src\/decorators\/BranchUrlDecorator.php":66668420,"src\/decorators\/UrlDecorator.php":929740183,"src\/decorators\/ConcatDecorator.php":257958476,"src\/decorators\/RedirectUrlDecorator.php":73144277,"src\/decorators\/ArrayMergeDecorator.php":326931695,"src\/decorators\/CallbackDecorator.php":1333332028,"src\/decorators\/FieldDecorator.php":1784399685,"src\/help\/PostgresDoc96.php":4144057010,"src\/help\/PostgresDoc84.php":162513448,"src\/help\/PostgresDoc80.php":3472604443,"src\/help\/PostgresDoc81.php":3401907328,"src\/help\/PostgresDoc90.php":4026342314,"src\/help\/PostgresDoc83.php":1202286615,"src\/help\/PostgresDoc92.php":622506701,"src\/help\/PostgresDoc82.php":633233804,"src\/help\/PostgresDoc95.php":4011585770,"src\/help\/PostgresDoc94.php":1458263566,"src\/help\/PostgresDoc91.php":158997036,"src\/help\/PostgresDoc74.php":1335832994,"src\/help\/PostgresDoc93.php":3686507996,"src\/help\/PostgresDoc10.php":4281603995,"src\/translations\/Hebrew.php":3157515081,"src\/translations\/Italian.php":647600668,"src\/translations\/Galician.php":1990982585,"src\/translations\/Japanese.php":611827900,"src\/translations\/Dutch.php":1373940430,"src\/translations\/Catalan.php":3369809367,"src\/translations\/Lithuanian.php":265185692,"src\/translations\/Mongol.php":4168627830,"src\/translations\/ChineseUtf8ZhTw.php":3228993024,"src\/translations\/ChineseUtf8ZhCn.php":3733885985,"src\/translations\/Ukrainian.php":19867118,"src\/translations\/PortuguesePt.php":676588959,"src\/translations\/ChineseTr.php":2206378131,"src\/translations\/PortugueseBr.php":640297418,"src\/translations\/RussianUtf8.php":3074213839,"src\/translations\/Greek.php":2337385354,"src\/translations\/Danish.php":3026381294,"src\/translations\/Arabic.php":637845859,"src\/translations\/Hungarian.php":1648694711,"src\/translations\/Polish.php":1052245342,"src\/translations\/English.php":4183707742,"src\/translations\/Swedish.php":4101344417,"src\/translations\/Romanian.php":1012334293,"src\/translations\/Afrikaans.php":694402197,"src\/translations\/German.php":1877165766,"src\/translations\/French.php":2610263126,"src\/translations\/Czech.php":2464320532,"src\/translations\/Spanish.php":2120413233,"src\/translations\/ChineseSim.php":3800450755,"src\/translations\/Russian.php":55106420,"src\/translations\/Slovak.php":1780399349,"src\/translations\/Turkish.php":1262091820,"src\/xhtml\/HTMLNavbarController.php":2284702706,"src\/xhtml\/HTMLTableController.php":317023456,"src\/xhtml\/HTMLController.php":2342068255,"src\/xhtml\/XHtmlOption.php":2061903804,"src\/xhtml\/XHtmlButton.php":3778839255,"src\/xhtml\/XHtmlSimpleElement.php":574461939,"src\/xhtml\/XHtmlSelect.php":1150431849,"src\/xhtml\/HTMLFooterController.php":3412466794,"src\/xhtml\/HTMLHeaderController.php":3041168155,"src\/xhtml\/TreeController.php":4182548872,"src\/xhtml\/XHtmlElement.php":4255294400,"src\/traits\/ExportTrait.php":931644020,"src\/traits\/ViewsMatViewsPropertiesTrait.php":2202074514,"src\/traits\/ServersTrait.php":940869110,"src\/traits\/FormTrait.php":2356352081,"src\/traits\/AdminTrait.php":2075355296,"src\/traits\/HelperTrait.php":761950484,"src\/traits\/ViewsMatviewsTrait.php":105311441,"src\/traits\/InsertEditRowTrait.php":522384411,"src\/traits\/MiscTrait.php":2095764904,"tests\/simpletest\/config.tests.php":2652376547,"tests\/simpletest\/testcase\/Schemas\/ConversionTest.php":2204180883,"tests\/simpletest\/testcase\/Schemas\/OperatorTest.php":1986507357,"tests\/simpletest\/testcase\/Schemas\/AggregateTest.php":4193824189,"tests\/simpletest\/testcase\/Schemas\/FunctionTest.php":2158928874,"tests\/simpletest\/testcase\/Schemas\/DomainTest.php":2928131821,"tests\/simpletest\/testcase\/Schemas\/TypeTest.php":3744192746,"tests\/simpletest\/testcase\/Schemas\/TableTest.php":4185956722,"tests\/simpletest\/testcase\/Schemas\/SequenceTest.php":3179700425,"tests\/simpletest\/testcase\/Schemas\/OpClassTest.php":3713293386,"tests\/simpletest\/testcase\/Schemas\/SchemasGroupTest.php":2671932346,"tests\/simpletest\/testcase\/Schemas\/ViewTest.php":111390219,"tests\/simpletest\/testcase\/Server\/ServerGroupTest.php":683169062,"tests\/simpletest\/testcase\/Server\/GroupsTest.php":1370895011,"tests\/simpletest\/testcase\/Server\/ReportsTest.php":2234881079,"tests\/simpletest\/testcase\/Server\/UsersTest.php":3141797769,"tests\/simpletest\/testcase\/Server\/TableSpacesTest.php":2420349095,"tests\/simpletest\/testcase\/Databases\/FindObjectsTest.php":3485608037,"tests\/simpletest\/testcase\/Databases\/SqlTest.php":1894589633,"tests\/simpletest\/testcase\/Databases\/CastsTest.php":2317553714,"tests\/simpletest\/testcase\/Databases\/LanguageTest.php":2741604092,"tests\/simpletest\/testcase\/Databases\/SchemaBasicTest.php":447372614,"tests\/simpletest\/testcase\/Databases\/AdminTest.php":559730676,"tests\/simpletest\/testcase\/Databases\/DatabaseTest.php":2881427161,"tests\/simpletest\/testcase\/Databases\/VariablesTest.php":2797198924,"tests\/simpletest\/testcase\/Databases\/DatabaseGroupTest.php":748200043,"tests\/simpletest\/testcase\/Databases\/HelpTest.php":1206328201,"tests\/simpletest\/testcase\/Databases\/ProcessesTest.php":3949316074,"tests\/simpletest\/testcase\/Public\/common.php":1709827801,"tests\/simpletest\/testcase\/Public\/SetPrecondition.php":3909033837,"tests\/simpletest\/testcase\/Tables\/IndexesTest.php":648184921,"tests\/simpletest\/testcase\/Tables\/ConstraintsTest.php":4052923281,"tests\/simpletest\/testcase\/Tables\/TableGroupTest.php":170498387,"tests\/simpletest\/testcase\/Tables\/DeadlockTest.php":1974541287,"tests\/simpletest\/testcase\/Tables\/RulesTest.php":661698219,"tests\/simpletest\/testcase\/Tables\/ColumnTest.php":3632730545,"tests\/simpletest\/testcase\/Tables\/InfoTest.php":26124467,"tests\/simpletest\/testcase\/Tables\/TriggersTest.php":3288160397,"tests\/simpletest\/testcase\/simpletest.inc.php":2274415542,"tests\/simpletest\/testcase\/phpcoverage.inc.php":3621930486,"tests\/simpletest\/testcase\/testphpPgAdminMain.php":2888211529,"tests\/simpletest\/testcase\/coveragephpPgAdminMain.php":3596740414,"tests\/simpletest\/testcase\/Common\/ExportTest.php":1992727298,"tests\/simpletest\/testcase\/Common\/ImportTest.php":1946351620,"tests\/simpletest\/testcase\/Common\/CommonGroupTest.php":67625544,"tests\/simpletest\/testcase\/Common\/SecurityTest.php":1568665895,"tests\/simpletest\/tests.php":1812016216,"tests\/unit\/ViewTest.php":1963582744,"tests\/_support\/UnitTester.php":1079348039,"tests\/_support\/FunctionalTester.php":3494863074,"tests\/_support\/Helper\/Unit.php":913256819,"tests\/_support\/Helper\/Functional.php":2196475520,"tests\/_support\/Helper\/Acceptance.php":2877034764,"tests\/_support\/AcceptanceTester.php":303555566,"tests\/_support\/_generated\/UnitTesterActions.php":145142973,"tests\/views\/rules.php":229380996,"tests\/views\/info.php":124578269,"tests\/views\/intro.php":1754552906,"tests\/views\/database.php":1886735727,"tests\/views\/triggers.php":154810171,"tests\/views\/functions.php":895189837,"tests\/views\/dbexport.php":1980519108,"tests\/views\/sql.php":543738795,"tests\/views\/display.php":3093062288,"tests\/views\/acinsert.php":1165159020,"tests\/views\/languages.php":334843395,"tests\/views\/views.php":1780359124,"tests\/views\/types.php":1137587081,"tests\/views\/conversions.php":3697556191,"tests\/views\/users.php":3562802029,"tests\/views\/indexes.php":1571511951,"tests\/views\/login.php":3513933020,"tests\/views\/tables.php":1877492377,"tests\/views\/servers.php":517818512,"tests\/views\/tblproperties.php":1710847124,"tests\/views\/tablespaces.php":3412739569,"tests\/views\/privileges.php":267261004,"tests\/views\/casts.php":3833721698,"tests\/views\/sqledit.php":3857414101,"tests\/views\/fulltext.php":4138485130,"tests\/views\/browser.php":1449336692,"tests\/views\/colproperties.php":561368006,"tests\/views\/roles.php":1682436746,"tests\/views\/groups.php":815631817,"tests\/views\/operators.php":3220148890,"tests\/views\/domains.php":2567375344,"tests\/views\/materializedviews.php":507038725,"tests\/views\/history.php":1926217482,"tests\/views\/alldb.php":69027341,"tests\/views\/opclasses.php":3132522812,"tests\/views\/constraints.php":1992089340,"tests\/views\/sequences.php":3388879736,"tests\/views\/schemas.php":2346694219,"tests\/views\/dataimport.php":399817740,"tests\/views\/help.php":3584260318,"tests\/views\/dataexport.php":1284074203,"tests\/views\/viewproperties.php":2338727414,"tests\/views\/aggregates.php":2351489118,"tests\/views\/materializedviewproperties.php":1012285954,"tests\/selenium\/src\/12-admin.php":2349089484,"tests\/selenium\/src\/01-roles.php":1337538219,"tests\/selenium\/src\/30-view.php":2143290383,"tests\/selenium\/src\/99-cleantests.php":1677785472,"tests\/selenium\/src\/15-sequence.php":1913163360,"tests\/selenium\/src\/20-constraint.php":1009404992,"tests\/selenium\/src\/25-column.php":1343288087,"tests\/selenium\/src\/06-schema.php":2536746763,"tests\/selenium\/src\/35-index.php":792494718,"tests\/selenium\/src\/04-database.php":27503752,"tests\/selenium\/src\/10-table.php":1656841526,"tests\/selenium\/src\/08-domaine.php":2369507539,"tests\/selenium\/testBuilder.class.php":167411495,"tests\/selenium\/TestSuite.php":2271778217}}
\ No newline at end of file diff --git a/composer.json b/composer.json index 7ee86a7f..e3e9f527 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "huasofoundries/phppgadmin6", - "version": "6.0.0-beta.48", + "version": "6.0.0-beta.49", "description": "Like phpmyadmin but for postgres", "type": "project", "license": [ diff --git a/composer.lock b/composer.lock index 8dbbabbf..aa9a4d50 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": "0dbfb3c1942272920d5942291d5ebe3f", + "content-hash": "8ba4c810d267ae1e3cf520bc9a95aad5", "packages": [ { "name": "adodb/adodb-php", @@ -1,5 +1,4 @@ <?php - /** * Single entrypoint of the app */ @@ -93,8 +92,6 @@ $app->post('/redirect/server', function ( $destinationurl = $this->utils->getDestinationWithLastTab('alldb'); return $response->withStatus(302)->withHeader('Location', $destinationurl); - // - //return $response->withStatus(302)->withHeader('Location', $destinationurl); } else { $_server_info = $this->misc->getServerInfo(); diff --git a/src/classes/ADONewConnection.php b/src/classes/ADONewConnection.php index 419f4c01..52c6b9de 100644 --- a/src/classes/ADONewConnection.php +++ b/src/classes/ADONewConnection.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin; diff --git a/src/classes/ADORecordSet.php b/src/classes/ADORecordSet.php index 2d5fa3fa..0235b476 100644 --- a/src/classes/ADORecordSet.php +++ b/src/classes/ADORecordSet.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin; diff --git a/src/classes/ADOdbException.php b/src/classes/ADOdbException.php index bc84cd46..36d0d00f 100644 --- a/src/classes/ADOdbException.php +++ b/src/classes/ADOdbException.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin; diff --git a/src/classes/ArrayRecordSet.php b/src/classes/ArrayRecordSet.php index ed1e679a..f81fd6cc 100644 --- a/src/classes/ArrayRecordSet.php +++ b/src/classes/ArrayRecordSet.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin; diff --git a/src/classes/ContainerUtils.php b/src/classes/ContainerUtils.php index 95854052..2d5c6b5a 100644 --- a/src/classes/ContainerUtils.php +++ b/src/classes/ContainerUtils.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin; diff --git a/src/classes/Misc.php b/src/classes/Misc.php index d40308dc..16db412a 100644 --- a/src/classes/Misc.php +++ b/src/classes/Misc.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin; @@ -284,6 +284,8 @@ class Misc * @param mixed $server_id the id of the server * * @internal mixed $plaform placeholder that will receive the value of the platform + * + * @return \PHPPgAdmin\Database\ADOdbBase the database accessor instance */ public function getDatabaseAccessor($database = '', $server_id = null) { diff --git a/src/classes/PluginManager.php b/src/classes/PluginManager.php index fdf6112b..dc8fd475 100644 --- a/src/classes/PluginManager.php +++ b/src/classes/PluginManager.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin; diff --git a/src/classes/Translations.php b/src/classes/Translations.php index b3344565..f7d18100 100644 --- a/src/classes/Translations.php +++ b/src/classes/Translations.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin; diff --git a/src/controllers/AcinsertController.php b/src/controllers/AcinsertController.php index baff0d2b..e65c684e 100644 --- a/src/controllers/AcinsertController.php +++ b/src/controllers/AcinsertController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/AggregatesController.php b/src/controllers/AggregatesController.php index 3d60b136..6b5bb9cc 100644 --- a/src/controllers/AggregatesController.php +++ b/src/controllers/AggregatesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/AlldbController.php b/src/controllers/AlldbController.php index 483d0f9c..8265d287 100644 --- a/src/controllers/AlldbController.php +++ b/src/controllers/AlldbController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/BaseController.php b/src/controllers/BaseController.php index de16a7c8..c7cd1423 100644 --- a/src/controllers/BaseController.php +++ b/src/controllers/BaseController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/BrowserController.php b/src/controllers/BrowserController.php index ff678e24..97e35ea7 100644 --- a/src/controllers/BrowserController.php +++ b/src/controllers/BrowserController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/CastsController.php b/src/controllers/CastsController.php index 332e1f6e..85895152 100644 --- a/src/controllers/CastsController.php +++ b/src/controllers/CastsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/ColpropertiesController.php b/src/controllers/ColpropertiesController.php index 68071034..43133bb5 100644 --- a/src/controllers/ColpropertiesController.php +++ b/src/controllers/ColpropertiesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/ConstraintsController.php b/src/controllers/ConstraintsController.php index ef895113..ddcab2b9 100644 --- a/src/controllers/ConstraintsController.php +++ b/src/controllers/ConstraintsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/ConversionsController.php b/src/controllers/ConversionsController.php index de9b8ed5..6a020606 100644 --- a/src/controllers/ConversionsController.php +++ b/src/controllers/ConversionsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/DatabaseController.php b/src/controllers/DatabaseController.php index 6c8cd166..83a06ab4 100644 --- a/src/controllers/DatabaseController.php +++ b/src/controllers/DatabaseController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/DataexportController.php b/src/controllers/DataexportController.php index 5e996952..559e94ed 100644 --- a/src/controllers/DataexportController.php +++ b/src/controllers/DataexportController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/DataimportController.php b/src/controllers/DataimportController.php index 63f7ff75..82f518b9 100644 --- a/src/controllers/DataimportController.php +++ b/src/controllers/DataimportController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/DbexportController.php b/src/controllers/DbexportController.php index 29a1acb7..056472f3 100644 --- a/src/controllers/DbexportController.php +++ b/src/controllers/DbexportController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/DisplayController.php b/src/controllers/DisplayController.php index 3f0db459..c1dbceec 100644 --- a/src/controllers/DisplayController.php +++ b/src/controllers/DisplayController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/DomainsController.php b/src/controllers/DomainsController.php index 4747bdf6..5f4941c7 100644 --- a/src/controllers/DomainsController.php +++ b/src/controllers/DomainsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/FulltextController.php b/src/controllers/FulltextController.php index 4e74bfc2..462a7053 100644 --- a/src/controllers/FulltextController.php +++ b/src/controllers/FulltextController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/FunctionsController.php b/src/controllers/FunctionsController.php index a1b3e7c4..5d68d4bc 100644 --- a/src/controllers/FunctionsController.php +++ b/src/controllers/FunctionsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; @@ -75,6 +75,15 @@ class FunctionsController extends BaseController $this->doProperties(); break; + case 'show': + if (isset($_GET['function'], $_GET['function_oid'])) { + $header_template = 'header_highlight.twig'; + $this->showDefinition(); + } else { + $this->doDefault(); + } + + break; default: $this->doDefault(); @@ -431,6 +440,7 @@ class FunctionsController extends BaseController $data = $this->misc->getDatabaseAccessor(); $this->printTrail('function'); + $this->printTabs('function', 'definition'); $this->printTitle($this->lang['stralter'], 'pg.function.alter'); $this->printMsg($msg); @@ -608,6 +618,63 @@ class FunctionsController extends BaseController } /** + * Show the creation sentence for this function. + * + * @param string $fname The function name + * @param int $function_oid The function oid + * + * @return string the navlinks to print at the bottom + */ + public function showDefinition($fname, $function_oid) + { + $data = $this->misc->getDatabaseAccessor(); + + $this->printTrail('function'); + $this->printTabs('function', 'export'); + $this->printTitle($this->lang['strproperties'], 'pg.function'); + + $fname = str_replace(' ', '', $f); + $funcdata = $data->getFunctionDef($function_oid); + $func_full = ''; + if ($funcdata->recordCount() <= 0) { + echo "<p>{$this->lang['strnodata']}</p>".PHP_EOL; + + return $this->_printNavLinks('functions-properties', $func_full); + } + + echo '<table style="width: 95%">'.PHP_EOL; + + $fnlang = strtolower($funcdata->fields['prolanguage']); + echo '<tr><td class="data1" colspan="4">'; + echo sprintf('<pre><code class="sql hljs">%s', PHP_EOL); + + echo sprintf('%s--%s', PHP_EOL, PHP_EOL); + echo sprintf('-- Name: %s; Type: FUNCTION; Schema: %s; Owner: %s', $fname, $funcdata->fields['nspname'], $funcdata->fields['relowner']); + echo sprintf('%s--%s%s', PHP_EOL, PHP_EOL, PHP_EOL); + + echo sprintf('%s;', $funcdata->fields['pg_get_functiondef']); + + echo sprintf('%s%sALTER FUNCTION %s OWNER TO %s;%s', PHP_EOL, PHP_EOL, $fname, $funcdata->fields['relowner'], PHP_EOL); + + // Show comment if any + if (null !== $funcdata->fields['relcomment']) { + echo sprintf('%s--%s', PHP_EOL, PHP_EOL); + echo sprintf('-- Name: %s; Type: COMMENT; Schema: %s; Owner: %s', $fname, $funcdata->fields['nspname'], $funcdata->fields['relowner']); + echo sprintf('%s--%s%s', PHP_EOL, PHP_EOL, PHP_EOL); + echo sprintf("%sCOMMENT ON FUNCTION %s.%s IS '%s';%s", PHP_EOL, $funcdata->fields['nspname'], $fname, $funcdata->fields['relcomment'], PHP_EOL); + //echo '<p class="comment">', $this->misc->printVal($funcdata->fields['relcomment']), '</p>' . PHP_EOL; + } + + echo sprintf('%s</code></pre>', PHP_EOL); + + echo '</td></tr>'.PHP_EOL; + + echo '</table>'.PHP_EOL; + + return $this->_printNavLinks('functions-properties', $func_full); + } + + /** * Show read only properties of a function. * * @param mixed $msg @@ -617,6 +684,7 @@ class FunctionsController extends BaseController $data = $this->misc->getDatabaseAccessor(); $this->printTrail('function'); + $this->printTabs('function', 'definition'); $this->printTitle($this->lang['strproperties'], 'pg.function'); $this->printMsg($msg); @@ -710,7 +778,8 @@ class FunctionsController extends BaseController } if ($confirm) { - $this->printTrail('schema'); + $this->printTrail('function'); + $this->printTabs('function', 'definition'); $this->printTitle($this->lang['strdrop'], 'pg.function.drop'); echo '<form action="'.\SUBFOLDER.'/src/views/functions" method="post">'.PHP_EOL; diff --git a/src/controllers/GroupsController.php b/src/controllers/GroupsController.php index 66f6d698..5691d508 100644 --- a/src/controllers/GroupsController.php +++ b/src/controllers/GroupsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/HelpController.php b/src/controllers/HelpController.php index 66c5c821..4979890a 100644 --- a/src/controllers/HelpController.php +++ b/src/controllers/HelpController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/HistoryController.php b/src/controllers/HistoryController.php index f9d32208..3f516c7b 100644 --- a/src/controllers/HistoryController.php +++ b/src/controllers/HistoryController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/IndexesController.php b/src/controllers/IndexesController.php index 915d3dd4..8a888dfe 100644 --- a/src/controllers/IndexesController.php +++ b/src/controllers/IndexesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/InfoController.php b/src/controllers/InfoController.php index 0f28f60a..380ff4a8 100644 --- a/src/controllers/InfoController.php +++ b/src/controllers/InfoController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/IntroController.php b/src/controllers/IntroController.php index 3dc5e9d5..34196605 100644 --- a/src/controllers/IntroController.php +++ b/src/controllers/IntroController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/LanguagesController.php b/src/controllers/LanguagesController.php index 3d5392a8..8b38719f 100644 --- a/src/controllers/LanguagesController.php +++ b/src/controllers/LanguagesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/LoginController.php b/src/controllers/LoginController.php index 38e94d71..5d06b740 100644 --- a/src/controllers/LoginController.php +++ b/src/controllers/LoginController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/MaterializedviewpropertiesController.php b/src/controllers/MaterializedviewpropertiesController.php index 6914640d..55cf482f 100644 --- a/src/controllers/MaterializedviewpropertiesController.php +++ b/src/controllers/MaterializedviewpropertiesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/MaterializedviewsController.php b/src/controllers/MaterializedviewsController.php index eff43396..5495fc65 100644 --- a/src/controllers/MaterializedviewsController.php +++ b/src/controllers/MaterializedviewsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/OpclassesController.php b/src/controllers/OpclassesController.php index 69353038..f4de0c09 100644 --- a/src/controllers/OpclassesController.php +++ b/src/controllers/OpclassesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/OperatorsController.php b/src/controllers/OperatorsController.php index 48480ab0..9b7ff90f 100644 --- a/src/controllers/OperatorsController.php +++ b/src/controllers/OperatorsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/PrivilegesController.php b/src/controllers/PrivilegesController.php index a5599982..e2eb3643 100644 --- a/src/controllers/PrivilegesController.php +++ b/src/controllers/PrivilegesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; @@ -67,6 +67,7 @@ class PrivilegesController extends BaseController 'table', 'column', 'view', + 'function', ], true)) { $this->printTabs($subject, 'privileges'); } else { diff --git a/src/controllers/RolesController.php b/src/controllers/RolesController.php index 2809a7d4..10b888cf 100644 --- a/src/controllers/RolesController.php +++ b/src/controllers/RolesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; @@ -120,6 +120,10 @@ class RolesController extends BaseController 'url' => \SUBFOLDER."/redirect/role?action=properties&{$this->misc->href}&", 'vars' => ['rolename' => 'rolname'], ], + 'group' => [ + 'title' => $this->lang['strgroup'], + 'field' => Decorator::field('group'), + ], 'superuser' => [ 'title' => $this->lang['strsuper'], 'field' => Decorator::field('rolsuper'), diff --git a/src/controllers/RulesController.php b/src/controllers/RulesController.php index b081e788..ef2b9b3f 100644 --- a/src/controllers/RulesController.php +++ b/src/controllers/RulesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/SchemasController.php b/src/controllers/SchemasController.php index 26473e65..8ac25e4d 100644 --- a/src/controllers/SchemasController.php +++ b/src/controllers/SchemasController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/SequencesController.php b/src/controllers/SequencesController.php index 0e99fe95..9f332584 100644 --- a/src/controllers/SequencesController.php +++ b/src/controllers/SequencesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/ServersController.php b/src/controllers/ServersController.php index 20e07a55..d3359616 100644 --- a/src/controllers/ServersController.php +++ b/src/controllers/ServersController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/SqlController.php b/src/controllers/SqlController.php index 8846ec16..482d493c 100644 --- a/src/controllers/SqlController.php +++ b/src/controllers/SqlController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/SqleditController.php b/src/controllers/SqleditController.php index ac0d968a..1db9b261 100644 --- a/src/controllers/SqleditController.php +++ b/src/controllers/SqleditController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/TablesController.php b/src/controllers/TablesController.php index 247ccfa1..07e04927 100644 --- a/src/controllers/TablesController.php +++ b/src/controllers/TablesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/TablespacesController.php b/src/controllers/TablespacesController.php index a34b733c..1d630d99 100644 --- a/src/controllers/TablespacesController.php +++ b/src/controllers/TablespacesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/TblpropertiesController.php b/src/controllers/TblpropertiesController.php index f0528601..67752f00 100644 --- a/src/controllers/TblpropertiesController.php +++ b/src/controllers/TblpropertiesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; @@ -795,10 +795,10 @@ class TblpropertiesController extends BaseController echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" />".PHP_EOL; echo '</form>'.PHP_EOL; } else { - $status = $data->dropColumn($_POST['table'], $_POST['column'], isset($_POST['cascade'])); + list($status, $sql) = $data->dropColumn($_POST['table'], $_POST['column'], isset($_POST['cascade'])); if (0 == $status) { $misc->setReloadBrowser(true); - $this->doDefault($this->lang['strcolumndropped']); + $this->doDefault(sprintf('%s %s %s', $sql, PHP_EOL, $this->lang['strcolumndropped'])); } else { $this->doDefault($this->lang['strcolumndroppedbad']); } diff --git a/src/controllers/TriggersController.php b/src/controllers/TriggersController.php index 74c5e841..8c8ec174 100644 --- a/src/controllers/TriggersController.php +++ b/src/controllers/TriggersController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/TypesController.php b/src/controllers/TypesController.php index eccbd019..bc0a2de2 100644 --- a/src/controllers/TypesController.php +++ b/src/controllers/TypesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/UsersController.php b/src/controllers/UsersController.php index 6919cc20..b74a8542 100644 --- a/src/controllers/UsersController.php +++ b/src/controllers/UsersController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; @@ -112,6 +112,10 @@ class UsersController extends BaseController 'title' => $this->lang['strusername'], 'field' => Decorator::field('usename'), ], + 'group' => [ + 'title' => $this->lang['strgroup'], + 'field' => Decorator::field('group'), + ], 'superuser' => [ 'title' => $this->lang['strsuper'], 'field' => Decorator::field('usesuper'), diff --git a/src/controllers/ViewpropertiesController.php b/src/controllers/ViewpropertiesController.php index c81d51e7..e89b5817 100644 --- a/src/controllers/ViewpropertiesController.php +++ b/src/controllers/ViewpropertiesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/ViewsController.php b/src/controllers/ViewsController.php index c66b3306..dd8c82d0 100644 --- a/src/controllers/ViewsController.php +++ b/src/controllers/ViewsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Controller; diff --git a/src/database/ADOdbBase.php b/src/database/ADOdbBase.php index 783a7300..8ce25a8a 100644 --- a/src/database/ADOdbBase.php +++ b/src/database/ADOdbBase.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Database; @@ -177,10 +177,13 @@ class ADOdbBase public function execute($sql) { // Execute the statement - $rs = $this->conn->Execute($sql); + try { + $rs = $this->conn->Execute($sql); - // If failure, return error value - return $this->conn->ErrorNo(); + return $this->conn->ErrorNo(); + } catch (\Exception $e) { + return $e->getCode(); + } } /** @@ -202,13 +205,13 @@ class ADOdbBase public function selectSet($sql) { // Execute the statement - $rs = $this->conn->Execute($sql); + try { + $rs = $this->conn->Execute($sql); - if (!$rs) { - return $this->conn->ErrorNo(); + return $rs; + } catch (\Exception $e) { + return $e->getCode(); } - - return $rs; } /** diff --git a/src/database/Connection.php b/src/database/Connection.php index 542f258d..a4500ccd 100644 --- a/src/database/Connection.php +++ b/src/database/Connection.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres.php b/src/database/Postgres.php index eff281cb..0c386c0b 100644 --- a/src/database/Postgres.php +++ b/src/database/Postgres.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres10.php b/src/database/Postgres10.php index 2df7a573..694db9b6 100644 --- a/src/database/Postgres10.php +++ b/src/database/Postgres10.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres74.php b/src/database/Postgres74.php index a987c461..29947136 100644 --- a/src/database/Postgres74.php +++ b/src/database/Postgres74.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Database; @@ -323,6 +323,7 @@ class Postgres74 extends Postgres80 $oldtype, $comment ) { + $sql = ''; $status = $this->beginTransaction(); if ($status != 0) { return -1; @@ -355,7 +356,7 @@ class Postgres74 extends Postgres80 // Rename the column, if it has been changed if ($column != $name) { - $status = $this->renameColumn($table, $column, $name); + list($status, $sql) = $this->renameColumn($table, $column, $name); if ($status != 0) { $this->rollbackTransaction(); @@ -374,7 +375,7 @@ class Postgres74 extends Postgres80 return -5; } - return $this->endTransaction(); + return [$this->endTransaction(), $sql]; } /** diff --git a/src/database/Postgres80.php b/src/database/Postgres80.php index 01e88b2a..b204ac9c 100644 --- a/src/database/Postgres80.php +++ b/src/database/Postgres80.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres81.php b/src/database/Postgres81.php index 662fe966..aebe7592 100644 --- a/src/database/Postgres81.php +++ b/src/database/Postgres81.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres82.php b/src/database/Postgres82.php index bbdda825..ae271c64 100644 --- a/src/database/Postgres82.php +++ b/src/database/Postgres82.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres83.php b/src/database/Postgres83.php index 0228c1ee..93594803 100644 --- a/src/database/Postgres83.php +++ b/src/database/Postgres83.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres84.php b/src/database/Postgres84.php index 2c09c7e0..1d431d11 100644 --- a/src/database/Postgres84.php +++ b/src/database/Postgres84.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres90.php b/src/database/Postgres90.php index 57ed91dc..2c9e95cc 100644 --- a/src/database/Postgres90.php +++ b/src/database/Postgres90.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres91.php b/src/database/Postgres91.php index 80f3db99..41987b2d 100644 --- a/src/database/Postgres91.php +++ b/src/database/Postgres91.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres92.php b/src/database/Postgres92.php index e6e96c87..181bed85 100644 --- a/src/database/Postgres92.php +++ b/src/database/Postgres92.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres93.php b/src/database/Postgres93.php index abdfb771..341c979b 100644 --- a/src/database/Postgres93.php +++ b/src/database/Postgres93.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres94.php b/src/database/Postgres94.php index f7a837d7..66adbd02 100644 --- a/src/database/Postgres94.php +++ b/src/database/Postgres94.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres95.php b/src/database/Postgres95.php index 09f07f87..399e096b 100644 --- a/src/database/Postgres95.php +++ b/src/database/Postgres95.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres96.php b/src/database/Postgres96.php index cd5db8ea..e25f8a1f 100644 --- a/src/database/Postgres96.php +++ b/src/database/Postgres96.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Database; diff --git a/src/database/databasetraits/AggregateTrait.php b/src/database/databasetraits/AggregateTrait.php index 354fb733..a8b96bd5 100644 --- a/src/database/databasetraits/AggregateTrait.php +++ b/src/database/databasetraits/AggregateTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/ColumnTrait.php b/src/database/databasetraits/ColumnTrait.php index 6b5b466c..0f7a451f 100644 --- a/src/database/databasetraits/ColumnTrait.php +++ b/src/database/databasetraits/ColumnTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Database\Traits; @@ -130,8 +130,9 @@ trait ColumnTrait $comment ) { // Begin transaction - $status = $this->beginTransaction(); - $sql = ''; + $status = $this->beginTransaction(); + $sql = ''; + $sqlrename = ''; if ($status != 0) { $this->rollbackTransaction(); @@ -140,7 +141,7 @@ trait ColumnTrait // Rename the column, if it has been changed if ($column != $name) { - $status = $this->renameColumn($table, $column, $name); + list($status, $sqlrename) = $this->renameColumn($table, $column, $name); if ($status != 0) { $this->rollbackTransaction(); @@ -224,7 +225,7 @@ trait ColumnTrait return [-5, $sql]; } - return [$this->endTransaction(), $sql]; + return [$this->endTransaction(), $sqlrename.'<br>'.$sql]; } /** @@ -234,7 +235,7 @@ trait ColumnTrait * @param string $column The column to be renamed * @param string $newName The new name for the column * - * @return int 0 if operation was successful + * @return array [0 if operation was successful, sql of sentence] */ public function renameColumn($table, $column, $newName) { @@ -246,7 +247,9 @@ trait ColumnTrait $sql = "ALTER TABLE \"{$f_schema}\".\"{$table}\" RENAME COLUMN \"{$column}\" TO \"{$newName}\""; - return $this->execute($sql); + $status = $this->execute($sql); + + return [$status, $sql]; } /** @@ -312,7 +315,9 @@ trait ColumnTrait $sql .= ' CASCADE'; } - return $this->execute($sql); + $status = $this->execute($sql); + + return [$status, $sql]; } /** diff --git a/src/database/databasetraits/DatabaseTrait.php b/src/database/databasetraits/DatabaseTrait.php index b80b2b67..abdbb7aa 100644 --- a/src/database/databasetraits/DatabaseTrait.php +++ b/src/database/databasetraits/DatabaseTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/DomainTrait.php b/src/database/databasetraits/DomainTrait.php index e8ff2dae..c5522a46 100644 --- a/src/database/databasetraits/DomainTrait.php +++ b/src/database/databasetraits/DomainTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/FtsTrait.php b/src/database/databasetraits/FtsTrait.php index 02f09ed6..2a8a709a 100644 --- a/src/database/databasetraits/FtsTrait.php +++ b/src/database/databasetraits/FtsTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/FunctionTrait.php b/src/database/databasetraits/FunctionTrait.php index 0fbfea6d..884430dd 100644 --- a/src/database/databasetraits/FunctionTrait.php +++ b/src/database/databasetraits/FunctionTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Database\Traits; @@ -375,6 +375,35 @@ trait FunctionTrait return $this->selectSet($sql); } + /** + * Returns plain definition for a particular function. + * + * @param int $function_oid + * + * @return \PHPPgAdmin\ADORecordSet Function definition + */ + public function getFunctionDef($function_oid) + { + $this->clean($function_oid); + $sql = " + SELECT + f.proname as relname, + n.nspname, + u.usename AS relowner, + pg_catalog.obj_description(f.oid, 'pg_proc') as relcomment, + (SELECT spcname FROM pg_catalog.pg_tablespace pt WHERE pt.oid=f.pronamespace) AS tablespace, + pg_get_functiondef(f.oid), + pl.lanname AS prolanguage + FROM pg_catalog.pg_proc f + JOIN pg_catalog.pg_namespace n ON (f.pronamespace = n.oid) + JOIN pg_catalog.pg_language pl ON pl.oid = f.prolang + LEFT JOIN pg_catalog.pg_user u ON u.usesysid=f.proowner + WHERE f.oid='{$function_oid}' + "; + + return $this->selectSet($sql); + } + abstract public function fieldClean(&$str); abstract public function beginTransaction(); diff --git a/src/database/databasetraits/HasTrait.php b/src/database/databasetraits/HasTrait.php index 44f35921..7e3a14f9 100644 --- a/src/database/databasetraits/HasTrait.php +++ b/src/database/databasetraits/HasTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/IndexTrait.php b/src/database/databasetraits/IndexTrait.php index 58cd8fa0..4f2f2b68 100644 --- a/src/database/databasetraits/IndexTrait.php +++ b/src/database/databasetraits/IndexTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/OperatorTrait.php b/src/database/databasetraits/OperatorTrait.php index 9f75107f..0d902c47 100644 --- a/src/database/databasetraits/OperatorTrait.php +++ b/src/database/databasetraits/OperatorTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/PrivilegesTrait.php b/src/database/databasetraits/PrivilegesTrait.php index 88ff4acb..dbbc6ef7 100644 --- a/src/database/databasetraits/PrivilegesTrait.php +++ b/src/database/databasetraits/PrivilegesTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/RoleTrait.php b/src/database/databasetraits/RoleTrait.php index 74fd5afe..cdb301f5 100644 --- a/src/database/databasetraits/RoleTrait.php +++ b/src/database/databasetraits/RoleTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Database\Traits; @@ -21,9 +21,21 @@ trait RoleTrait public function getRoles($rolename = '') { $sql = ' - SELECT rolname, rolsuper, rolcreatedb, rolcreaterole, rolinherit, - rolcanlogin, rolconnlimit, rolvaliduntil, rolconfig - FROM pg_catalog.pg_roles'; + SELECT + r.rolname, + r1.rolname as group, + r.rolsuper, + r.rolcreatedb, + r.rolcreaterole, + r.rolinherit, + r.rolcanlogin, + r.rolconnlimit, + r.rolvaliduntil, + r.rolconfig + FROM pg_catalog.pg_roles r + LEFT JOIN pg_catalog.pg_auth_members m ON (m.member = r.oid) + LEFT JOIN pg_roles r1 ON (m.roleid=r1.oid) + '; if ($rolename) { $sql .= " WHERE rolname!='{$rolename}'"; } @@ -45,9 +57,21 @@ trait RoleTrait $this->clean($rolename); $sql = " - SELECT rolname, rolsuper, rolcreatedb, rolcreaterole, rolinherit, - rolcanlogin, rolconnlimit, rolvaliduntil, rolconfig - FROM pg_catalog.pg_roles WHERE rolname='{$rolename}'"; + SELECT + r.rolname, + r1.rolname as group, + r.rolsuper, + r.rolcreatedb, + r.rolcreaterole, + r.rolinherit, + r.rolcanlogin, + r.rolconnlimit, + r.rolvaliduntil, + r.rolconfig + FROM pg_catalog.pg_roles r + LEFT JOIN pg_catalog.pg_auth_members m ON (m.member = r.oid) + LEFT JOIN pg_roles r1 ON (m.roleid=r1.oid) + WHERE rolname='{$rolename}'"; return $this->selectSet($sql); } @@ -59,9 +83,15 @@ trait RoleTrait */ public function getUsers() { - $sql = 'SELECT usename, usesuper, usecreatedb, valuntil AS useexpires, useconfig - FROM pg_user - ORDER BY usename'; + $sql = 'SELECT + r.usename, + r1.rolname as group, + r.usesuper, + r.valuntil AS useexpires, + r.useconfig + FROM pg_catalog.pg_user r + LEFT JOIN pg_catalog.pg_auth_members m ON (m.member = r.usesysid) + LEFT JOIN pg_roles r1 ON (m.roleid=r1.oid)'; return $this->selectSet($sql); } @@ -77,9 +107,16 @@ trait RoleTrait { $this->clean($username); - $sql = "SELECT usename, usesuper, usecreatedb, valuntil AS useexpires, useconfig - FROM pg_user - WHERE usename='{$username}'"; + $sql = "SELECT + r.usename, + r1.rolname as group, + r.usesuper, + r.valuntil AS useexpires, + r.useconfig + FROM pg_catalog.pg_user r + LEFT JOIN pg_catalog.pg_auth_members m ON (m.member = r.usesysid) + LEFT JOIN pg_roles r1 ON (m.roleid=r1.oid) + WHERE r.usename='{$username}'"; return $this->selectSet($sql); } diff --git a/src/database/databasetraits/RowTrait.php b/src/database/databasetraits/RowTrait.php index 3440af3f..7e512511 100644 --- a/src/database/databasetraits/RowTrait.php +++ b/src/database/databasetraits/RowTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/SchemaTrait.php b/src/database/databasetraits/SchemaTrait.php index 92bbaf49..5fb270d6 100644 --- a/src/database/databasetraits/SchemaTrait.php +++ b/src/database/databasetraits/SchemaTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/SequenceTrait.php b/src/database/databasetraits/SequenceTrait.php index 9cbda431..998aaa7d 100644 --- a/src/database/databasetraits/SequenceTrait.php +++ b/src/database/databasetraits/SequenceTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/StatsTrait.php b/src/database/databasetraits/StatsTrait.php index 074a339e..6018a77f 100644 --- a/src/database/databasetraits/StatsTrait.php +++ b/src/database/databasetraits/StatsTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/TableTrait.php b/src/database/databasetraits/TableTrait.php index 813d966b..69558944 100644 --- a/src/database/databasetraits/TableTrait.php +++ b/src/database/databasetraits/TableTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/TablespaceTrait.php b/src/database/databasetraits/TablespaceTrait.php index be7b090c..1f587ea1 100644 --- a/src/database/databasetraits/TablespaceTrait.php +++ b/src/database/databasetraits/TablespaceTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/TriggerTrait.php b/src/database/databasetraits/TriggerTrait.php index bbde65f3..c012c7c5 100644 --- a/src/database/databasetraits/TriggerTrait.php +++ b/src/database/databasetraits/TriggerTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/TypeTrait.php b/src/database/databasetraits/TypeTrait.php index 82b66c8e..00756384 100644 --- a/src/database/databasetraits/TypeTrait.php +++ b/src/database/databasetraits/TypeTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/ViewTrait.php b/src/database/databasetraits/ViewTrait.php index 7857317b..9dadd1b8 100644 --- a/src/database/databasetraits/ViewTrait.php +++ b/src/database/databasetraits/ViewTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/decorators/ActionUrlDecorator.php b/src/decorators/ActionUrlDecorator.php index 3c8bb922..119e5e1e 100644 --- a/src/decorators/ActionUrlDecorator.php +++ b/src/decorators/ActionUrlDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/ArrayMergeDecorator.php b/src/decorators/ArrayMergeDecorator.php index 826c1445..cfbfb754 100644 --- a/src/decorators/ArrayMergeDecorator.php +++ b/src/decorators/ArrayMergeDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/BranchUrlDecorator.php b/src/decorators/BranchUrlDecorator.php index 0b34e737..95702939 100644 --- a/src/decorators/BranchUrlDecorator.php +++ b/src/decorators/BranchUrlDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/CallbackDecorator.php b/src/decorators/CallbackDecorator.php index 7395a2fc..51f3d035 100644 --- a/src/decorators/CallbackDecorator.php +++ b/src/decorators/CallbackDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/ConcatDecorator.php b/src/decorators/ConcatDecorator.php index fb02cf40..63aa516b 100644 --- a/src/decorators/ConcatDecorator.php +++ b/src/decorators/ConcatDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/Decorator.php b/src/decorators/Decorator.php index d3d52699..e550278e 100644 --- a/src/decorators/Decorator.php +++ b/src/decorators/Decorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/FieldDecorator.php b/src/decorators/FieldDecorator.php index 9f291ea2..25a64b34 100644 --- a/src/decorators/FieldDecorator.php +++ b/src/decorators/FieldDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/IfEmptyDecorator.php b/src/decorators/IfEmptyDecorator.php index 8ba487e7..4a19c3dc 100644 --- a/src/decorators/IfEmptyDecorator.php +++ b/src/decorators/IfEmptyDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/RedirectUrlDecorator.php b/src/decorators/RedirectUrlDecorator.php index c885533f..af4b1db3 100644 --- a/src/decorators/RedirectUrlDecorator.php +++ b/src/decorators/RedirectUrlDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/ReplaceDecorator.php b/src/decorators/ReplaceDecorator.php index 9547bacd..3d741a2f 100644 --- a/src/decorators/ReplaceDecorator.php +++ b/src/decorators/ReplaceDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/UrlDecorator.php b/src/decorators/UrlDecorator.php index a0af6522..003aa8f9 100644 --- a/src/decorators/UrlDecorator.php +++ b/src/decorators/UrlDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Decorators; diff --git a/src/help/PostgresDoc10.php b/src/help/PostgresDoc10.php index 88cd681f..d29062c1 100644 --- a/src/help/PostgresDoc10.php +++ b/src/help/PostgresDoc10.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc74.php b/src/help/PostgresDoc74.php index 2e10fe49..f31266f2 100644 --- a/src/help/PostgresDoc74.php +++ b/src/help/PostgresDoc74.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc80.php b/src/help/PostgresDoc80.php index a8666739..33df0464 100644 --- a/src/help/PostgresDoc80.php +++ b/src/help/PostgresDoc80.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc81.php b/src/help/PostgresDoc81.php index 85282e49..c39e1999 100644 --- a/src/help/PostgresDoc81.php +++ b/src/help/PostgresDoc81.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc82.php b/src/help/PostgresDoc82.php index 3d1d10aa..5066632c 100644 --- a/src/help/PostgresDoc82.php +++ b/src/help/PostgresDoc82.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc83.php b/src/help/PostgresDoc83.php index 7059c009..f53d3e63 100644 --- a/src/help/PostgresDoc83.php +++ b/src/help/PostgresDoc83.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc84.php b/src/help/PostgresDoc84.php index 2fe5c276..a38de28a 100644 --- a/src/help/PostgresDoc84.php +++ b/src/help/PostgresDoc84.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc90.php b/src/help/PostgresDoc90.php index b915cc5d..8da1ba50 100644 --- a/src/help/PostgresDoc90.php +++ b/src/help/PostgresDoc90.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc91.php b/src/help/PostgresDoc91.php index 70db00d8..f95269dd 100644 --- a/src/help/PostgresDoc91.php +++ b/src/help/PostgresDoc91.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc92.php b/src/help/PostgresDoc92.php index b2acc10e..7ffa0f95 100644 --- a/src/help/PostgresDoc92.php +++ b/src/help/PostgresDoc92.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc93.php b/src/help/PostgresDoc93.php index d4c53119..ba50b522 100644 --- a/src/help/PostgresDoc93.php +++ b/src/help/PostgresDoc93.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc94.php b/src/help/PostgresDoc94.php index 6d14d520..2c1ed082 100644 --- a/src/help/PostgresDoc94.php +++ b/src/help/PostgresDoc94.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc95.php b/src/help/PostgresDoc95.php index 9974815f..55561004 100644 --- a/src/help/PostgresDoc95.php +++ b/src/help/PostgresDoc95.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc96.php b/src/help/PostgresDoc96.php index 1ddb5288..dc4e2198 100644 --- a/src/help/PostgresDoc96.php +++ b/src/help/PostgresDoc96.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Help; diff --git a/src/traits/AdminTrait.php b/src/traits/AdminTrait.php index 5cd993af..cc400b9a 100644 --- a/src/traits/AdminTrait.php +++ b/src/traits/AdminTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Traits; diff --git a/src/traits/ExportTrait.php b/src/traits/ExportTrait.php index 629315de..1ac945ef 100644 --- a/src/traits/ExportTrait.php +++ b/src/traits/ExportTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Traits; diff --git a/src/traits/FormTrait.php b/src/traits/FormTrait.php index be99857b..7f3ee6f3 100644 --- a/src/traits/FormTrait.php +++ b/src/traits/FormTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Traits; diff --git a/src/traits/HelperTrait.php b/src/traits/HelperTrait.php index 0c7c4229..f72c7977 100644 --- a/src/traits/HelperTrait.php +++ b/src/traits/HelperTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Traits; diff --git a/src/traits/InsertEditRowTrait.php b/src/traits/InsertEditRowTrait.php index 17558b6c..b00fab9f 100644 --- a/src/traits/InsertEditRowTrait.php +++ b/src/traits/InsertEditRowTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Traits; diff --git a/src/traits/MiscTrait.php b/src/traits/MiscTrait.php index 96e6faa5..4beff4e3 100644 --- a/src/traits/MiscTrait.php +++ b/src/traits/MiscTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Traits; @@ -419,6 +419,756 @@ trait MiscTrait } /** + * Gets the tabs for root view. + * + * @param array $lang The language array + * @param \PHPPgAdmin\Database\ADOdbBase $data The database accesor instance + * + * @return array The tabs for root view + */ + public function getTabsRoot($lang, $data) + { + $tabs = [ + 'intro' => [ + 'title' => $lang['strintroduction'], + 'url' => 'intro', + 'icon' => 'Introduction', + ], + 'servers' => [ + 'title' => $lang['strservers'], + 'url' => 'servers', + 'icon' => 'Servers', + ], + ]; + + return $tabs; + } + + /** + * Gets the tabs for server view. + * + * @param array $lang The language array + * @param \PHPPgAdmin\Database\ADOdbBase $data The database accesor instance + * + * @return array The tabs for server view + */ + public function getTabsServer($lang, $data) + { + $hide_users = true; + $hide_roles = false; + if ($data) { + $hide_users = !$data->isSuperUser(); + } + + $tabs = [ + 'databases' => [ + 'title' => $lang['strdatabases'], + 'url' => 'alldb', + 'urlvars' => ['subject' => 'server'], + 'help' => 'pg.database', + 'icon' => 'Databases', + ], + 'users' => [ + 'title' => $lang['strusers'], + 'url' => 'users', + 'urlvars' => ['subject' => 'server'], + 'hide' => $hide_roles, + 'help' => 'pg.user', + 'icon' => 'Users', + ], + ]; + + if ($data && $data->hasRoles()) { + $tabs = array_merge($tabs, [ + 'roles' => [ + 'title' => $lang['strroles'], + 'url' => 'roles', + 'urlvars' => ['subject' => 'server'], + 'hide' => $hide_roles, + 'help' => 'pg.role', + 'icon' => 'Roles', + ], + ]); + } else { + $tabs = array_merge($tabs, [ + 'groups' => [ + 'title' => $lang['strgroups'], + 'url' => 'groups', + 'urlvars' => ['subject' => 'server'], + 'hide' => $hide_users, + 'help' => 'pg.group', + 'icon' => 'UserGroups', + ], + ]); + } + + $tabs = array_merge($tabs, [ + 'account' => [ + 'title' => $lang['straccount'], + 'url' => ($data && $data->hasRoles()) ? 'roles' : 'users', + 'urlvars' => ['subject' => 'server', 'action' => 'account'], + 'hide' => !$hide_users, + 'help' => 'pg.role', + 'icon' => 'User', + ], + 'tablespaces' => [ + 'title' => $lang['strtablespaces'], + 'url' => 'tablespaces', + 'urlvars' => ['subject' => 'server'], + 'hide' => !$data || !$data->hasTablespaces(), + 'help' => 'pg.tablespace', + 'icon' => 'Tablespaces', + ], + 'export' => [ + 'title' => $lang['strexport'], + 'url' => 'alldb', + 'urlvars' => ['subject' => 'server', 'action' => 'export'], + 'hide' => !$this->isDumpEnabled(), + 'icon' => 'Export', + ], + ]); + + return $tabs; + } + + /** + * Gets the tabs for database view. + * + * @param array $lang The language array + * @param \PHPPgAdmin\Database\ADOdbBase $data The database accesor instance + * + * @return array The tabs for database view + */ + public function getTabsDatabase($lang, $data) + { + $hide_advanced = ($this->conf['show_advanced'] === false); + $tabs = [ + 'schemas' => [ + 'title' => $lang['strschemas'], + 'url' => 'schemas', + 'urlvars' => ['subject' => 'database'], + 'help' => 'pg.schema', + 'icon' => 'Schemas', + ], + 'sql' => [ + 'title' => $lang['strsql'], + 'url' => 'database', + 'urlvars' => ['subject' => 'database', 'action' => 'sql', 'new' => 1], + 'help' => 'pg.sql', + 'tree' => false, + 'icon' => 'SqlEditor', + ], + 'find' => [ + 'title' => $lang['strfind'], + 'url' => 'database', + 'urlvars' => ['subject' => 'database', 'action' => 'find'], + 'tree' => false, + 'icon' => 'Search', + ], + 'variables' => [ + 'title' => $lang['strvariables'], + 'url' => 'database', + 'urlvars' => ['subject' => 'database', 'action' => 'variables'], + 'help' => 'pg.variable', + 'tree' => false, + 'icon' => 'Variables', + ], + 'processes' => [ + 'title' => $lang['strprocesses'], + 'url' => 'database', + 'urlvars' => ['subject' => 'database', 'action' => 'processes'], + 'help' => 'pg.process', + 'tree' => false, + 'icon' => 'Processes', + ], + 'locks' => [ + 'title' => $lang['strlocks'], + 'url' => 'database', + 'urlvars' => ['subject' => 'database', 'action' => 'locks'], + 'help' => 'pg.locks', + 'tree' => false, + 'icon' => 'Key', + ], + 'admin' => [ + 'title' => $lang['stradmin'], + 'url' => 'database', + 'urlvars' => ['subject' => 'database', 'action' => 'admin'], + 'tree' => false, + 'icon' => 'Admin', + ], + 'privileges' => [ + 'title' => $lang['strprivileges'], + 'url' => 'privileges', + 'urlvars' => ['subject' => 'database'], + 'hide' => !isset($data->privlist['database']), + 'help' => 'pg.privilege', + 'tree' => false, + 'icon' => 'Privileges', + ], + 'languages' => [ + 'title' => $lang['strlanguages'], + 'url' => 'languages', + 'urlvars' => ['subject' => 'database'], + 'hide' => $hide_advanced, + 'help' => 'pg.language', + 'icon' => 'Languages', + ], + 'casts' => [ + 'title' => $lang['strcasts'], + 'url' => 'casts', + 'urlvars' => ['subject' => 'database'], + 'hide' => $hide_advanced, + 'help' => 'pg.cast', + 'icon' => 'Casts', + ], + 'export' => [ + 'title' => $lang['strexport'], + 'url' => 'database', + 'urlvars' => ['subject' => 'database', 'action' => 'export'], + 'hide' => !$this->isDumpEnabled(), + 'tree' => false, + 'icon' => 'Export', + ], + ]; + + return $tabs; + } + + public function getTabsSchema($lang, $data) + { + $hide_advanced = ($this->conf['show_advanced'] === false); + $tabs = [ + 'tables' => [ + 'title' => $lang['strtables'], + 'url' => 'tables', + 'urlvars' => ['subject' => 'schema'], + 'help' => 'pg.table', + 'icon' => 'Tables', + ], + 'views' => [ + 'title' => $lang['strviews'], + 'url' => 'views', + 'urlvars' => ['subject' => 'schema'], + 'help' => 'pg.view', + 'icon' => 'Views', + ], + 'matviews' => [ + 'title' => 'M '.$lang['strviews'], + 'url' => 'materializedviews', + 'urlvars' => ['subject' => 'schema'], + 'help' => 'pg.matview', + 'icon' => 'MViews', + ], + 'sequences' => [ + 'title' => $lang['strsequences'], + 'url' => 'sequences', + 'urlvars' => ['subject' => 'schema'], + 'help' => 'pg.sequence', + 'icon' => 'Sequences', + ], + 'functions' => [ + 'title' => $lang['strfunctions'], + 'url' => 'functions', + 'urlvars' => ['subject' => 'schema'], + 'help' => 'pg.function', + 'icon' => 'Functions', + ], + 'fulltext' => [ + 'title' => $lang['strfulltext'], + 'url' => 'fulltext', + 'urlvars' => ['subject' => 'schema'], + 'help' => 'pg.fts', + 'tree' => true, + 'icon' => 'Fts', + ], + 'domains' => [ + 'title' => $lang['strdomains'], + 'url' => 'domains', + 'urlvars' => ['subject' => 'schema'], + 'help' => 'pg.domain', + 'icon' => 'Domains', + ], + 'aggregates' => [ + 'title' => $lang['straggregates'], + 'url' => 'aggregates', + 'urlvars' => ['subject' => 'schema'], + 'hide' => $hide_advanced, + 'help' => 'pg.aggregate', + 'icon' => 'Aggregates', + ], + 'types' => [ + 'title' => $lang['strtypes'], + 'url' => 'types', + 'urlvars' => ['subject' => 'schema'], + 'hide' => $hide_advanced, + 'help' => 'pg.type', + 'icon' => 'Types', + ], + 'operators' => [ + 'title' => $lang['stroperators'], + 'url' => 'operators', + 'urlvars' => ['subject' => 'schema'], + 'hide' => $hide_advanced, + 'help' => 'pg.operator', + 'icon' => 'Operators', + ], + 'opclasses' => [ + 'title' => $lang['stropclasses'], + 'url' => 'opclasses', + 'urlvars' => ['subject' => 'schema'], + 'hide' => $hide_advanced, + 'help' => 'pg.opclass', + 'icon' => 'OperatorClasses', + ], + 'conversions' => [ + 'title' => $lang['strconversions'], + 'url' => 'conversions', + 'urlvars' => ['subject' => 'schema'], + 'hide' => $hide_advanced, + 'help' => 'pg.conversion', + 'icon' => 'Conversions', + ], + 'privileges' => [ + 'title' => $lang['strprivileges'], + 'url' => 'privileges', + 'urlvars' => ['subject' => 'schema'], + 'help' => 'pg.privilege', + 'tree' => false, + 'icon' => 'Privileges', + ], + 'export' => [ + 'title' => $lang['strexport'], + 'url' => 'schemas', + 'urlvars' => ['subject' => 'schema', 'action' => 'export'], + 'hide' => !$this->isDumpEnabled(), + 'tree' => false, + 'icon' => 'Export', + ], + ]; + if (!$data->hasFTS()) { + unset($tabs['fulltext']); + } + + return $tabs; + } + + public function getTabsTable($lang, $data) + { + $tabs = [ + 'columns' => [ + 'title' => $lang['strcolumns'], + 'url' => 'tblproperties', + 'urlvars' => ['subject' => 'table', 'table' => Decorator::field('table')], + 'icon' => 'Columns', + 'branch' => true, + ], + 'browse' => [ + 'title' => $lang['strbrowse'], + 'icon' => 'Columns', + 'url' => 'display', + 'urlvars' => ['subject' => 'table', 'table' => Decorator::field('table')], + 'return' => 'table', + 'branch' => true, + ], + 'select' => [ + 'title' => $lang['strselect'], + 'icon' => 'Search', + 'url' => 'tables', + 'urlvars' => ['subject' => 'table', 'table' => Decorator::field('table'), 'action' => 'confselectrows'], + 'help' => 'pg.sql.select', + ], + 'insert' => [ + 'title' => $lang['strinsert'], + 'url' => 'tables', + 'urlvars' => [ + 'action' => 'confinsertrow', + 'table' => Decorator::field('table'), + ], + 'help' => 'pg.sql.insert', + 'icon' => 'Operator', + ], + 'indexes' => [ + 'title' => $lang['strindexes'], + 'url' => 'indexes', + 'urlvars' => ['subject' => 'table', 'table' => Decorator::field('table')], + 'help' => 'pg.index', + 'icon' => 'Indexes', + 'branch' => true, + ], + 'constraints' => [ + 'title' => $lang['strconstraints'], + 'url' => 'constraints', + 'urlvars' => ['subject' => 'table', 'table' => Decorator::field('table')], + 'help' => 'pg.constraint', + 'icon' => 'Constraints', + 'branch' => true, + ], + 'triggers' => [ + 'title' => $lang['strtriggers'], + 'url' => 'triggers', + 'urlvars' => ['subject' => 'table', 'table' => Decorator::field('table')], + 'help' => 'pg.trigger', + 'icon' => 'Triggers', + 'branch' => true, + ], + 'rules' => [ + 'title' => $lang['strrules'], + 'url' => 'rules', + 'urlvars' => ['subject' => 'table', 'table' => Decorator::field('table')], + 'help' => 'pg.rule', + 'icon' => 'Rules', + 'branch' => true, + ], + 'admin' => [ + 'title' => $lang['stradmin'], + 'url' => 'tables', + 'urlvars' => ['subject' => 'table', 'table' => Decorator::field('table'), 'action' => 'admin'], + 'icon' => 'Admin', + ], + 'info' => [ + 'title' => $lang['strinfo'], + 'url' => 'info', + 'urlvars' => ['subject' => 'table', 'table' => Decorator::field('table')], + 'icon' => 'Statistics', + ], + 'privileges' => [ + 'title' => $lang['strprivileges'], + 'url' => 'privileges', + 'urlvars' => ['subject' => 'table', 'table' => Decorator::field('table')], + 'help' => 'pg.privilege', + 'icon' => 'Privileges', + ], + 'import' => [ + 'title' => $lang['strimport'], + 'url' => 'tblproperties', + 'urlvars' => ['subject' => 'table', 'table' => Decorator::field('table'), 'action' => 'import'], + 'icon' => 'Import', + 'hide' => false, + ], + 'export' => [ + 'title' => $lang['strexport'], + 'url' => 'tblproperties', + 'urlvars' => ['subject' => 'table', 'table' => Decorator::field('table'), 'action' => 'export'], + 'icon' => 'Export', + 'hide' => false, + ], + ]; + + return $tabs; + } + + public function getTabsView($lang, $data) + { + $tabs = [ + 'columns' => [ + 'title' => $lang['strcolumns'], + 'url' => 'viewproperties', + 'urlvars' => ['subject' => 'view', 'view' => Decorator::field('view')], + 'icon' => 'Columns', + 'branch' => true, + ], + 'browse' => [ + 'title' => $lang['strbrowse'], + 'icon' => 'Columns', + 'url' => 'display', + 'urlvars' => [ + 'action' => 'confselectrows', + 'return' => 'schema', + 'subject' => 'view', + 'view' => Decorator::field('view'), + ], + 'branch' => true, + ], + 'select' => [ + 'title' => $lang['strselect'], + 'icon' => 'Search', + 'url' => 'views', + 'urlvars' => ['action' => 'confselectrows', 'view' => Decorator::field('view')], + 'help' => 'pg.sql.select', + ], + 'definition' => [ + 'title' => $lang['strdefinition'], + 'url' => 'viewproperties', + 'urlvars' => ['subject' => 'view', 'view' => Decorator::field('view'), 'action' => 'definition'], + 'icon' => 'Definition', + ], + 'rules' => [ + 'title' => $lang['strrules'], + 'url' => 'rules', + 'urlvars' => ['subject' => 'view', 'view' => Decorator::field('view')], + 'help' => 'pg.rule', + 'icon' => 'Rules', + 'branch' => true, + ], + 'privileges' => [ + 'title' => $lang['strprivileges'], + 'url' => 'privileges', + 'urlvars' => ['subject' => 'view', 'view' => Decorator::field('view')], + 'help' => 'pg.privilege', + 'icon' => 'Privileges', + ], + 'export' => [ + 'title' => $lang['strexport'], + 'url' => 'viewproperties', + 'urlvars' => ['subject' => 'view', 'view' => Decorator::field('view'), 'action' => 'export'], + 'icon' => 'Export', + 'hide' => false, + ], + ]; + + return $tabs; + } + + public function getTabsMatview($lang, $data) + { + $tabs = [ + 'columns' => [ + 'title' => $lang['strcolumns'], + 'url' => 'materializedviewproperties', + 'urlvars' => ['subject' => 'matview', 'matview' => Decorator::field('matview')], + 'icon' => 'Columns', + 'branch' => true, + ], + 'browse' => [ + 'title' => $lang['strbrowse'], + 'icon' => 'Columns', + 'url' => 'display', + 'urlvars' => [ + 'action' => 'confselectrows', + 'return' => 'schema', + 'subject' => 'matview', + 'matview' => Decorator::field('matview'), + ], + 'branch' => true, + ], + 'select' => [ + 'title' => $lang['strselect'], + 'icon' => 'Search', + 'url' => 'materializedviews', + 'urlvars' => ['action' => 'confselectrows', 'matview' => Decorator::field('matview')], + 'help' => 'pg.sql.select', + ], + 'definition' => [ + 'title' => $lang['strdefinition'], + 'url' => 'materializedviewproperties', + 'urlvars' => ['subject' => 'matview', 'matview' => Decorator::field('matview'), 'action' => 'definition'], + 'icon' => 'Definition', + ], + 'indexes' => [ + 'title' => $lang['strindexes'], + 'url' => 'indexes', + 'urlvars' => ['subject' => 'matview', 'matview' => Decorator::field('matview')], + 'help' => 'pg.index', + 'icon' => 'Indexes', + 'branch' => true, + ], + /*'constraints' => [ + 'title' => $lang['strconstraints'], + 'url' => 'constraints', + 'urlvars' => ['subject' => 'matview', 'matview' => Decorator::field('matview')], + 'help' => 'pg.constraint', + 'icon' => 'Constraints', + 'branch' => true, + */ + + 'rules' => [ + 'title' => $lang['strrules'], + 'url' => 'rules', + 'urlvars' => ['subject' => 'matview', 'matview' => Decorator::field('matview')], + 'help' => 'pg.rule', + 'icon' => 'Rules', + 'branch' => true, + ], + 'privileges' => [ + 'title' => $lang['strprivileges'], + 'url' => 'privileges', + 'urlvars' => ['subject' => 'matview', 'matview' => Decorator::field('matview')], + 'help' => 'pg.privilege', + 'icon' => 'Privileges', + ], + 'export' => [ + 'title' => $lang['strexport'], + 'url' => 'materializedviewproperties', + 'urlvars' => ['subject' => 'matview', 'matview' => Decorator::field('matview'), 'action' => 'export'], + 'icon' => 'Export', + 'hide' => false, + ], + ]; + + return $tabs; + } + + public function getTabsFunction($lang, $data) + { + $tabs = [ + 'definition' => [ + 'title' => $lang['strdefinition'], + 'url' => 'functions', + 'urlvars' => [ + 'subject' => 'function', + 'function' => Decorator::field('function'), + 'function_oid' => Decorator::field('function_oid'), + 'action' => 'properties', + ], + 'icon' => 'Definition', + ], + 'privileges' => [ + 'title' => $lang['strprivileges'], + 'url' => 'privileges', + 'urlvars' => [ + 'subject' => 'function', + 'function' => Decorator::field('function'), + 'function_oid' => Decorator::field('function_oid'), + ], + 'icon' => 'Privileges', + ], + 'show' => [ + 'title' => $lang['strshow'].' '.$lang['strdefinition'], + 'url' => 'functions', + 'urlvars' => [ + 'subject' => 'function', + 'function' => Decorator::field('function'), + 'function_oid' => Decorator::field('function_oid'), + 'action' => 'show', + ], + 'icon' => 'Search', + ], + ]; + + return $tabs; + } + + public function getTabsAggregate($lang, $data) + { + $tabs = [ + 'definition' => [ + 'title' => $lang['strdefinition'], + 'url' => 'aggregates', + 'urlvars' => [ + 'subject' => 'aggregate', + 'aggrname' => Decorator::field('aggrname'), + 'aggrtype' => Decorator::field('aggrtype'), + 'action' => 'properties', + ], + 'icon' => 'Definition', + ], + ]; + + return $tabs; + } + + public function getTabsRole($lang, $data) + { + $tabs = [ + 'definition' => [ + 'title' => $lang['strdefinition'], + 'url' => 'roles', + 'urlvars' => [ + 'subject' => 'role', + 'rolename' => Decorator::field('rolename'), + 'action' => 'properties', + ], + 'icon' => 'Definition', + ], + ]; + + return $tabs; + } + + public function getTabsPopup($lang, $data) + { + $tabs = [ + 'sql' => [ + 'title' => $lang['strsql'], + 'url' => \SUBFOLDER.'/src/views/sqledit', + 'urlvars' => ['action' => 'sql', 'subject' => 'schema'], + 'help' => 'pg.sql', + 'icon' => 'SqlEditor', + ], + 'find' => [ + 'title' => $lang['strfind'], + 'url' => \SUBFOLDER.'/src/views/sqledit', + 'urlvars' => ['action' => 'find', 'subject' => 'schema'], + 'icon' => 'Search', + ], + ]; + + return $tabs; + } + + public function getTabsColumn($lang, $data) + { + $tabs = [ + 'properties' => [ + 'title' => $lang['strcolprop'], + 'url' => 'colproperties', + 'urlvars' => [ + 'subject' => 'column', + 'table' => Decorator::field('table'), + 'view' => Decorator::field('view'), + 'column' => Decorator::field('column'), + ], + 'icon' => 'Column', + ], + 'privileges' => [ + 'title' => $lang['strprivileges'], + 'url' => 'privileges', + 'urlvars' => [ + 'subject' => 'column', + 'table' => Decorator::field('table'), + 'view' => Decorator::field('view'), + 'column' => Decorator::field('column'), + ], + 'help' => 'pg.privilege', + 'icon' => 'Privileges', + ], + ]; + if (empty($tabs['properties']['urlvars']['table'])) { + unset($tabs['properties']['urlvars']['table']); + } + if (empty($tabs['privileges']['urlvars']['table'])) { + unset($tabs['privileges']['urlvars']['table']); + } + + return $tabs; + } + + public function getTabsFulltext($lang, $data) + { + $tabs = [ + 'ftsconfigs' => [ + 'title' => $lang['strftstabconfigs'], + 'url' => 'fulltext', + 'urlvars' => ['subject' => 'schema'], + 'hide' => !$data->hasFTS(), + 'help' => 'pg.ftscfg', + 'tree' => true, + 'icon' => 'FtsCfg', + ], + 'ftsdicts' => [ + 'title' => $lang['strftstabdicts'], + 'url' => 'fulltext', + 'urlvars' => ['subject' => 'schema', 'action' => 'viewdicts'], + 'hide' => !$data->hasFTS(), + 'help' => 'pg.ftsdict', + 'tree' => true, + 'icon' => 'FtsDict', + ], + 'ftsparsers' => [ + 'title' => $lang['strftstabparsers'], + 'url' => 'fulltext', + 'urlvars' => ['subject' => 'schema', 'action' => 'viewparsers'], + 'hide' => !$data->hasFTS(), + 'help' => 'pg.ftsparser', + 'tree' => true, + 'icon' => 'FtsParser', + ], + ]; + + return $tabs; + } + + /** * Retrieve the tab info for a specific tab bar. * * @param string $section the name of the tab bar @@ -435,685 +1185,43 @@ trait MiscTrait $tabs = []; switch ($section) { - case 'root': - $tabs = [ - 'intro' => [ - 'title' => $lang['strintroduction'], - 'url' => 'intro', - 'icon' => 'Introduction', - ], - 'servers' => [ - 'title' => $lang['strservers'], - 'url' => 'servers', - 'icon' => 'Servers', - ], - ]; + case 'root':$tabs = $this->getTabsRoot($lang, $data); break; - case 'server': - $hide_users = true; - $hide_roles = false; - if ($data) { - $hide_users = !$data->isSuperUser(); - } - - $tabs = [ - 'databases' => [ - 'title' => $lang['strdatabases'], - 'url' => 'alldb', - 'urlvars' => ['subject' => 'server'], - 'help' => 'pg.database', - 'icon' => 'Databases', - ], - ]; - if ($data && $data->hasRoles()) { - $tabs = array_merge($tabs, [ - 'users' => [ - 'title' => $lang['strusers'], - 'url' => 'users', - 'urlvars' => ['subject' => 'server'], - 'hide' => $hide_roles, - 'help' => 'pg.user', - 'icon' => 'Users', - ], - 'roles' => [ - 'title' => $lang['strroles'], - 'url' => 'roles', - 'urlvars' => ['subject' => 'server'], - 'hide' => $hide_roles, - 'help' => 'pg.role', - 'icon' => 'Roles', - ], - ]); - } else { - $tabs = array_merge($tabs, [ - 'users' => [ - 'title' => $lang['strusers'], - 'url' => 'users', - 'urlvars' => ['subject' => 'server'], - 'hide' => $hide_users, - 'help' => 'pg.user', - 'icon' => 'Users', - ], - 'groups' => [ - 'title' => $lang['strgroups'], - 'url' => 'groups', - 'urlvars' => ['subject' => 'server'], - 'hide' => $hide_users, - 'help' => 'pg.group', - 'icon' => 'UserGroups', - ], - ]); - } - - $tabs = array_merge($tabs, [ - 'account' => [ - 'title' => $lang['straccount'], - 'url' => ($data && $data->hasRoles()) ? 'roles' : 'users', - 'urlvars' => ['subject' => 'server', 'action' => 'account'], - 'hide' => !$hide_users, - 'help' => 'pg.role', - 'icon' => 'User', - ], - 'tablespaces' => [ - 'title' => $lang['strtablespaces'], - 'url' => 'tablespaces', - 'urlvars' => ['subject' => 'server'], - 'hide' => !$data || !$data->hasTablespaces(), - 'help' => 'pg.tablespace', - 'icon' => 'Tablespaces', - ], - 'export' => [ - 'title' => $lang['strexport'], - 'url' => 'alldb', - 'urlvars' => ['subject' => 'server', 'action' => 'export'], - 'hide' => !$this->isDumpEnabled(), - 'icon' => 'Export', - ], - ]); + case 'server':$tabs = $this->getTabsServer($lang, $data); break; - case 'database': - $tabs = [ - 'schemas' => [ - 'title' => $lang['strschemas'], - 'url' => 'schemas', - 'urlvars' => ['subject' => 'database'], - 'help' => 'pg.schema', - 'icon' => 'Schemas', - ], - 'sql' => [ - 'title' => $lang['strsql'], - 'url' => 'database', - 'urlvars' => ['subject' => 'database', 'action' => 'sql', 'new' => 1], - 'help' => 'pg.sql', - 'tree' => false, - 'icon' => 'SqlEditor', - ], - 'find' => [ - 'title' => $lang['strfind'], - 'url' => 'database', - 'urlvars' => ['subject' => 'database', 'action' => 'find'], - 'tree' => false, - 'icon' => 'Search', - ], - 'variables' => [ - 'title' => $lang['strvariables'], - 'url' => 'database', - 'urlvars' => ['subject' => 'database', 'action' => 'variables'], - 'help' => 'pg.variable', - 'tree' => false, - 'icon' => 'Variables', - ], - 'processes' => [ - 'title' => $lang['strprocesses'], - 'url' => 'database', - 'urlvars' => ['subject' => 'database', 'action' => 'processes'], - 'help' => 'pg.process', - 'tree' => false, - 'icon' => 'Processes', - ], - 'locks' => [ - 'title' => $lang['strlocks'], - 'url' => 'database', - 'urlvars' => ['subject' => 'database', 'action' => 'locks'], - 'help' => 'pg.locks', - 'tree' => false, - 'icon' => 'Key', - ], - 'admin' => [ - 'title' => $lang['stradmin'], - 'url' => 'database', - 'urlvars' => ['subject' => 'database', 'action' => 'admin'], - 'tree' => false, - 'icon' => 'Admin', - ], - 'privileges' => [ - 'title' => $lang['strprivileges'], - 'url' => 'privileges', - 'urlvars' => ['subject' => 'database'], - 'hide' => !isset($data->privlist['database']), - 'help' => 'pg.privilege', - 'tree' => false, - 'icon' => 'Privileges', - ], - 'languages' => [ - 'title' => $lang['strlanguages'], - 'url' => 'languages', - 'urlvars' => ['subject' => 'database'], - 'hide' => $hide_advanced, - 'help' => 'pg.language', - 'icon' => 'Languages', - ], - 'casts' => [ - 'title' => $lang['strcasts'], - 'url' => 'casts', - 'urlvars' => ['subject' => 'database'], - 'hide' => $hide_advanced, - 'help' => 'pg.cast', - 'icon' => 'Casts', - ], - 'export' => [ - 'title' => $lang['strexport'], - 'url' => 'database', - 'urlvars' => ['subject' => 'database', 'action' => 'export'], - 'hide' => !$this->isDumpEnabled(), - 'tree' => false, - 'icon' => 'Export', - ], - ]; + case 'database':$tabs = $this->getTabsDatabase($lang, $data); break; - case 'schema': - $tabs = [ - 'tables' => [ - 'title' => $lang['strtables'], - 'url' => 'tables', - 'urlvars' => ['subject' => 'schema'], - 'help' => 'pg.table', - 'icon' => 'Tables', - ], - 'views' => [ - 'title' => $lang['strviews'], - 'url' => 'views', - 'urlvars' => ['subject' => 'schema'], - 'help' => 'pg.view', - 'icon' => 'Views', - ], - 'matviews' => [ - 'title' => 'M '.$lang['strviews'], - 'url' => 'materializedviews', - 'urlvars' => ['subject' => 'schema'], - 'help' => 'pg.matview', - 'icon' => 'MViews', - ], - 'sequences' => [ - 'title' => $lang['strsequences'], - 'url' => 'sequences', - 'urlvars' => ['subject' => 'schema'], - 'help' => 'pg.sequence', - 'icon' => 'Sequences', - ], - 'functions' => [ - 'title' => $lang['strfunctions'], - 'url' => 'functions', - 'urlvars' => ['subject' => 'schema'], - 'help' => 'pg.function', - 'icon' => 'Functions', - ], - 'fulltext' => [ - 'title' => $lang['strfulltext'], - 'url' => 'fulltext', - 'urlvars' => ['subject' => 'schema'], - 'help' => 'pg.fts', - 'tree' => true, - 'icon' => 'Fts', - ], - 'domains' => [ - 'title' => $lang['strdomains'], - 'url' => 'domains', - 'urlvars' => ['subject' => 'schema'], - 'help' => 'pg.domain', - 'icon' => 'Domains', - ], - 'aggregates' => [ - 'title' => $lang['straggregates'], - 'url' => 'aggregates', - 'urlvars' => ['subject' => 'schema'], - 'hide' => $hide_advanced, - 'help' => 'pg.aggregate', - 'icon' => 'Aggregates', - ], - 'types' => [ - 'title' => $lang['strtypes'], - 'url' => 'types', - 'urlvars' => ['subject' => 'schema'], - 'hide' => $hide_advanced, - 'help' => 'pg.type', - 'icon' => 'Types', - ], - 'operators' => [ - 'title' => $lang['stroperators'], - 'url' => 'operators', - 'urlvars' => ['subject' => 'schema'], - 'hide' => $hide_advanced, - 'help' => 'pg.operator', - 'icon' => 'Operators', - ], - 'opclasses' => [ - 'title' => $lang['stropclasses'], - 'url' => 'opclasses', - 'urlvars' => ['subject' => 'schema'], - 'hide' => $hide_advanced, - 'help' => 'pg.opclass', - 'icon' => 'OperatorClasses', - ], - 'conversions' => [ - 'title' => $lang['strconversions'], - 'url' => 'conversions', - 'urlvars' => ['subject' => 'schema'], - 'hide' => $hide_advanced, - 'help' => 'pg.conversion', - 'icon' => 'Conversions', - ], - 'privileges' => [ - 'title' => $lang['strprivileges'], - 'url' => 'privileges', - 'urlvars' => ['subject' => 'schema'], - 'help' => 'pg.privilege', - 'tree' => false, - 'icon' => 'Privileges', - ], - 'export' => [ - 'title' => $lang['strexport'], - 'url' => 'schemas', - 'urlvars' => ['subject' => 'schema', 'action' => 'export'], - 'hide' => !$this->isDumpEnabled(), - 'tree' => false, - 'icon' => 'Export', - ], - ]; - if (!$data->hasFTS()) { - unset($tabs['fulltext']); - } + case 'schema':$tabs = $this->getTabsSchema($lang, $data); break; - case 'table': - $tabs = [ - 'columns' => [ - 'title' => $lang['strcolumns'], - 'url' => 'tblproperties', - 'urlvars' => ['subject' => 'table', 'table' => Decorator::field('table')], - 'icon' => 'Columns', - 'branch' => true, - ], - 'browse' => [ - 'title' => $lang['strbrowse'], - 'icon' => 'Columns', - 'url' => 'display', - 'urlvars' => ['subject' => 'table', 'table' => Decorator::field('table')], - 'return' => 'table', - 'branch' => true, - ], - 'select' => [ - 'title' => $lang['strselect'], - 'icon' => 'Search', - 'url' => 'tables', - 'urlvars' => ['subject' => 'table', 'table' => Decorator::field('table'), 'action' => 'confselectrows'], - 'help' => 'pg.sql.select', - ], - 'insert' => [ - 'title' => $lang['strinsert'], - 'url' => 'tables', - 'urlvars' => [ - 'action' => 'confinsertrow', - 'table' => Decorator::field('table'), - ], - 'help' => 'pg.sql.insert', - 'icon' => 'Operator', - ], - 'indexes' => [ - 'title' => $lang['strindexes'], - 'url' => 'indexes', - 'urlvars' => ['subject' => 'table', 'table' => Decorator::field('table')], - 'help' => 'pg.index', - 'icon' => 'Indexes', - 'branch' => true, - ], - 'constraints' => [ - 'title' => $lang['strconstraints'], - 'url' => 'constraints', - 'urlvars' => ['subject' => 'table', 'table' => Decorator::field('table')], - 'help' => 'pg.constraint', - 'icon' => 'Constraints', - 'branch' => true, - ], - 'triggers' => [ - 'title' => $lang['strtriggers'], - 'url' => 'triggers', - 'urlvars' => ['subject' => 'table', 'table' => Decorator::field('table')], - 'help' => 'pg.trigger', - 'icon' => 'Triggers', - 'branch' => true, - ], - 'rules' => [ - 'title' => $lang['strrules'], - 'url' => 'rules', - 'urlvars' => ['subject' => 'table', 'table' => Decorator::field('table')], - 'help' => 'pg.rule', - 'icon' => 'Rules', - 'branch' => true, - ], - 'admin' => [ - 'title' => $lang['stradmin'], - 'url' => 'tables', - 'urlvars' => ['subject' => 'table', 'table' => Decorator::field('table'), 'action' => 'admin'], - 'icon' => 'Admin', - ], - 'info' => [ - 'title' => $lang['strinfo'], - 'url' => 'info', - 'urlvars' => ['subject' => 'table', 'table' => Decorator::field('table')], - 'icon' => 'Statistics', - ], - 'privileges' => [ - 'title' => $lang['strprivileges'], - 'url' => 'privileges', - 'urlvars' => ['subject' => 'table', 'table' => Decorator::field('table')], - 'help' => 'pg.privilege', - 'icon' => 'Privileges', - ], - 'import' => [ - 'title' => $lang['strimport'], - 'url' => 'tblproperties', - 'urlvars' => ['subject' => 'table', 'table' => Decorator::field('table'), 'action' => 'import'], - 'icon' => 'Import', - 'hide' => false, - ], - 'export' => [ - 'title' => $lang['strexport'], - 'url' => 'tblproperties', - 'urlvars' => ['subject' => 'table', 'table' => Decorator::field('table'), 'action' => 'export'], - 'icon' => 'Export', - 'hide' => false, - ], - ]; + case 'table':$tabs = $this->getTabsTable($lang, $data); break; - case 'view': - $tabs = [ - 'columns' => [ - 'title' => $lang['strcolumns'], - 'url' => 'viewproperties', - 'urlvars' => ['subject' => 'view', 'view' => Decorator::field('view')], - 'icon' => 'Columns', - 'branch' => true, - ], - 'browse' => [ - 'title' => $lang['strbrowse'], - 'icon' => 'Columns', - 'url' => 'display', - 'urlvars' => [ - 'action' => 'confselectrows', - 'return' => 'schema', - 'subject' => 'view', - 'view' => Decorator::field('view'), - ], - 'branch' => true, - ], - 'select' => [ - 'title' => $lang['strselect'], - 'icon' => 'Search', - 'url' => 'views', - 'urlvars' => ['action' => 'confselectrows', 'view' => Decorator::field('view')], - 'help' => 'pg.sql.select', - ], - 'definition' => [ - 'title' => $lang['strdefinition'], - 'url' => 'viewproperties', - 'urlvars' => ['subject' => 'view', 'view' => Decorator::field('view'), 'action' => 'definition'], - 'icon' => 'Definition', - ], - 'rules' => [ - 'title' => $lang['strrules'], - 'url' => 'rules', - 'urlvars' => ['subject' => 'view', 'view' => Decorator::field('view')], - 'help' => 'pg.rule', - 'icon' => 'Rules', - 'branch' => true, - ], - 'privileges' => [ - 'title' => $lang['strprivileges'], - 'url' => 'privileges', - 'urlvars' => ['subject' => 'view', 'view' => Decorator::field('view')], - 'help' => 'pg.privilege', - 'icon' => 'Privileges', - ], - 'export' => [ - 'title' => $lang['strexport'], - 'url' => 'viewproperties', - 'urlvars' => ['subject' => 'view', 'view' => Decorator::field('view'), 'action' => 'export'], - 'icon' => 'Export', - 'hide' => false, - ], - ]; + case 'view':$tabs = $this->getTabsView($lang, $data); break; - case 'matview': - $tabs = [ - 'columns' => [ - 'title' => $lang['strcolumns'], - 'url' => 'materializedviewproperties', - 'urlvars' => ['subject' => 'matview', 'matview' => Decorator::field('matview')], - 'icon' => 'Columns', - 'branch' => true, - ], - 'browse' => [ - 'title' => $lang['strbrowse'], - 'icon' => 'Columns', - 'url' => 'display', - 'urlvars' => [ - 'action' => 'confselectrows', - 'return' => 'schema', - 'subject' => 'matview', - 'matview' => Decorator::field('matview'), - ], - 'branch' => true, - ], - 'select' => [ - 'title' => $lang['strselect'], - 'icon' => 'Search', - 'url' => 'materializedviews', - 'urlvars' => ['action' => 'confselectrows', 'matview' => Decorator::field('matview')], - 'help' => 'pg.sql.select', - ], - 'definition' => [ - 'title' => $lang['strdefinition'], - 'url' => 'materializedviewproperties', - 'urlvars' => ['subject' => 'matview', 'matview' => Decorator::field('matview'), 'action' => 'definition'], - 'icon' => 'Definition', - ], - 'indexes' => [ - 'title' => $lang['strindexes'], - 'url' => 'indexes', - 'urlvars' => ['subject' => 'matview', 'matview' => Decorator::field('matview')], - 'help' => 'pg.index', - 'icon' => 'Indexes', - 'branch' => true, - ], - /*'constraints' => [ - 'title' => $lang['strconstraints'], - 'url' => 'constraints', - 'urlvars' => ['subject' => 'matview', 'matview' => Decorator::field('matview')], - 'help' => 'pg.constraint', - 'icon' => 'Constraints', - 'branch' => true, - */ - - 'rules' => [ - 'title' => $lang['strrules'], - 'url' => 'rules', - 'urlvars' => ['subject' => 'matview', 'matview' => Decorator::field('matview')], - 'help' => 'pg.rule', - 'icon' => 'Rules', - 'branch' => true, - ], - 'privileges' => [ - 'title' => $lang['strprivileges'], - 'url' => 'privileges', - 'urlvars' => ['subject' => 'matview', 'matview' => Decorator::field('matview')], - 'help' => 'pg.privilege', - 'icon' => 'Privileges', - ], - 'export' => [ - 'title' => $lang['strexport'], - 'url' => 'materializedviewproperties', - 'urlvars' => ['subject' => 'matview', 'matview' => Decorator::field('matview'), 'action' => 'export'], - 'icon' => 'Export', - 'hide' => false, - ], - ]; + case 'matview':$tabs = $this->getTabsMatview($lang, $data); break; - case 'function': - $tabs = [ - 'definition' => [ - 'title' => $lang['strdefinition'], - 'url' => 'functions', - 'urlvars' => [ - 'subject' => 'function', - 'function' => Decorator::field('function'), - 'function_oid' => Decorator::field('function_oid'), - 'action' => 'properties', - ], - 'icon' => 'Definition', - ], - 'privileges' => [ - 'title' => $lang['strprivileges'], - 'url' => 'privileges', - 'urlvars' => [ - 'subject' => 'function', - 'function' => Decorator::field('function'), - 'function_oid' => Decorator::field('function_oid'), - ], - 'icon' => 'Privileges', - ], - ]; + case 'function':$tabs = $this->getTabsFunction($lang, $data); break; - case 'aggregate': - $tabs = [ - 'definition' => [ - 'title' => $lang['strdefinition'], - 'url' => 'aggregates', - 'urlvars' => [ - 'subject' => 'aggregate', - 'aggrname' => Decorator::field('aggrname'), - 'aggrtype' => Decorator::field('aggrtype'), - 'action' => 'properties', - ], - 'icon' => 'Definition', - ], - ]; + case 'aggregate':$tabs = $this->getTabsAggregate($lang, $data); break; - case 'role': - $tabs = [ - 'definition' => [ - 'title' => $lang['strdefinition'], - 'url' => 'roles', - 'urlvars' => [ - 'subject' => 'role', - 'rolename' => Decorator::field('rolename'), - 'action' => 'properties', - ], - 'icon' => 'Definition', - ], - ]; + case 'role':$tabs = $this->getTabsRole($lang, $data); break; - case 'popup': - $tabs = [ - 'sql' => [ - 'title' => $lang['strsql'], - 'url' => \SUBFOLDER.'/src/views/sqledit', - 'urlvars' => ['action' => 'sql', 'subject' => 'schema'], - 'help' => 'pg.sql', - 'icon' => 'SqlEditor', - ], - 'find' => [ - 'title' => $lang['strfind'], - 'url' => \SUBFOLDER.'/src/views/sqledit', - 'urlvars' => ['action' => 'find', 'subject' => 'schema'], - 'icon' => 'Search', - ], - ]; + case 'popup':$tabs = $this->getTabsPopup($lang, $data); break; - case 'column': - $tabs = [ - 'properties' => [ - 'title' => $lang['strcolprop'], - 'url' => 'colproperties', - 'urlvars' => [ - 'subject' => 'column', - 'table' => Decorator::field('table'), - 'view' => Decorator::field('view'), - 'column' => Decorator::field('column'), - ], - 'icon' => 'Column', - ], - 'privileges' => [ - 'title' => $lang['strprivileges'], - 'url' => 'privileges', - 'urlvars' => [ - 'subject' => 'column', - 'table' => Decorator::field('table'), - 'view' => Decorator::field('view'), - 'column' => Decorator::field('column'), - ], - 'help' => 'pg.privilege', - 'icon' => 'Privileges', - ], - ]; - if (empty($tabs['properties']['urlvars']['table'])) { - unset($tabs['properties']['urlvars']['table']); - } - if (empty($tabs['privileges']['urlvars']['table'])) { - unset($tabs['privileges']['urlvars']['table']); - } + case 'column':$tabs = $this->getTabsColumn($lang, $data); break; - case 'fulltext': - $tabs = [ - 'ftsconfigs' => [ - 'title' => $lang['strftstabconfigs'], - 'url' => 'fulltext', - 'urlvars' => ['subject' => 'schema'], - 'hide' => !$data->hasFTS(), - 'help' => 'pg.ftscfg', - 'tree' => true, - 'icon' => 'FtsCfg', - ], - 'ftsdicts' => [ - 'title' => $lang['strftstabdicts'], - 'url' => 'fulltext', - 'urlvars' => ['subject' => 'schema', 'action' => 'viewdicts'], - 'hide' => !$data->hasFTS(), - 'help' => 'pg.ftsdict', - 'tree' => true, - 'icon' => 'FtsDict', - ], - 'ftsparsers' => [ - 'title' => $lang['strftstabparsers'], - 'url' => 'fulltext', - 'urlvars' => ['subject' => 'schema', 'action' => 'viewparsers'], - 'hide' => !$data->hasFTS(), - 'help' => 'pg.ftsparser', - 'tree' => true, - 'icon' => 'FtsParser', - ], - ]; + case 'fulltext':$tabs = $this->getTabsFulltext($lang, $data); break; } diff --git a/src/traits/ServersTrait.php b/src/traits/ServersTrait.php index fec1fc1c..6913115c 100644 --- a/src/traits/ServersTrait.php +++ b/src/traits/ServersTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Traits; diff --git a/src/traits/ViewsMatViewsPropertiesTrait.php b/src/traits/ViewsMatViewsPropertiesTrait.php index 75d538f9..1d2b2c3c 100644 --- a/src/traits/ViewsMatViewsPropertiesTrait.php +++ b/src/traits/ViewsMatViewsPropertiesTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Traits; diff --git a/src/traits/ViewsMatviewsTrait.php b/src/traits/ViewsMatviewsTrait.php index e8942697..e8064fdd 100644 --- a/src/traits/ViewsMatviewsTrait.php +++ b/src/traits/ViewsMatviewsTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Traits; diff --git a/src/translations/Afrikaans.php b/src/translations/Afrikaans.php index c226e893..44c922a7 100644 --- a/src/translations/Afrikaans.php +++ b/src/translations/Afrikaans.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Arabic.php b/src/translations/Arabic.php index 3c27442c..a7e5ab6e 100644 --- a/src/translations/Arabic.php +++ b/src/translations/Arabic.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Catalan.php b/src/translations/Catalan.php index b13ad70f..f1287f40 100644 --- a/src/translations/Catalan.php +++ b/src/translations/Catalan.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/ChineseSim.php b/src/translations/ChineseSim.php index 21c4b28b..04b5db2f 100644 --- a/src/translations/ChineseSim.php +++ b/src/translations/ChineseSim.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/ChineseTr.php b/src/translations/ChineseTr.php index b9fe4aa0..a13998f0 100644 --- a/src/translations/ChineseTr.php +++ b/src/translations/ChineseTr.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/ChineseUtf8ZhCn.php b/src/translations/ChineseUtf8ZhCn.php index 4953d6ff..f34d9940 100644 --- a/src/translations/ChineseUtf8ZhCn.php +++ b/src/translations/ChineseUtf8ZhCn.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/ChineseUtf8ZhTw.php b/src/translations/ChineseUtf8ZhTw.php index 4671288d..c8fa6d83 100644 --- a/src/translations/ChineseUtf8ZhTw.php +++ b/src/translations/ChineseUtf8ZhTw.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Czech.php b/src/translations/Czech.php index 37ee5e3b..63ef89d1 100644 --- a/src/translations/Czech.php +++ b/src/translations/Czech.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Danish.php b/src/translations/Danish.php index dd23ea3a..431851a6 100644 --- a/src/translations/Danish.php +++ b/src/translations/Danish.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Dutch.php b/src/translations/Dutch.php index 55251327..134877fe 100644 --- a/src/translations/Dutch.php +++ b/src/translations/Dutch.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/English.php b/src/translations/English.php index 330ff46a..d8648b89 100644 --- a/src/translations/English.php +++ b/src/translations/English.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/French.php b/src/translations/French.php index 97a94cca..417a187a 100644 --- a/src/translations/French.php +++ b/src/translations/French.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Galician.php b/src/translations/Galician.php index 4d715c2e..ce8ceb21 100644 --- a/src/translations/Galician.php +++ b/src/translations/Galician.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/German.php b/src/translations/German.php index 87397378..6a31410f 100644 --- a/src/translations/German.php +++ b/src/translations/German.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Greek.php b/src/translations/Greek.php index 68aef5f6..176f60a7 100644 --- a/src/translations/Greek.php +++ b/src/translations/Greek.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Hebrew.php b/src/translations/Hebrew.php index 2f711784..43d60dfe 100644 --- a/src/translations/Hebrew.php +++ b/src/translations/Hebrew.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Hungarian.php b/src/translations/Hungarian.php index 9e4bf49c..7ef5e6f2 100644 --- a/src/translations/Hungarian.php +++ b/src/translations/Hungarian.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Italian.php b/src/translations/Italian.php index 6a36eeb6..51963309 100644 --- a/src/translations/Italian.php +++ b/src/translations/Italian.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Japanese.php b/src/translations/Japanese.php index 59f40ee6..e2102dd7 100644 --- a/src/translations/Japanese.php +++ b/src/translations/Japanese.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Lithuanian.php b/src/translations/Lithuanian.php index e217a697..daee0c23 100644 --- a/src/translations/Lithuanian.php +++ b/src/translations/Lithuanian.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Mongol.php b/src/translations/Mongol.php index ebc79cca..ab556bac 100644 --- a/src/translations/Mongol.php +++ b/src/translations/Mongol.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Polish.php b/src/translations/Polish.php index 11c064cd..65b58b50 100644 --- a/src/translations/Polish.php +++ b/src/translations/Polish.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/PortugueseBr.php b/src/translations/PortugueseBr.php index 08111818..633bf6cb 100644 --- a/src/translations/PortugueseBr.php +++ b/src/translations/PortugueseBr.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/PortuguesePt.php b/src/translations/PortuguesePt.php index 2657fa10..10d18671 100644 --- a/src/translations/PortuguesePt.php +++ b/src/translations/PortuguesePt.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Romanian.php b/src/translations/Romanian.php index 4899d061..e5904d7b 100644 --- a/src/translations/Romanian.php +++ b/src/translations/Romanian.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Russian.php b/src/translations/Russian.php index 9fe101f0..0f701107 100644 --- a/src/translations/Russian.php +++ b/src/translations/Russian.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/RussianUtf8.php b/src/translations/RussianUtf8.php index 27bb4d20..e98821dc 100644 --- a/src/translations/RussianUtf8.php +++ b/src/translations/RussianUtf8.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Slovak.php b/src/translations/Slovak.php index c07089dd..da7f5043 100644 --- a/src/translations/Slovak.php +++ b/src/translations/Slovak.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Spanish.php b/src/translations/Spanish.php index 0f7e7bcf..9bd3b9be 100644 --- a/src/translations/Spanish.php +++ b/src/translations/Spanish.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Swedish.php b/src/translations/Swedish.php index 19762127..fdb588ba 100644 --- a/src/translations/Swedish.php +++ b/src/translations/Swedish.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Turkish.php b/src/translations/Turkish.php index c1b0cb53..11029f91 100644 --- a/src/translations/Turkish.php +++ b/src/translations/Turkish.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Ukrainian.php b/src/translations/Ukrainian.php index 78538b9a..ceb66559 100644 --- a/src/translations/Ukrainian.php +++ b/src/translations/Ukrainian.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\Translations; diff --git a/src/xhtml/HTMLController.php b/src/xhtml/HTMLController.php index 1e311637..6df9d31a 100644 --- a/src/xhtml/HTMLController.php +++ b/src/xhtml/HTMLController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/HTMLFooterController.php b/src/xhtml/HTMLFooterController.php index ea6c7713..e4446885 100644 --- a/src/xhtml/HTMLFooterController.php +++ b/src/xhtml/HTMLFooterController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/HTMLHeaderController.php b/src/xhtml/HTMLHeaderController.php index bef50655..373d43e3 100644 --- a/src/xhtml/HTMLHeaderController.php +++ b/src/xhtml/HTMLHeaderController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/HTMLNavbarController.php b/src/xhtml/HTMLNavbarController.php index dbfe5359..f8678d42 100644 --- a/src/xhtml/HTMLNavbarController.php +++ b/src/xhtml/HTMLNavbarController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\XHtml; @@ -129,6 +129,7 @@ class HTMLNavbarController extends HTMLController $_SESSION['webdbLastTab'][$alltabs] = $activetab; $alltabs = $this->misc->getNavTabs($alltabs); } + //$this->prtrace($tabs); $tabs_html = ''; diff --git a/src/xhtml/HTMLTableController.php b/src/xhtml/HTMLTableController.php index 9020f370..4e347d63 100644 --- a/src/xhtml/HTMLTableController.php +++ b/src/xhtml/HTMLTableController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/TreeController.php b/src/xhtml/TreeController.php index 55a9a7be..39f7bc64 100644 --- a/src/xhtml/TreeController.php +++ b/src/xhtml/TreeController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/XHtmlButton.php b/src/xhtml/XHtmlButton.php index 95cb1f46..1dd5d7cb 100644 --- a/src/xhtml/XHtmlButton.php +++ b/src/xhtml/XHtmlButton.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/XHtmlElement.php b/src/xhtml/XHtmlElement.php index a8af9ca8..e9263a92 100644 --- a/src/xhtml/XHtmlElement.php +++ b/src/xhtml/XHtmlElement.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/XHtmlOption.php b/src/xhtml/XHtmlOption.php index eea17f0b..b7fd0829 100644 --- a/src/xhtml/XHtmlOption.php +++ b/src/xhtml/XHtmlOption.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/XHtmlSelect.php b/src/xhtml/XHtmlSelect.php index 965fed5c..98c8c385 100644 --- a/src/xhtml/XHtmlSelect.php +++ b/src/xhtml/XHtmlSelect.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/XHtmlSimpleElement.php b/src/xhtml/XHtmlSimpleElement.php index 46acda32..6a227b83 100644 --- a/src/xhtml/XHtmlSimpleElement.php +++ b/src/xhtml/XHtmlSimpleElement.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace PHPPgAdmin\XHtml; diff --git a/tests/_support/AcceptanceTester.php b/tests/_support/AcceptanceTester.php index 38251881..664f86ed 100644 --- a/tests/_support/AcceptanceTester.php +++ b/tests/_support/AcceptanceTester.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ class AcceptanceTester extends \Codeception\Actor { diff --git a/tests/_support/FunctionalTester.php b/tests/_support/FunctionalTester.php index 4395f83d..a34c1787 100644 --- a/tests/_support/FunctionalTester.php +++ b/tests/_support/FunctionalTester.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ class FunctionalTester extends \Codeception\Actor { diff --git a/tests/_support/Helper/Acceptance.php b/tests/_support/Helper/Acceptance.php index d13a9db0..b9a3922d 100644 --- a/tests/_support/Helper/Acceptance.php +++ b/tests/_support/Helper/Acceptance.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace Helper; diff --git a/tests/_support/Helper/Functional.php b/tests/_support/Helper/Functional.php index 12042341..5c676420 100644 --- a/tests/_support/Helper/Functional.php +++ b/tests/_support/Helper/Functional.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace Helper; diff --git a/tests/_support/Helper/Unit.php b/tests/_support/Helper/Unit.php index 3ebed7f7..484236e8 100644 --- a/tests/_support/Helper/Unit.php +++ b/tests/_support/Helper/Unit.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ namespace Helper; diff --git a/tests/_support/UnitTester.php b/tests/_support/UnitTester.php index edc18f42..9a974a94 100644 --- a/tests/_support/UnitTester.php +++ b/tests/_support/UnitTester.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ class UnitTester extends \Codeception\Actor { diff --git a/tests/selenium/TestSuite.php b/tests/selenium/TestSuite.php index 80eff46d..d6283dbc 100644 --- a/tests/selenium/TestSuite.php +++ b/tests/selenium/TestSuite.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ chdir('../..'); /* go back to root so we can include scripts */ diff --git a/tests/selenium/src/01-roles.php b/tests/selenium/src/01-roles.php index c9f51fbb..db608761 100644 --- a/tests/selenium/src/01-roles.php +++ b/tests/selenium/src/01-roles.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ $test_title = 'Roles, Users and Groups tests'; diff --git a/tests/selenium/src/04-database.php b/tests/selenium/src/04-database.php index ca624356..2aa64cb5 100644 --- a/tests/selenium/src/04-database.php +++ b/tests/selenium/src/04-database.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ $test_title = 'Database tests'; diff --git a/tests/selenium/src/06-schema.php b/tests/selenium/src/06-schema.php index 1005bdc5..8ab7db51 100644 --- a/tests/selenium/src/06-schema.php +++ b/tests/selenium/src/06-schema.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ $test_title = 'Schema tests'; diff --git a/tests/selenium/src/08-domaine.php b/tests/selenium/src/08-domaine.php index 0cb83b3e..0b19ed14 100644 --- a/tests/selenium/src/08-domaine.php +++ b/tests/selenium/src/08-domaine.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ $test_title = 'Domain tests'; diff --git a/tests/selenium/src/10-table.php b/tests/selenium/src/10-table.php index 6cf7265a..f54c8c11 100644 --- a/tests/selenium/src/10-table.php +++ b/tests/selenium/src/10-table.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ $test_title = 'Table tests'; diff --git a/tests/selenium/src/12-admin.php b/tests/selenium/src/12-admin.php index e7d20dfc..f3cfcd31 100644 --- a/tests/selenium/src/12-admin.php +++ b/tests/selenium/src/12-admin.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ $test_title = 'Admin tests'; diff --git a/tests/selenium/src/15-sequence.php b/tests/selenium/src/15-sequence.php index 5e10ba50..b8a3c175 100644 --- a/tests/selenium/src/15-sequence.php +++ b/tests/selenium/src/15-sequence.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ $test_title = 'Sequence tests'; diff --git a/tests/selenium/src/20-constraint.php b/tests/selenium/src/20-constraint.php index f557d628..6d3897d4 100644 --- a/tests/selenium/src/20-constraint.php +++ b/tests/selenium/src/20-constraint.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ $test_title = 'Constraint tests'; diff --git a/tests/selenium/src/25-column.php b/tests/selenium/src/25-column.php index 2dbde951..a928e3e6 100644 --- a/tests/selenium/src/25-column.php +++ b/tests/selenium/src/25-column.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ $test_title = 'Column tests'; diff --git a/tests/selenium/src/30-view.php b/tests/selenium/src/30-view.php index 49791c68..43bd39c9 100644 --- a/tests/selenium/src/30-view.php +++ b/tests/selenium/src/30-view.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ $test_title = 'View tests'; diff --git a/tests/selenium/src/35-index.php b/tests/selenium/src/35-index.php index c715bf9b..486bac74 100644 --- a/tests/selenium/src/35-index.php +++ b/tests/selenium/src/35-index.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ $test_title = 'Index tests'; diff --git a/tests/selenium/src/99-cleantests.php b/tests/selenium/src/99-cleantests.php index eb39bd61..87fb5f81 100644 --- a/tests/selenium/src/99-cleantests.php +++ b/tests/selenium/src/99-cleantests.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ $test_title = 'Cleaner tests'; diff --git a/tests/selenium/testBuilder.class.php b/tests/selenium/testBuilder.class.php index 9a38609d..546a7365 100644 --- a/tests/selenium/testBuilder.class.php +++ b/tests/selenium/testBuilder.class.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ $_no_db_connection = true; // load lib.inc.php without trying to connect diff --git a/tests/simpletest/config.tests.php b/tests/simpletest/config.tests.php index 1aa29204..8bc0682f 100644 --- a/tests/simpletest/config.tests.php +++ b/tests/simpletest/config.tests.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ global $webUrl; global $SERVER; diff --git a/tests/simpletest/testcase/Common/CommonGroupTest.php b/tests/simpletest/testcase/Common/CommonGroupTest.php index 6a9fdfb1..c5e7a1de 100644 --- a/tests/simpletest/testcase/Common/CommonGroupTest.php +++ b/tests/simpletest/testcase/Common/CommonGroupTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Import the test cases. diff --git a/tests/simpletest/testcase/Common/ExportTest.php b/tests/simpletest/testcase/Common/ExportTest.php index 554a8335..f3f1cb18 100644 --- a/tests/simpletest/testcase/Common/ExportTest.php +++ b/tests/simpletest/testcase/Common/ExportTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Common/ImportTest.php b/tests/simpletest/testcase/Common/ImportTest.php index e19233be..5b85f032 100644 --- a/tests/simpletest/testcase/Common/ImportTest.php +++ b/tests/simpletest/testcase/Common/ImportTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Common/SecurityTest.php b/tests/simpletest/testcase/Common/SecurityTest.php index cf8de142..6bbec759 100644 --- a/tests/simpletest/testcase/Common/SecurityTest.php +++ b/tests/simpletest/testcase/Common/SecurityTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Databases/AdminTest.php b/tests/simpletest/testcase/Databases/AdminTest.php index a06cd856..1f7be00e 100644 --- a/tests/simpletest/testcase/Databases/AdminTest.php +++ b/tests/simpletest/testcase/Databases/AdminTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Databases/CastsTest.php b/tests/simpletest/testcase/Databases/CastsTest.php index 8c26d3eb..4f23eddd 100644 --- a/tests/simpletest/testcase/Databases/CastsTest.php +++ b/tests/simpletest/testcase/Databases/CastsTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Databases/DatabaseGroupTest.php b/tests/simpletest/testcase/Databases/DatabaseGroupTest.php index e00ca4e1..e563eba7 100644 --- a/tests/simpletest/testcase/Databases/DatabaseGroupTest.php +++ b/tests/simpletest/testcase/Databases/DatabaseGroupTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ require_once 'DatabaseTest.php'; require_once 'SqlTest.php'; diff --git a/tests/simpletest/testcase/Databases/DatabaseTest.php b/tests/simpletest/testcase/Databases/DatabaseTest.php index b2c7c808..cc852164 100644 --- a/tests/simpletest/testcase/Databases/DatabaseTest.php +++ b/tests/simpletest/testcase/Databases/DatabaseTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Databases/FindObjectsTest.php b/tests/simpletest/testcase/Databases/FindObjectsTest.php index 4b0edcb8..0f5e87f1 100644 --- a/tests/simpletest/testcase/Databases/FindObjectsTest.php +++ b/tests/simpletest/testcase/Databases/FindObjectsTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Databases/HelpTest.php b/tests/simpletest/testcase/Databases/HelpTest.php index 22ec7966..342ed120 100644 --- a/tests/simpletest/testcase/Databases/HelpTest.php +++ b/tests/simpletest/testcase/Databases/HelpTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Databases/LanguageTest.php b/tests/simpletest/testcase/Databases/LanguageTest.php index 4fbc348a..35146704 100644 --- a/tests/simpletest/testcase/Databases/LanguageTest.php +++ b/tests/simpletest/testcase/Databases/LanguageTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Databases/ProcessesTest.php b/tests/simpletest/testcase/Databases/ProcessesTest.php index 1ba763fe..829dfe57 100644 --- a/tests/simpletest/testcase/Databases/ProcessesTest.php +++ b/tests/simpletest/testcase/Databases/ProcessesTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Databases/SchemaBasicTest.php b/tests/simpletest/testcase/Databases/SchemaBasicTest.php index 75baa003..13f12217 100644 --- a/tests/simpletest/testcase/Databases/SchemaBasicTest.php +++ b/tests/simpletest/testcase/Databases/SchemaBasicTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Databases/SqlTest.php b/tests/simpletest/testcase/Databases/SqlTest.php index 164e80ca..2c9eb655 100644 --- a/tests/simpletest/testcase/Databases/SqlTest.php +++ b/tests/simpletest/testcase/Databases/SqlTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Databases/VariablesTest.php b/tests/simpletest/testcase/Databases/VariablesTest.php index 7ec6ad19..8b54d6c6 100644 --- a/tests/simpletest/testcase/Databases/VariablesTest.php +++ b/tests/simpletest/testcase/Databases/VariablesTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Public/SetPrecondition.php b/tests/simpletest/testcase/Public/SetPrecondition.php index d440cd7e..20b8fd6d 100644 --- a/tests/simpletest/testcase/Public/SetPrecondition.php +++ b/tests/simpletest/testcase/Public/SetPrecondition.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ /** diff --git a/tests/simpletest/testcase/Public/common.php b/tests/simpletest/testcase/Public/common.php index a0509a2b..e4201d8b 100644 --- a/tests/simpletest/testcase/Public/common.php +++ b/tests/simpletest/testcase/Public/common.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // The home page of phpPgAdmin. diff --git a/tests/simpletest/testcase/Schemas/AggregateTest.php b/tests/simpletest/testcase/Schemas/AggregateTest.php index d816c0fc..6bff0b68 100644 --- a/tests/simpletest/testcase/Schemas/AggregateTest.php +++ b/tests/simpletest/testcase/Schemas/AggregateTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Schemas/ConversionTest.php b/tests/simpletest/testcase/Schemas/ConversionTest.php index b16b7e67..aad7bfab 100644 --- a/tests/simpletest/testcase/Schemas/ConversionTest.php +++ b/tests/simpletest/testcase/Schemas/ConversionTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Schemas/DomainTest.php b/tests/simpletest/testcase/Schemas/DomainTest.php index 31458519..706d1bb1 100644 --- a/tests/simpletest/testcase/Schemas/DomainTest.php +++ b/tests/simpletest/testcase/Schemas/DomainTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Schemas/FunctionTest.php b/tests/simpletest/testcase/Schemas/FunctionTest.php index 17a1517d..19f55a4d 100644 --- a/tests/simpletest/testcase/Schemas/FunctionTest.php +++ b/tests/simpletest/testcase/Schemas/FunctionTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Schemas/OpClassTest.php b/tests/simpletest/testcase/Schemas/OpClassTest.php index 5294400f..d8b424e5 100644 --- a/tests/simpletest/testcase/Schemas/OpClassTest.php +++ b/tests/simpletest/testcase/Schemas/OpClassTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Schemas/OperatorTest.php b/tests/simpletest/testcase/Schemas/OperatorTest.php index 1c9c7960..73dc9919 100644 --- a/tests/simpletest/testcase/Schemas/OperatorTest.php +++ b/tests/simpletest/testcase/Schemas/OperatorTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Schemas/SchemasGroupTest.php b/tests/simpletest/testcase/Schemas/SchemasGroupTest.php index bc3bf510..62804884 100644 --- a/tests/simpletest/testcase/Schemas/SchemasGroupTest.php +++ b/tests/simpletest/testcase/Schemas/SchemasGroupTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Import the test case files. diff --git a/tests/simpletest/testcase/Schemas/SequenceTest.php b/tests/simpletest/testcase/Schemas/SequenceTest.php index 714fa32a..5b542a29 100644 --- a/tests/simpletest/testcase/Schemas/SequenceTest.php +++ b/tests/simpletest/testcase/Schemas/SequenceTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Schemas/TableTest.php b/tests/simpletest/testcase/Schemas/TableTest.php index dbd332a0..1e5d40ab 100644 --- a/tests/simpletest/testcase/Schemas/TableTest.php +++ b/tests/simpletest/testcase/Schemas/TableTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Schemas/TypeTest.php b/tests/simpletest/testcase/Schemas/TypeTest.php index 54128ce3..6480568d 100644 --- a/tests/simpletest/testcase/Schemas/TypeTest.php +++ b/tests/simpletest/testcase/Schemas/TypeTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Schemas/ViewTest.php b/tests/simpletest/testcase/Schemas/ViewTest.php index a0be7ab4..deb8121e 100644 --- a/tests/simpletest/testcase/Schemas/ViewTest.php +++ b/tests/simpletest/testcase/Schemas/ViewTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Server/GroupsTest.php b/tests/simpletest/testcase/Server/GroupsTest.php index 6c063bd2..5768c50b 100644 --- a/tests/simpletest/testcase/Server/GroupsTest.php +++ b/tests/simpletest/testcase/Server/GroupsTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Server/ReportsTest.php b/tests/simpletest/testcase/Server/ReportsTest.php index 1b77b97f..78564cd5 100644 --- a/tests/simpletest/testcase/Server/ReportsTest.php +++ b/tests/simpletest/testcase/Server/ReportsTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Server/ServerGroupTest.php b/tests/simpletest/testcase/Server/ServerGroupTest.php index 79988c8a..956f917a 100644 --- a/tests/simpletest/testcase/Server/ServerGroupTest.php +++ b/tests/simpletest/testcase/Server/ServerGroupTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Import the test cases. diff --git a/tests/simpletest/testcase/Server/TableSpacesTest.php b/tests/simpletest/testcase/Server/TableSpacesTest.php index 51d73744..38500897 100644 --- a/tests/simpletest/testcase/Server/TableSpacesTest.php +++ b/tests/simpletest/testcase/Server/TableSpacesTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Server/UsersTest.php b/tests/simpletest/testcase/Server/UsersTest.php index eaccd718..99828054 100644 --- a/tests/simpletest/testcase/Server/UsersTest.php +++ b/tests/simpletest/testcase/Server/UsersTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Tables/ColumnTest.php b/tests/simpletest/testcase/Tables/ColumnTest.php index 118a00bc..46cd6e8d 100644 --- a/tests/simpletest/testcase/Tables/ColumnTest.php +++ b/tests/simpletest/testcase/Tables/ColumnTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Tables/ConstraintsTest.php b/tests/simpletest/testcase/Tables/ConstraintsTest.php index 8fbc32c2..a2209fed 100644 --- a/tests/simpletest/testcase/Tables/ConstraintsTest.php +++ b/tests/simpletest/testcase/Tables/ConstraintsTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Tables/DeadlockTest.php b/tests/simpletest/testcase/Tables/DeadlockTest.php index 3ebb3bcb..9b15938b 100644 --- a/tests/simpletest/testcase/Tables/DeadlockTest.php +++ b/tests/simpletest/testcase/Tables/DeadlockTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Tables/IndexesTest.php b/tests/simpletest/testcase/Tables/IndexesTest.php index f1903ebb..408e777e 100644 --- a/tests/simpletest/testcase/Tables/IndexesTest.php +++ b/tests/simpletest/testcase/Tables/IndexesTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Tables/InfoTest.php b/tests/simpletest/testcase/Tables/InfoTest.php index 47b5e8d8..869082e9 100644 --- a/tests/simpletest/testcase/Tables/InfoTest.php +++ b/tests/simpletest/testcase/Tables/InfoTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Tables/RulesTest.php b/tests/simpletest/testcase/Tables/RulesTest.php index 8afb5031..07f0e5b1 100644 --- a/tests/simpletest/testcase/Tables/RulesTest.php +++ b/tests/simpletest/testcase/Tables/RulesTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Tables/TableGroupTest.php b/tests/simpletest/testcase/Tables/TableGroupTest.php index f2d053db..6a7c33e7 100644 --- a/tests/simpletest/testcase/Tables/TableGroupTest.php +++ b/tests/simpletest/testcase/Tables/TableGroupTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ require_once 'ColumnTest.php'; require_once 'IndexesTest.php'; diff --git a/tests/simpletest/testcase/Tables/TriggersTest.php b/tests/simpletest/testcase/Tables/TriggersTest.php index 4c55508a..5c3a4241 100644 --- a/tests/simpletest/testcase/Tables/TriggersTest.php +++ b/tests/simpletest/testcase/Tables/TriggersTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/coveragephpPgAdminMain.php b/tests/simpletest/testcase/coveragephpPgAdminMain.php index bbf5e5be..ecc13cac 100644 --- a/tests/simpletest/testcase/coveragephpPgAdminMain.php +++ b/tests/simpletest/testcase/coveragephpPgAdminMain.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ require_once 'simpletest.inc.php'; require_once 'simpletest/web_tester.php'; diff --git a/tests/simpletest/testcase/testphpPgAdminMain.php b/tests/simpletest/testcase/testphpPgAdminMain.php index 3ed3255f..89b4be70 100644 --- a/tests/simpletest/testcase/testphpPgAdminMain.php +++ b/tests/simpletest/testcase/testphpPgAdminMain.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Import necessary library files to setup the testcase. diff --git a/tests/simpletest/tests.php b/tests/simpletest/tests.php index 600eb4a5..a636fb53 100644 --- a/tests/simpletest/tests.php +++ b/tests/simpletest/tests.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ require_once __DIR__.'/../../src/lib.inc.php'; require_once __DIR__.'/../../src/lang/english.php'; diff --git a/tests/unit/ViewTest.php b/tests/unit/ViewTest.php index b2f2ab57..c8aa8698 100644 --- a/tests/unit/ViewTest.php +++ b/tests/unit/ViewTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 * * @coversNothing */ diff --git a/tests/views/acinsert.php b/tests/views/acinsert.php index 27f48d0a..10a629bc 100644 --- a/tests/views/acinsert.php +++ b/tests/views/acinsert.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ $do_render = false; if (!defined('BASE_PATH')) { diff --git a/tests/views/aggregates.php b/tests/views/aggregates.php index c9b4243b..c3f543ed 100644 --- a/tests/views/aggregates.php +++ b/tests/views/aggregates.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Include application functions diff --git a/tests/views/alldb.php b/tests/views/alldb.php index 73b2c97f..769af94d 100644 --- a/tests/views/alldb.php +++ b/tests/views/alldb.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Include application functions diff --git a/tests/views/browser.php b/tests/views/browser.php index 2cf64743..9f0926ea 100644 --- a/tests/views/browser.php +++ b/tests/views/browser.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ $do_render = false; if (!defined('BASE_PATH')) { diff --git a/tests/views/casts.php b/tests/views/casts.php index 96b5dbba..e4a3de5b 100644 --- a/tests/views/casts.php +++ b/tests/views/casts.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Include application functions diff --git a/tests/views/colproperties.php b/tests/views/colproperties.php index aa3b8aa7..214184ba 100644 --- a/tests/views/colproperties.php +++ b/tests/views/colproperties.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Include application functions diff --git a/tests/views/constraints.php b/tests/views/constraints.php index ac5ecff1..e0c11a0e 100644 --- a/tests/views/constraints.php +++ b/tests/views/constraints.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Include application functions diff --git a/tests/views/conversions.php b/tests/views/conversions.php index d5ffeaff..0d6e4498 100644 --- a/tests/views/conversions.php +++ b/tests/views/conversions.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Include application functions diff --git a/tests/views/database.php b/tests/views/database.php index 1f0ee342..e87764ba 100644 --- a/tests/views/database.php +++ b/tests/views/database.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Include application functions diff --git a/tests/views/dataexport.php b/tests/views/dataexport.php index 991c2f79..113fbb7e 100644 --- a/tests/views/dataexport.php +++ b/tests/views/dataexport.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ $do_render = false; if (!defined('BASE_PATH')) { diff --git a/tests/views/dataimport.php b/tests/views/dataimport.php index 351b8ea4..c569c4df 100644 --- a/tests/views/dataimport.php +++ b/tests/views/dataimport.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ $do_render = false; if (!defined('BASE_PATH')) { diff --git a/tests/views/dbexport.php b/tests/views/dbexport.php index 81c65859..4255880b 100644 --- a/tests/views/dbexport.php +++ b/tests/views/dbexport.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ $do_render = false; if (!defined('BASE_PATH')) { diff --git a/tests/views/display.php b/tests/views/display.php index c75df6d8..96b3c6dc 100644 --- a/tests/views/display.php +++ b/tests/views/display.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Include application functions diff --git a/tests/views/domains.php b/tests/views/domains.php index 3d3c03bf..88f80baa 100644 --- a/tests/views/domains.php +++ b/tests/views/domains.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Include application functions diff --git a/tests/views/fulltext.php b/tests/views/fulltext.php index a599c207..74fa8600 100644 --- a/tests/views/fulltext.php +++ b/tests/views/fulltext.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Include application functions diff --git a/tests/views/functions.php b/tests/views/functions.php index b137cbee..4e7eb78e 100644 --- a/tests/views/functions.php +++ b/tests/views/functions.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Include application functions diff --git a/tests/views/groups.php b/tests/views/groups.php index bac639fa..32c223a8 100644 --- a/tests/views/groups.php +++ b/tests/views/groups.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Include application functions diff --git a/tests/views/help.php b/tests/views/help.php index 7c3056fe..377d884e 100644 --- a/tests/views/help.php +++ b/tests/views/help.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Include application functions diff --git a/tests/views/history.php b/tests/views/history.php index 9f482b93..831118ab 100644 --- a/tests/views/history.php +++ b/tests/views/history.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Include application functions diff --git a/tests/views/indexes.php b/tests/views/indexes.php index 89399144..541458f4 100644 --- a/tests/views/indexes.php +++ b/tests/views/indexes.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Include application functions diff --git a/tests/views/info.php b/tests/views/info.php index c3b5b214..325555b9 100644 --- a/tests/views/info.php +++ b/tests/views/info.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Include application functions diff --git a/tests/views/intro.php b/tests/views/intro.php index ac71de23..6ec9e3b8 100644 --- a/tests/views/intro.php +++ b/tests/views/intro.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ $do_render = false; if (!defined('BASE_PATH')) { diff --git a/tests/views/languages.php b/tests/views/languages.php index b148ed7b..36d3c98b 100644 --- a/tests/views/languages.php +++ b/tests/views/languages.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Include application functions diff --git a/tests/views/login.php b/tests/views/login.php index c46b260b..194e60de 100644 --- a/tests/views/login.php +++ b/tests/views/login.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ $do_render = false; if (!defined('BASE_PATH')) { diff --git a/tests/views/materializedviewproperties.php b/tests/views/materializedviewproperties.php index 8d590095..b6396726 100644 --- a/tests/views/materializedviewproperties.php +++ b/tests/views/materializedviewproperties.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Include application functions diff --git a/tests/views/materializedviews.php b/tests/views/materializedviews.php index 4c6a34c2..8caac064 100644 --- a/tests/views/materializedviews.php +++ b/tests/views/materializedviews.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Include application functions diff --git a/tests/views/opclasses.php b/tests/views/opclasses.php index 073b4432..e03ea730 100644 --- a/tests/views/opclasses.php +++ b/tests/views/opclasses.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Include application functions diff --git a/tests/views/operators.php b/tests/views/operators.php index 93ff2940..7984f13b 100644 --- a/tests/views/operators.php +++ b/tests/views/operators.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Include application functions diff --git a/tests/views/privileges.php b/tests/views/privileges.php index e03161d2..de7ef4d3 100644 --- a/tests/views/privileges.php +++ b/tests/views/privileges.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ $do_render = false; if (!defined('BASE_PATH')) { diff --git a/tests/views/roles.php b/tests/views/roles.php index 793ec1bb..d57c2505 100644 --- a/tests/views/roles.php +++ b/tests/views/roles.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Include application functions diff --git a/tests/views/rules.php b/tests/views/rules.php index 18b59e7c..5af717a7 100644 --- a/tests/views/rules.php +++ b/tests/views/rules.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Include application functions diff --git a/tests/views/schemas.php b/tests/views/schemas.php index 343ff35a..dc97c6cf 100644 --- a/tests/views/schemas.php +++ b/tests/views/schemas.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Include application functions diff --git a/tests/views/sequences.php b/tests/views/sequences.php index d35a639a..357140b0 100644 --- a/tests/views/sequences.php +++ b/tests/views/sequences.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Include application functions diff --git a/tests/views/servers.php b/tests/views/servers.php index cb415a3d..dbe45d72 100644 --- a/tests/views/servers.php +++ b/tests/views/servers.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ $do_render = false; if (!defined('BASE_PATH')) { diff --git a/tests/views/sql.php b/tests/views/sql.php index f0fb4fba..2deac921 100644 --- a/tests/views/sql.php +++ b/tests/views/sql.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Include application functions diff --git a/tests/views/sqledit.php b/tests/views/sqledit.php index e6bd414a..8f5373c6 100644 --- a/tests/views/sqledit.php +++ b/tests/views/sqledit.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Include application functions diff --git a/tests/views/tables.php b/tests/views/tables.php index ac2f689b..8b68de29 100644 --- a/tests/views/tables.php +++ b/tests/views/tables.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ $do_render = false; if (!defined('BASE_PATH')) { diff --git a/tests/views/tablespaces.php b/tests/views/tablespaces.php index b7a37d21..69666370 100644 --- a/tests/views/tablespaces.php +++ b/tests/views/tablespaces.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Include application functions diff --git a/tests/views/tblproperties.php b/tests/views/tblproperties.php index 92504b31..530fe0aa 100644 --- a/tests/views/tblproperties.php +++ b/tests/views/tblproperties.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Include application functions diff --git a/tests/views/triggers.php b/tests/views/triggers.php index 70b4642b..6026d117 100644 --- a/tests/views/triggers.php +++ b/tests/views/triggers.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Include application functions diff --git a/tests/views/types.php b/tests/views/types.php index b4174d5e..bb3b5085 100644 --- a/tests/views/types.php +++ b/tests/views/types.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Include application functions diff --git a/tests/views/users.php b/tests/views/users.php index cf41c518..56fe6896 100644 --- a/tests/views/users.php +++ b/tests/views/users.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Include application functions diff --git a/tests/views/viewproperties.php b/tests/views/viewproperties.php index f9fb8054..2e58d827 100644 --- a/tests/views/viewproperties.php +++ b/tests/views/viewproperties.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Include application functions diff --git a/tests/views/views.php b/tests/views/views.php index 8d6bc86c..b1be890c 100644 --- a/tests/views/views.php +++ b/tests/views/views.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.48 + * PHPPgAdmin v6.0.0-beta.49 */ // Include application functions |