Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
ASE_Y2S1_CP_G4
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Joshua Gill
ASE_Y2S1_CP_G4
Commits
d99f52bb
Commit
d99f52bb
authored
3 years ago
by
Joshua Gill
Browse files
Options
Downloads
Patches
Plain Diff
Re-upload of replaced inserts to new table due to merge conflicts
parent
4b7aa540
No related branches found
No related tags found
3 merge requests
!114
LoggingService service class, new method to add a log to the "Logs" table when...
,
!101
merge
,
!100
Fixing the data script changes made
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/resources/database/schema.sql
+13
-0
13 additions, 0 deletions
src/main/resources/database/schema.sql
src/test/resources/schema-test-h2.sql
+19
-1
19 additions, 1 deletion
src/test/resources/schema-test-h2.sql
with
32 additions
and
1 deletion
src/main/resources/database/schema.sql
+
13
−
0
View file @
d99f52bb
...
@@ -330,3 +330,16 @@ INSERT INTO Tags (Tag_Name) VALUES ('beauty');
...
@@ -330,3 +330,16 @@ INSERT INTO Tags (Tag_Name) VALUES ('beauty');
INSERT
INTO
Tags
(
Tag_Name
)
VALUES
(
'eco-friendly'
);
INSERT
INTO
Tags
(
Tag_Name
)
VALUES
(
'eco-friendly'
);
INSERT
INTO
Tags
(
Tag_Name
)
VALUES
(
'decorations'
);
INSERT
INTO
Tags
(
Tag_Name
)
VALUES
(
'decorations'
);
INSERT
INTO
Tags
(
Tag_Name
)
VALUES
(
'photography'
);
INSERT
INTO
Tags
(
Tag_Name
)
VALUES
(
'photography'
);
INSERT
INTO
Events
(
Event_Name
)
VALUES
(
'New Account Created'
);
INSERT
INTO
Events
(
Event_Name
)
VALUES
(
'Failed Login'
);
INSERT
INTO
Events
(
Event_Name
)
VALUES
(
'Successful Login'
);
INSERT
INTO
Events
(
Event_Name
)
VALUES
(
'User Details Changed'
);
INSERT
INTO
Events
(
Event_Name
)
VALUES
(
'User Removed'
);
INSERT
INTO
Events
(
Event_Name
)
VALUES
(
'New Shop'
);
INSERT
INTO
Events
(
Event_Name
)
VALUES
(
'Deleted Shop'
);
INSERT
INTO
Events
(
Event_Name
)
VALUES
(
'New Favourite Business'
);
INSERT
INTO
Events
(
Event_Name
)
VALUES
(
'New Shop User'
);
INSERT
INTO
Events
(
Event_Name
)
VALUES
(
'Shop Details Changed'
);
INSERT
INTO
Events
(
Event_Name
)
VALUES
(
'Shop Activity Toggled'
);
INSERT
INTO
Events
(
Event_Name
)
VALUES
(
'Image Inserted'
);
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/test/resources/schema-test-h2.sql
+
19
−
1
View file @
d99f52bb
...
@@ -318,7 +318,25 @@ INSERT INTO Admin_Types (Admin_Type_Id, Admin_Type_Name) VALUES (1,'User');
...
@@ -318,7 +318,25 @@ INSERT INTO Admin_Types (Admin_Type_Id, Admin_Type_Name) VALUES (1,'User');
INSERT
INTO
Admin_Types
(
Admin_Type_Id
,
Admin_Type_Name
)
VALUES
(
2
,
'Business Admin'
);
INSERT
INTO
Admin_Types
(
Admin_Type_Id
,
Admin_Type_Name
)
VALUES
(
2
,
'Business Admin'
);
INSERT
INTO
Admin_Types
(
Admin_Type_Id
,
Admin_Type_Name
)
VALUES
(
3
,
'Super Admin'
);
INSERT
INTO
Admin_Types
(
Admin_Type_Id
,
Admin_Type_Name
)
VALUES
(
3
,
'Super Admin'
);
INSERT
INTO
Tags
(
Tag_Name
)
VALUES
(
'Football'
);
INSERT
INTO
Tags
(
Tag_Name
)
VALUES
(
'football'
);
INSERT
INTO
Tags
(
Tag_Name
)
VALUES
(
'fashion'
);
INSERT
INTO
Tags
(
Tag_Name
)
VALUES
(
'electronics'
);
INSERT
INTO
Tags
(
Tag_Name
)
VALUES
(
'coffee'
);
INSERT
INTO
Tags
(
Tag_Name
)
VALUES
(
'art'
);
INSERT
INTO
Tags
(
Tag_Name
)
VALUES
(
'pets'
);
INSERT
INTO
Tags
(
Tag_Name
)
VALUES
(
'clothes'
);
INSERT
INTO
Tags
(
Tag_Name
)
VALUES
(
'designer'
);
INSERT
INTO
Tags
(
Tag_Name
)
VALUES
(
'groceries'
);
INSERT
INTO
Tags
(
Tag_Name
)
VALUES
(
'cars'
);
INSERT
INTO
Tags
(
Tag_Name
)
VALUES
(
'hiking'
);
INSERT
INTO
Tags
(
Tag_Name
)
VALUES
(
'cooking'
);
INSERT
INTO
Tags
(
Tag_Name
)
VALUES
(
'furniture'
);
INSERT
INTO
Tags
(
Tag_Name
)
VALUES
(
'gaming'
);
INSERT
INTO
Tags
(
Tag_Name
)
VALUES
(
'travelling'
);
INSERT
INTO
Tags
(
Tag_Name
)
VALUES
(
'beauty'
);
INSERT
INTO
Tags
(
Tag_Name
)
VALUES
(
'eco-friendly'
);
INSERT
INTO
Tags
(
Tag_Name
)
VALUES
(
'decorations'
);
INSERT
INTO
Tags
(
Tag_Name
)
VALUES
(
'photography'
);
INSERT
INTO
Events
(
Event_Name
)
VALUES
(
'New Account Created'
);
INSERT
INTO
Events
(
Event_Name
)
VALUES
(
'New Account Created'
);
INSERT
INTO
Events
(
Event_Name
)
VALUES
(
'Failed Login'
);
INSERT
INTO
Events
(
Event_Name
)
VALUES
(
'Failed Login'
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment