Skip to content
This repository was archived by the owner on Nov 2, 2023. It is now read-only.

SQL fixes for PR #6 #10

Merged
merged 32 commits into from
Sep 24, 2022
Merged

SQL fixes for PR #6 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
b430b8a
Added link of tour on steps view URL
khu5h1 Aug 10, 2022
bb3309e
Fixed the filtering of steps according to particular tour
khu5h1 Aug 10, 2022
b2acb79
Fix assets table changes in base.sql
richard67 Aug 13, 2022
c1476f6
Adapt next asset id sequence number for PostgreSQL
richard67 Aug 13, 2022
b17c1fc
Add missing values to insert for PostgreSQL
richard67 Aug 13, 2022
de1336d
Don't use not existing asset id 91 on updates
richard67 Aug 13, 2022
f539ed1
Use INSERT IGNORE / ON CONFLICT DO NOTHING on updates
richard67 Aug 13, 2022
8f5db62
Update sequence numbers on PostgreSQL
richard67 Aug 13, 2022
586d90f
Consistency and code style fixes
richard67 Aug 13, 2022
1f86bed
Add missing extension record
richard67 Aug 13, 2022
1632e40
Fix checked out columns to allow null values
richard67 Aug 13, 2022
fee4177
Correct data types in PostgreSQL
richard67 Aug 13, 2022
2171c9b
Add CAN FAIL installer hint for PostgreSQL
richard67 Aug 13, 2022
d785720
Fix for PostgreSQL
richard67 Aug 13, 2022
1e41ab9
Fix extensions.sql for PostgreSQL
richard67 Aug 13, 2022
2d7652e
Use correct values for created, modified and checked out columns
richard67 Aug 13, 2022
a75a5f0
Fix my error from previous commit
richard67 Aug 13, 2022
ff39443
Another invalid data type for PostgreSQL
richard67 Aug 13, 2022
b06deb9
Fix names quoting
richard67 Aug 13, 2022
d376f86
Use double quotes inside SQL strings
richard67 Aug 13, 2022
e1d131f
Fix checked out column for PostgreSQL, too
richard67 Aug 13, 2022
ebedea3
Fix checked out columns in MySQL update SQL script
richard67 Aug 13, 2022
2c2c794
Add null value support to table classes
richard67 Aug 13, 2022
34a6f5b
Remoce copy and paste remainders
richard67 Aug 13, 2022
fd748cf
SQL code style: Reserved words uppercase
richard67 Aug 13, 2022
a39b1a9
Add PHPCS exception for underscore
richard67 Aug 13, 2022
a4194d9
Checked out for steps table
richard67 Aug 13, 2022
9c2b001
Add new core extensions to extensions helper
richard67 Aug 13, 2022
9cfdfc0
Fix for the database checker
richard67 Aug 14, 2022
35f806b
Adapt code style for some tables to the others
richard67 Aug 14, 2022
d381c4e
Merge branch 'cleanup' of https://github.com/joomla-projects/gsoc22_g…
khu5h1 Sep 4, 2022
2cc268b
Sync up changes with clean up branch
khu5h1 Sep 4, 2022
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
54 changes: 27 additions & 27 deletions administrator/components/com_admin/sql/updates/mysql/4.3.0-2022-07-30.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ CREATE TABLE IF NOT EXISTS `#__guidedtours` (
`created_by` int NOT NULL DEFAULT 0,
`modified` datetime NOT NULL,
`modified_by` int NOT NULL DEFAULT 0,
`checked_out_time` datetime NOT NULL,
`checked_out` int NOT NULL DEFAULT 0,
`checked_out_time` datetime,
`checked_out` int unsigned,
`published` tinyint NOT NULL DEFAULT 0,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
Expand All @@ -24,8 +24,8 @@ CREATE TABLE IF NOT EXISTS `#__guidedtours` (
-- Dumping data for table `#__guidedtours`
--

INSERT INTO `#__guidedtours` (`id`, `asset_id`, `title`,`description`, `ordering`, `extensions`, `url`, `created`, `created_by`, `modified`, `modified_by`, `checked_out_time`, `checked_out`, `published`) VALUES
(1, 91, 'How to create a Guided Tour in Joomla Backend?', '<p>This Tour will show you how you can create a Guided Tour in the Joomla Backend!</p>', 0, '[\"com_guidedtours\"]', 'administrator/index.php?option=com_guidedtours&view=tours', '', 0, '', 0, '', 0, 1);
INSERT IGNORE INTO `#__guidedtours` (`id`, `asset_id`, `title`, `description`, `ordering`, `extensions`, `url`, `created`, `created_by`, `modified`, `modified_by`, `checked_out_time`, `checked_out`, `published`) VALUES
(1, 0, 'How to create a Guided Tour in Joomla Backend?', '<p>This Tour will show you how you can create a Guided Tour in the Joomla Backend!</p>', 0, '[\"com_guidedtours\"]', 'administrator/index.php?option=com_guidedtours&view=tours', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, NULL, 0, 1);

-- --------------------------------------------------------

Expand All @@ -34,7 +34,7 @@ INSERT INTO `#__guidedtours` (`id`, `asset_id`, `title`,`description`, `ordering
--

CREATE TABLE IF NOT EXISTS `#__guidedtour_steps` (
`id` int NOT NULL AUTO_INCREMENT PRIMARY KEY,
`id` int NOT NULL AUTO_INCREMENT,
`tour_id` int NOT NULL DEFAULT 0,
`title` varchar(255) NOT NULL,
`published` tinyint NOT NULL DEFAULT 0,
Expand All @@ -48,34 +48,34 @@ CREATE TABLE IF NOT EXISTS `#__guidedtour_steps` (
`created_by` int unsigned NOT NULL DEFAULT 0,
`modified` datetime NOT NULL,
`modified_by` int unsigned NOT NULL DEFAULT 0,
`checked_out_time` datetime,
`checked_out` int unsigned,
PRIMARY KEY (`id`),
KEY `idx_tour` (`tour_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;

--
-- Dumping data for table `#__guidedtour_steps`
--

INSERT INTO `#__guidedtour_steps` (`id`, `tour_id`, `title`, `published`, `description`, `ordering`, `step-no`, `position`, `target` ,`url` , `created`, `created_by`, `modified`, `modified_by`) VALUES
(1, 1, 'Click here!', 1, '<p>This Tour will show you how you can create a Guided Tour in the Joomla Backend!</p>', 0, 1, 'bottom', '.button-new','administrator/index.php?option=com_guidedtours&view=tours' ,'', 430, '', 430),
(2, 1, 'Add title for your Tour', 1, '<p>Here you have to add the title of your Tour Step. </p>', 0, 1, 'bottom', '#jform_title', 'administrator/index.php?option=com_guidedtours&view=tour&layout=edit','', 430, '', 430),
(3, 1, 'Add Content', 1, '<p>Add the content of your Tour here!</p>', 0, 1, 'bottom', '#details','administrator/index.php?option=com_guidedtours&view=tour&layout=edit' ,'', 430, '', 430),
(4, 1, 'Plugin selector', 1, '<p>Select the extensions where you want to show your Tour. e.g If you are creating a tour which is only in \'Users\' extensions then select Users here.</p>', 0, 1, 'bottom', '.choices__inner', 'administrator/index.php?option=com_guidedtours&view=tour&layout=edit','', 430, '', 430),
(5, 1, 'URL', 1, '<p>Add Relative URL of the page from where you want to start your Tour. </p>', 0, 1, 'bottom', '#jform_url', 'administrator/index.php?option=com_guidedtours&view=tour&layout=edit','', 430, '', 430),
(6, 1, 'Save and Close', 1, '<p>Save and close the tour</p>', 0, 1, 'bottom', '#save-group-children-save','administrator/index.php?option=com_guidedtours&view=tour&layout=edit' ,'', 430, '', 430),
(7, 1, 'Create steps for your Tour', 1, '<p>Click on steps icon in the right</p>', 0, 1, 'right', '.btn-info','administrator/index.php?option=com_guidedtours&view=tours' ,'', 430, '', 430),
(8, 1, 'Click here!', 1, '<p>Click here to create a new Step for your Tour</p>', 0, 1, 'bottom', '.button-new', 'administrator/index.php?option=com_guidedtours&view=steps&tour_id=1','', 430, '', 430),
(9, 1, 'Add title for your Tour.', 1, '<p>Here you have to add the title of your Tour Step. </p>', 0, 1, 'bottom', '#jform_title','administrator/index.php?option=com_guidedtours&view=step&layout=edit' ,'', 430, '', 430),
(10, 1, 'Add Content', 1, '<p>Add the content of your Tour here!</p>', 0, 1, 'bottom', '#details', 'administrator/index.php?option=com_guidedtours&view=step&layout=edit','', 430, '', 430),
(11, 1, 'Position ', 1, '<p>Add the position of the Step you want. e.g. Right, Left, Top, Bottom.</p>', 0, 1, 'bottom', '#jform_position','administrator/index.php?option=com_guidedtours&view=step&layout=edit' ,'', 430, '', 430),
(12, 1, 'Target', 1, '<p>Add the ID name or Class name of the element where you want to attach your Tour.</p>', 0, 1, 'bottom', '#jform_target', 'administrator/index.php?option=com_guidedtours&view=step&layout=edit','', 430, '', 430),
(13, 1, 'Multi-page URL', 1, '<p>Add Relative URL of the page from where next step starts</p>', 0, 1, 'bottom', '#jform_url','administrator/index.php?option=com_guidedtours&view=step&layout=edit' ,'', 430, '', 430),
(14, 1, 'Save and Close', 1, '<p>Save and close the step</p>', 0, 1, 'bottom', '#save-group-children-save', 'administrator/index.php?option=com_guidedtours&view=step&layout=edit','', 430, '', 430),
(15, 1, 'Congratulations!!!', 1, '<p>You successfully created your first Guided Tour!</p>', 0, 1, 'bottom', '', 'administrator/index.php?option=com_guidedtours&view=step&layout=edit','', 430, '', 430);

-- Add `com_guidedtours` to `#__extensions`
INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `locked`, `manifest_cache`, `params`, `custom_data`) VALUES
(0, 'com_guidedtours', 'component', 'com_guidedtours', '', 1, 1, 0, 0, 1, '', '{}', '');
INSERT IGNORE INTO `#__guidedtour_steps` (`id`, `tour_id`, `title`, `published`, `description`, `ordering`, `step-no`, `position`, `target`, `url`, `created`, `created_by`, `modified`, `modified_by`) VALUES
(1, 1, 'Click here!', 1, '<p>This Tour will show you how you can create a Guided Tour in the Joomla Backend!</p>', 0, 1, 'bottom', '.button-new','administrator/index.php?option=com_guidedtours&view=tours', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0),
(2, 1, 'Add title for your Tour', 1, '<p>Here you have to add the title of your Tour Step. </p>', 0, 1, 'bottom', '#jform_title', 'administrator/index.php?option=com_guidedtours&view=tour&layout=edit', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0),
(3, 1, 'Add Content', 1, '<p>Add the content of your Tour here!</p>', 0, 1, 'bottom', '#details','administrator/index.php?option=com_guidedtours&view=tour&layout=edit', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0),
(4, 1, 'Plugin selector', 1, '<p>Select the extensions where you want to show your Tour. e.g If you are creating a tour which is only in "Users" extensions then select Users here.</p>', 0, 1, 'bottom', '.choices__inner', 'administrator/index.php?option=com_guidedtours&view=tour&layout=edit', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0),
(5, 1, 'URL', 1, '<p>Add Relative URL of the page from where you want to start your Tour. </p>', 0, 1, 'bottom', '#jform_url', 'administrator/index.php?option=com_guidedtours&view=tour&layout=edit', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0),
(6, 1, 'Save and Close', 1, '<p>Save and close the tour</p>', 0, 1, 'bottom', '#save-group-children-save','administrator/index.php?option=com_guidedtours&view=tour&layout=edit', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0),
(7, 1, 'Create steps for your Tour', 1, '<p>Click on steps icon in the right</p>', 0, 1, 'right', '.btn-info','administrator/index.php?option=com_guidedtours&view=tours', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0),
(8, 1, 'Click here!', 1, '<p>Click here to create a new Step for your Tour</p>', 0, 1, 'bottom', '.button-new', 'administrator/index.php?option=com_guidedtours&view=steps&tour_id=1', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0),
(9, 1, 'Add title for your Tour.', 1, '<p>Here you have to add the title of your Tour Step. </p>', 0, 1, 'bottom', '#jform_title','administrator/index.php?option=com_guidedtours&view=step&layout=edit', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0),
(10, 1, 'Add Content', 1, '<p>Add the content of your Tour here!</p>', 0, 1, 'bottom', '#details', 'administrator/index.php?option=com_guidedtours&view=step&layout=edit', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0),
(11, 1, 'Position ', 1, '<p>Add the position of the Step you want. e.g. Right, Left, Top, Bottom.</p>', 0, 1, 'bottom', '#jform_position','administrator/index.php?option=com_guidedtours&view=step&layout=edit', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0),
(12, 1, 'Target', 1, '<p>Add the ID name or Class name of the element where you want to attach your Tour.</p>', 0, 1, 'bottom', '#jform_target', 'administrator/index.php?option=com_guidedtours&view=step&layout=edit', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0),
(13, 1, 'Multi-page URL', 1, '<p>Add Relative URL of the page from where next step starts</p>', 0, 1, 'bottom', '#jform_url','administrator/index.php?option=com_guidedtours&view=step&layout=edit', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0),
(14, 1, 'Save and Close', 1, '<p>Save and close the step</p>', 0, 1, 'bottom', '#save-group-children-save', 'administrator/index.php?option=com_guidedtours&view=step&layout=edit', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0),
(15, 1, 'Congratulations!!!', 1, '<p>You successfully created your first Guided Tour!</p>', 0, 1, 'bottom', '', 'administrator/index.php?option=com_guidedtours&view=step&layout=edit', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0);

-- Add `plg_system_tour` to `#__extensions`
-- Add new `#__extensions`
INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `locked`, `manifest_cache`, `params`, `custom_data`, `ordering`, `state`) VALUES
(0, 'plg_system_tour', 'plugin', 'tour', 'system', 0, 1, 1, 0, 0, '', '{}', '', 15, 0);
(0, 'com_guidedtours', 'component', 'com_guidedtours', '', 1, 1, 0, 0, 1, '', '{}', '', 0, 0),
(0, 'plg_system_tour', 'plugin', 'tour', 'system', 0, 1, 1, 0, 0, '', '{}', '', 0, 0);
Loading