From bbddcb93baefd8f6c5889cf8ed69ce41dbb34afc Mon Sep 17 00:00:00 2001 From: Isaac Parenteau Date: Sat, 30 May 2020 17:48:48 -0500 Subject: [PATCH] Updated file headers --- scripts/start-mysql.ps1 | 1 + scripts/stop-mysql.ps1 | 1 + .../database/config/EightTrackDataSource.java | 2 +- .../eighttrack/database/entities/Log.java | 22 +++++----- .../eighttrack/services/AESService.java | 2 +- .../Alters/V01_000_003__alter_logtable.sql | 1 - .../Tables/V01_000_000__initial_tables.sql | 40 ++++++++++++------- .../mariadb/Tables/V01_000_001__logtable.sql | 10 ----- 8 files changed, 41 insertions(+), 38 deletions(-) create mode 100644 scripts/start-mysql.ps1 create mode 100644 scripts/stop-mysql.ps1 delete mode 100644 src/main/resources/database/migration/mariadb/Alters/V01_000_003__alter_logtable.sql delete mode 100644 src/main/resources/database/migration/mariadb/Tables/V01_000_001__logtable.sql diff --git a/scripts/start-mysql.ps1 b/scripts/start-mysql.ps1 new file mode 100644 index 0000000..2f19bd5 --- /dev/null +++ b/scripts/start-mysql.ps1 @@ -0,0 +1 @@ +Start-Service -Name "MySQL80" \ No newline at end of file diff --git a/scripts/stop-mysql.ps1 b/scripts/stop-mysql.ps1 new file mode 100644 index 0000000..93fa7e9 --- /dev/null +++ b/scripts/stop-mysql.ps1 @@ -0,0 +1 @@ +Stop-Service -Name "MySQL80" \ No newline at end of file diff --git a/src/main/java/net/locusworks/discord/eighttrack/database/config/EightTrackDataSource.java b/src/main/java/net/locusworks/discord/eighttrack/database/config/EightTrackDataSource.java index b4d3010..6e7d557 100644 --- a/src/main/java/net/locusworks/discord/eighttrack/database/config/EightTrackDataSource.java +++ b/src/main/java/net/locusworks/discord/eighttrack/database/config/EightTrackDataSource.java @@ -2,7 +2,7 @@ * * Project: Eight Track, File: EightTrackDataSource.java * - * Copyright 2019-2019 Locusworks LLC. + * Copyright 2019-2020 Locusworks LLC. * All rights reserved. Federal copyright law prohibits unauthorized reproduction by * any means and imposes fines up to $25,000 for violation. No part of this material * may be reproduced, transmitted, transcribed, stored in a retrieval system, copied, diff --git a/src/main/java/net/locusworks/discord/eighttrack/database/entities/Log.java b/src/main/java/net/locusworks/discord/eighttrack/database/entities/Log.java index 6c01ade..4dfe30b 100644 --- a/src/main/java/net/locusworks/discord/eighttrack/database/entities/Log.java +++ b/src/main/java/net/locusworks/discord/eighttrack/database/entities/Log.java @@ -69,6 +69,9 @@ public class Log implements Serializable { @Lob @Column(name = "log") private String log; + @Lob + @Column(name = "exception") + private byte[] exception; @Basic(optional = false) @Column(name = "is_exception") private boolean isException; @@ -76,9 +79,6 @@ public class Log implements Serializable { @Column(name = "date_added") @Temporal(TemporalType.TIMESTAMP) private Date dateAdded; - @Lob - @Column(name = "exception") - private byte[] exception; @JoinColumn(name = "guild", referencedColumnName = "id") @ManyToOne(optional = false) private DiscordGuild guild; @@ -113,6 +113,14 @@ public class Log implements Serializable { this.log = log; } + public byte[] getException() { + return exception; + } + + public void setException(byte[] exception) { + this.exception = exception; + } + public boolean getIsException() { return isException; } @@ -129,14 +137,6 @@ public class Log implements Serializable { this.dateAdded = dateAdded; } - public byte[] getException() { - return exception; - } - - public void setException(byte[] exception) { - this.exception = exception; - } - public DiscordGuild getGuild() { return guild; } diff --git a/src/main/java/net/locusworks/discord/eighttrack/services/AESService.java b/src/main/java/net/locusworks/discord/eighttrack/services/AESService.java index 2c128f9..a4936d0 100644 --- a/src/main/java/net/locusworks/discord/eighttrack/services/AESService.java +++ b/src/main/java/net/locusworks/discord/eighttrack/services/AESService.java @@ -2,7 +2,7 @@ * * Project: Eight Track, File: AESService.java * - * Copyright 2019-2019 Locusworks LLC. + * Copyright 2019-2020 Locusworks LLC. * All rights reserved. Federal copyright law prohibits unauthorized reproduction by * any means and imposes fines up to $25,000 for violation. No part of this material * may be reproduced, transmitted, transcribed, stored in a retrieval system, copied, diff --git a/src/main/resources/database/migration/mariadb/Alters/V01_000_003__alter_logtable.sql b/src/main/resources/database/migration/mariadb/Alters/V01_000_003__alter_logtable.sql deleted file mode 100644 index c255b22..0000000 --- a/src/main/resources/database/migration/mariadb/Alters/V01_000_003__alter_logtable.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE eighttrack.log ADD exception longblob; \ No newline at end of file diff --git a/src/main/resources/database/migration/mariadb/Tables/V01_000_000__initial_tables.sql b/src/main/resources/database/migration/mariadb/Tables/V01_000_000__initial_tables.sql index 523cf52..a315765 100644 --- a/src/main/resources/database/migration/mariadb/Tables/V01_000_000__initial_tables.sql +++ b/src/main/resources/database/migration/mariadb/Tables/V01_000_000__initial_tables.sql @@ -1,14 +1,14 @@ CREATE TABLE eighttrack.discord_guild ( - id bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'Auto increment primary key', - guild_id bigint(20) NOT NULL COMMENT 'id of the discord guild', + id bigint NOT NULL AUTO_INCREMENT COMMENT 'Auto increment primary key', + guild_id bigint NOT NULL COMMENT 'id of the discord guild', guild_name varchar(100) NOT NULL COMMENT 'name of the discord guild', date_joined datetime DEFAULT NULL COMMENT 'date the guild joined', PRIMARY KEY (id), UNIQUE KEY guild_UN (guild_id) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Information about discord guild'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Information about discord guild'; CREATE TABLE eighttrack.song ( - id bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'Primary Key', + id bigint NOT NULL AUTO_INCREMENT COMMENT 'Primary Key', title varchar(500) NOT NULL COMMENT 'title of song', artist varchar(500) DEFAULT NULL COMMENT 'songs artist', album varchar(500) DEFAULT NULL COMMENT 'songs album', @@ -16,7 +16,7 @@ CREATE TABLE eighttrack.song ( track_number varchar(100) DEFAULT NULL COMMENT 'track number', disc_number varchar(100) DEFAULT NULL COMMENT 'disc number', release_year varchar(100) DEFAULT NULL COMMENT 'release year', - duration bigint(20) DEFAULT NULL COMMENT 'songs duration', + duration bigint DEFAULT NULL COMMENT 'songs duration', file_path varchar(5000) NOT NULL COMMENT 'file location on local file system', file_hash varchar(40) NOT NULL COMMENT 'sha1 hash of file', date_added timestamp NULL DEFAULT NULL, @@ -25,10 +25,10 @@ CREATE TABLE eighttrack.song ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; CREATE TABLE eighttrack.guild_song ( - id bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'primary key', + id bigint NOT NULL AUTO_INCREMENT COMMENT 'primary key', uuid varchar(100) NOT NULL COMMENT 'Unique Identifier', - guild bigint(20) NOT NULL COMMENT 'guild the song belongs to', - song bigint(20) NOT NULL COMMENT 'the song', + guild bigint NOT NULL COMMENT 'guild the song belongs to', + song bigint NOT NULL COMMENT 'the song', date_added timestamp NULL DEFAULT NULL COMMENT 'date added', PRIMARY KEY (id), UNIQUE KEY guild_song_UN (guild,song), @@ -39,9 +39,9 @@ CREATE TABLE eighttrack.guild_song ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; CREATE TABLE eighttrack.guild_playlist ( - id bigint(20) NOT NULL AUTO_INCREMENT, - guild bigint(20) NOT NULL, - userId bigint(20) NOT NULL, + id bigint NOT NULL AUTO_INCREMENT, + guild bigint NOT NULL, + userId bigint NOT NULL, playlist varchar(500) NOT NULL, date_added timestamp NULL DEFAULT NULL, PRIMARY KEY (id), @@ -51,13 +51,25 @@ CREATE TABLE eighttrack.guild_playlist ( CREATE TABLE eighttrack.guild_playlist_song ( - id bigint(20) NOT NULL AUTO_INCREMENT, - guild_playlist bigint(20) NOT NULL, - guild_song bigint(20) NOT NULL, + id bigint NOT NULL AUTO_INCREMENT, + guild_playlist bigint NOT NULL, + guild_song bigint NOT NULL, date_added timestamp NULL DEFAULT NULL, PRIMARY KEY (id), UNIQUE KEY guild_playlist_song_UN (guild_playlist,guild_song), KEY guild_playlist_song_FK_1 (guild_song), CONSTRAINT guild_playlist_song_FK FOREIGN KEY (guild_playlist) REFERENCES eighttrack.guild_playlist (id) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT guild_playlist_song_FK_1 FOREIGN KEY (guild_song) REFERENCES eighttrack.guild_song (id) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +CREATE TABLE eighttrack.log ( + id bigint NOT NULL AUTO_INCREMENT, + guild bigint NOT NULL, + log longtext NOT NULL, + exception longblob, + is_exception boolean NOT NULL, + date_added timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + PRIMARY KEY (id), + KEY log_fk (guild), + CONSTRAINT log_fk FOREIGN KEY (guild) REFERENCES eighttrack.discord_guild (id) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; \ No newline at end of file diff --git a/src/main/resources/database/migration/mariadb/Tables/V01_000_001__logtable.sql b/src/main/resources/database/migration/mariadb/Tables/V01_000_001__logtable.sql deleted file mode 100644 index 1483563..0000000 --- a/src/main/resources/database/migration/mariadb/Tables/V01_000_001__logtable.sql +++ /dev/null @@ -1,10 +0,0 @@ -CREATE TABLE eighttrack.log ( - id bigint(20) NOT NULL AUTO_INCREMENT, - guild bigint(20) NOT NULL, - log longtext NOT NULL, - is_exception tinyint(1) NOT NULL, - date_added timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - PRIMARY KEY (id), - KEY log_fk (guild), - CONSTRAINT log_fk FOREIGN KEY (guild) REFERENCES eighttrack.discord_guild (id) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8; \ No newline at end of file