Skip to content

Fix PostgreSQL installation error and so also system-test-postgresql in Drone and update to 4.0-dev #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Quy merged 7 commits into from
Mar 26, 2020
Merged

Fix PostgreSQL installation error and so also system-test-postgresql in Drone and update to 4.0-dev #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
611a1e6
[RTL] Fix position of close button in modal
wilsonge Mar 25, 2020
73fc89e
Merge remote-tracking branch 'upstream/4.0-dev' into 4.0-dev-Quy-1721…
richard67 Mar 26, 2020
e8bb3df
Fix error with PostgreSQL installation
richard67 Mar 26, 2020
fc8dc66
Adjust update sql to latest components and modules as in joomla.sql
richard67 Mar 26, 2020
1fc6e52
Adjust update sql to latest plugins as in joomla.sql
richard67 Mar 26, 2020
fddf7bb
SQL CS - use spaces in IN lists
richard67 Mar 26, 2020
5aa6cf5
Revert unrelated scss change
richard67 Mar 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 39 additions & 18 deletions administrator/components/com_admin/sql/updates/mysql/4.0.0-2020-03-25.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,14 @@ WHERE (`type` = 'component' AND `element` IN (
'com_ajax',
'com_postinstall',
'com_fields',
'com_associations'
'com_associations',
'com_privacy',
'com_actionlogs',
'com_workflow',
'com_csp',
'com_mails'
))
OR (`type` = 'module' AND `element` IN (
OR (`type` = 'module' AND `client_id` = 0 AND `element` IN (
'mod_articles_archive',
'mod_articles_latest',
'mod_articles_popular',
Expand All @@ -59,42 +64,58 @@ OR (`type` = 'module' AND `element` IN (
'mod_articles_category',
'mod_articles_categories',
'mod_languages',
'mod_finder',
'mod_finder'
))
OR (`type` = 'module' AND `client_id` = 1 AND `element` IN (
'mod_custom',
'mod_feed',
'mod_latest',
'mod_logged',
'mod_login',
'mod_loginsupport',
'mod_menu',
'mod_popular',
'mod_quickicon',
'mod_status',
'mod_submenu',
'mod_frontend',
'mod_messages',
'mod_post_installation_messages',
'mod_user',
'mod_title',
'mod_toolbar',
'mod_multilangstatus',
'mod_version',
'mod_stats_admin',
'mod_tags_popular',
'mod_tags_similar',
'mod_sampledata'
'mod_sampledata',
'mod_latestactions',
'mod_privacy_dashboard',
'mod_submenu',
'mod_privacy_status'
))
OR (`type` = 'plugin' AND
(
(`folder` = 'system' AND `element` IN ('languagefilter', 'p3p', 'cache', 'debug', 'log', 'redirect', 'remember', 'sef', 'logout', 'languagecode', 'highlight', 'updatenotification', 'stats', 'fields', 'sessiongc'))
OR (`folder` = 'content' AND `element` IN ('contact', 'emailcloak', 'loadmodule', 'pagebreak', 'pagenavigation', 'vote', 'joomla', 'finder', 'fields'))
OR (`folder` = 'user' AND `element` IN ('contactcreator', 'joomla', 'profile'))
OR (`folder` = 'quickicon' AND `element` IN ('joomlaupdate', 'extensionupdate', 'phpversioncheck'))
(`folder` = 'actionlog' AND `element` IN ('joomla'))
OR (`folder` = 'api-authentication' AND `element` IN ('basic', 'token'))
OR (`folder` = 'authentication' AND `element` IN ('cookie', 'joomla', 'ldap'))
OR (`folder` = 'behaviour' AND `element` IN ('taggable', 'versionable'))
OR (`folder` = 'captcha' AND `element` IN ('recaptcha', 'recaptcha_invisible'))
OR (`folder` = 'content' AND `element` IN ('confirmconsent', 'contact', 'emailcloak', 'fields', 'finder', 'joomla', 'loadmodule', 'pagebreak', 'pagenavigation', 'vote'))
OR (`folder` = 'editors' AND `element` IN ('codemirror', 'none', 'tinymce'))
OR (`folder` = 'editors-xtd' AND `element` IN ('article', 'image', 'pagebreak', 'readmore', 'module', 'menu', 'contact', 'fields'))
OR (`folder` = 'authentication' AND `element` IN ('gmail', 'joomla', 'ldap', 'cookie'))
OR (`folder` = 'twofactorauth' AND `element` IN ('totp', 'yubikey'))
OR (`folder` = 'installer' AND `element` IN ('packageinstaller', 'folderinstaller', 'urlinstaller'))
OR (`folder` = 'extension' AND `element` IN ('joomla'))
OR (`folder` = 'captcha' AND `element` IN ('recaptcha'))
OR (`folder` = 'editors-xtd' AND `element` IN ('article', 'contact', 'fields', 'image', 'menu', 'module', 'pagebreak', 'readmore'))
OR (`folder` = 'extension' AND `element` IN ('finder', 'joomla', 'namespacemap'))
OR (`folder` = 'fields' AND `element` IN ('calendar', 'checkboxes', 'color', 'editor', 'imagelist', 'integer', 'list', 'media', 'radio', 'sql', 'subfields', 'text', 'textarea', 'url', 'user', 'usergrouplist'))
OR (`folder` = 'filesystem' AND `element` IN ('local'))
OR (`folder` = 'finder' AND `element` IN ('categories', 'contacts', 'content', 'newsfeeds', 'tags'))
OR (`folder` = 'fields' AND `element` IN ('calendar', 'checkboxes', 'color', 'editor', 'imagelist', 'integer', 'list', 'media', 'radio', 'sql', 'text', 'textarea', 'url', 'user', 'usergrouplist', 'repeatable'))
OR (`folder` = 'sampledata' AND `element` IN ('blog'))
OR (`folder` = 'installer' AND `element` IN ('folderinstaller', 'override', 'packageinstaller', 'urlinstaller', 'webinstaller'))
OR (`folder` = 'media-action' AND `element` IN ('crop', 'resize', 'rotate'))
OR (`folder` = 'privacy' AND `element` IN ('actionlogs', 'consents', 'contact', 'content', 'message', 'user'))
OR (`folder` = 'quickicon' AND `element` IN ('downloadkey', 'extensionupdate', 'joomlaupdate', 'overridecheck', 'phpversioncheck', 'privacycheck'))
OR (`folder` = 'sampledata' AND `element` IN ('blog', 'multilang', 'testing'))
OR (`folder` = 'system' AND `element` IN ('accessibility', 'actionlogs', 'cache', 'debug', 'fields', 'highlight', 'httpheaders', 'languagecode', 'languagefilter', 'log', 'logout', 'logrotation', 'privacyconsent', 'redirect', 'remember', 'sef', 'sessiongc', 'skipto', 'stats', 'updatenotification', 'webauthn'))
OR (`folder` = 'twofactorauth' AND `element` IN ('totp', 'yubikey'))
OR (`folder` = 'user' AND `element` IN ('contactcreator', 'joomla', 'profile', 'terms', 'token'))
OR (`folder` = 'webservices' AND `element` IN ('banners', 'config', 'contact', 'content', 'languages', 'menus', 'messages', 'modules', 'newsfeeds', 'plugins', 'privacy', 'redirect', 'tags', 'templates', 'users'))
)
)
OR (`type` = 'library' AND `element` IN ('joomla', 'phpass'))
Expand Down
57 changes: 39 additions & 18 deletions administrator/components/com_admin/sql/updates/postgresql/4.0.0-2020-03-25.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,14 @@ WHERE ("type" = 'component' AND "element" IN (
'com_ajax',
'com_postinstall',
'com_fields',
'com_associations'
'com_associations',
'com_privacy',
'com_actionlogs',
'com_workflow',
'com_csp',
'com_mails'
))
OR ("type" = 'module' AND "element" IN (
OR ("type" = 'module' AND "client_id" = 0 AND "element" IN (
'mod_articles_archive',
'mod_articles_latest',
'mod_articles_popular',
Expand All @@ -61,42 +66,58 @@ OR ("type" = 'module' AND "element" IN (
'mod_articles_category',
'mod_articles_categories',
'mod_languages',
'mod_finder',
'mod_finder'
))
OR ("type" = 'module' AND "client_id" = 1 AND "element" IN (
'mod_custom',
'mod_feed',
'mod_latest',
'mod_logged',
'mod_login',
'mod_loginsupport',
'mod_menu',
'mod_popular',
'mod_quickicon',
'mod_status',
'mod_submenu',
'mod_frontend',
'mod_messages',
'mod_post_installation_messages',
'mod_user',
'mod_title',
'mod_toolbar',
'mod_multilangstatus',
'mod_version',
'mod_stats_admin',
'mod_tags_popular',
'mod_tags_similar',
'mod_sampledata'
'mod_sampledata',
'mod_latestactions',
'mod_privacy_dashboard',
'mod_submenu',
'mod_privacy_status'
))
OR ("type" = 'plugin' AND
(
("folder" = 'system' AND "element" IN ('languagefilter', 'p3p', 'cache', 'debug', 'log', 'redirect', 'remember', 'sef', 'logout', 'languagecode', 'highlight', 'updatenotification', 'stats', 'fields', 'sessiongc'))
OR ("folder" = 'content' AND "element" IN ('contact', 'emailcloak', 'loadmodule', 'pagebreak', 'pagenavigation', 'vote', 'joomla', 'finder', 'fields'))
OR ("folder" = 'user' AND "element" IN ('contactcreator', 'joomla', 'profile'))
OR ("folder" = 'quickicon' AND "element" IN ('joomlaupdate', 'extensionupdate', 'phpversioncheck'))
("folder" = 'actionlog' AND "element" IN ('joomla'))
OR ("folder" = 'api-authentication' AND "element" IN ('basic', 'token'))
OR ("folder" = 'authentication' AND "element" IN ('cookie', 'joomla', 'ldap'))
OR ("folder" = 'behaviour' AND "element" IN ('taggable', 'versionable'))
OR ("folder" = 'captcha' AND "element" IN ('recaptcha', 'recaptcha_invisible'))
OR ("folder" = 'content' AND "element" IN ('confirmconsent', 'contact', 'emailcloak', 'fields', 'finder', 'joomla', 'loadmodule', 'pagebreak', 'pagenavigation', 'vote'))
OR ("folder" = 'editors' AND "element" IN ('codemirror', 'none', 'tinymce'))
OR ("folder" = 'editors-xtd' AND "element" IN ('article', 'image', 'pagebreak', 'readmore', 'module', 'menu', 'contact', 'fields'))
OR ("folder" = 'authentication' AND "element" IN ('gmail', 'joomla', 'ldap', 'cookie'))
OR ("folder" = 'twofactorauth' AND "element" IN ('totp', 'yubikey'))
OR ("folder" = 'installer' AND "element" IN ('packageinstaller', 'folderinstaller', 'urlinstaller'))
OR ("folder" = 'extension' AND "element" IN ('joomla'))
OR ("folder" = 'captcha' AND "element" IN ('recaptcha'))
OR ("folder" = 'editors-xtd' AND "element" IN ('article', 'contact', 'fields', 'image', 'menu', 'module', 'pagebreak', 'readmore'))
OR ("folder" = 'extension' AND "element" IN ('finder', 'joomla', 'namespacemap'))
OR ("folder" = 'fields' AND "element" IN ('calendar', 'checkboxes', 'color', 'editor', 'imagelist', 'integer', 'list', 'media', 'radio', 'sql', 'subfields', 'text', 'textarea', 'url', 'user', 'usergrouplist'))
OR ("folder" = 'filesystem' AND "element" IN ('local'))
OR ("folder" = 'finder' AND "element" IN ('categories', 'contacts', 'content', 'newsfeeds', 'tags'))
OR ("folder" = 'fields' AND "element" IN ('calendar', 'checkboxes', 'color', 'editor', 'imagelist', 'integer', 'list', 'media', 'radio', 'sql', 'text', 'textarea', 'url', 'user', 'usergrouplist', 'repeatable'))
OR ("folder" = 'sampledata' AND "element" IN ('blog'))
OR ("folder" = 'installer' AND "element" IN ('folderinstaller', 'override', 'packageinstaller', 'urlinstaller', 'webinstaller'))
OR ("folder" = 'media-action' AND "element" IN ('crop', 'resize', 'rotate'))
OR ("folder" = 'privacy' AND "element" IN ('actionlogs', 'consents', 'contact', 'content', 'message', 'user'))
OR ("folder" = 'quickicon' AND "element" IN ('downloadkey', 'extensionupdate', 'joomlaupdate', 'overridecheck', 'phpversioncheck', 'privacycheck'))
OR ("folder" = 'sampledata' AND "element" IN ('blog', 'multilang', 'testing'))
OR ("folder" = 'system' AND "element" IN ('accessibility', 'actionlogs', 'cache', 'debug', 'fields', 'highlight', 'httpheaders', 'languagecode', 'languagefilter', 'log', 'logout', 'logrotation', 'privacyconsent', 'redirect', 'remember', 'sef', 'sessiongc', 'skipto', 'stats', 'updatenotification', 'webauthn'))
OR ("folder" = 'twofactorauth' AND "element" IN ('totp', 'yubikey'))
OR ("folder" = 'user' AND "element" IN ('contactcreator', 'joomla', 'profile', 'terms', 'token'))
OR ("folder" = 'webservices' AND "element" IN ('banners', 'config', 'contact', 'content', 'languages', 'menus', 'messages', 'modules', 'newsfeeds', 'plugins', 'privacy', 'redirect', 'tags', 'templates', 'users'))
)
)
OR ("type" = 'library' AND "element" IN ('joomla', 'phpass'))
Expand Down
2 changes: 1 addition & 1 deletion installation/sql/postgresql/joomla.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@ INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder",
(0, 'com_joomlaupdate', 'component', 'com_joomlaupdate', '', 1, 1, 0, 1, 1, '', '{"updatesource":"default","customurl":""}', 0, NULL, 0, 0),
(0, 'com_tags', 'component', 'com_tags', '', 1, 1, 1, 1, 1, '', '{"tag_layout":"_:default","save_history":"1","history_limit":5,"show_tag_title":"0","tag_list_show_tag_image":"0","tag_list_show_tag_description":"0","tag_list_image":"","tag_list_orderby":"title","tag_list_orderby_direction":"ASC","show_headings":"0","tag_list_show_date":"0","tag_list_show_item_image":"0","tag_list_show_item_description":"0","tag_list_item_maximum_characters":0,"return_any_or_all":"1","include_children":"0","maximum":200,"tag_list_language_filter":"all","tags_layout":"_:default","all_tags_orderby":"title","all_tags_orderby_direction":"ASC","all_tags_show_tag_image":"0","all_tags_show_tag_description":"0","all_tags_tag_maximum_characters":20,"all_tags_show_tag_hits":"0","filter_field":"1","show_pagination_limit":"1","show_pagination":"2","show_pagination_results":"1","tag_field_ajax_mode":"1","show_feed_link":"1"}', 0, NULL, 0, 0),
(0, 'com_contenthistory', 'component', 'com_contenthistory', '', 1, 1, 1, 0, 1, '', '', 0, NULL, 0, 0),
(0, 'com_ajax', 'component', 'com_ajax', '', 1, 1, 1, 1, '', '', 0, 1, NULL, 0, 0),
(0, 'com_ajax', 'component', 'com_ajax', '', 1, 1, 1, 1, 1, '', '', 0, NULL, 0, 0),
(0, 'com_postinstall', 'component', 'com_postinstall', '', 1, 1, 1, 1, 1, '', '', 0, NULL, 0, 0),
(0, 'com_fields', 'component', 'com_fields', '', 1, 1, 1, 0, 1, '', '', 0, NULL, 0, 0),
(0, 'com_associations', 'component', 'com_associations', '', 1, 1, 1, 0, 1, '', '', 0, NULL, 0, 0),
Expand Down