diff --git a/src/main/java/ai/elimu/web/servlet/CustomDispatcherServlet.java b/src/main/java/ai/elimu/web/servlet/CustomDispatcherServlet.java index cf5386908..78a129098 100644 --- a/src/main/java/ai/elimu/web/servlet/CustomDispatcherServlet.java +++ b/src/main/java/ai/elimu/web/servlet/CustomDispatcherServlet.java @@ -71,7 +71,7 @@ private void createJpaSchemaExport() { ServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder() // .configure("META-INF/jpa-persistence.xml") - .applySetting("hibernate.dialect", org.hibernate.dialect.MySQL5Dialect.class.getName()) + .applySetting("hibernate.dialect", org.hibernate.dialect.MySQLDialect.class.getName()) .applySetting("hibernate.hbm2ddl.auto", "update") .applySetting(AvailableSettings.CONNECTION_PROVIDER, connectionProviderWeb) .build(); diff --git a/src/main/resources/META-INF/jpa-schema-export.sql b/src/main/resources/META-INF/jpa-schema-export.sql index 24c4b1d18..67a43c988 100644 --- a/src/main/resources/META-INF/jpa-schema-export.sql +++ b/src/main/resources/META-INF/jpa-schema-export.sql @@ -126,17 +126,17 @@ packageName varchar(255), contributor_id bigint, primary key (id) - ) engine=MyISAM; + ) type=MyISAM; create table Application_literacySkills ( Application_id bigint not null, literacySkills varchar(255) - ) engine=MyISAM; + ) type=MyISAM; create table Application_numeracySkills ( Application_id bigint not null, numeracySkills varchar(255) - ) engine=MyISAM; + ) type=MyISAM; create table ApplicationVersion ( id bigint not null auto_increment, @@ -153,7 +153,7 @@ application_id bigint, contributor_id bigint, primary key (id) - ) engine=MyISAM; + ) type=MyISAM; create table Audio ( id bigint not null auto_increment, @@ -162,7 +162,7 @@ revisionNumber integer, timeLastUpdate datetime, usageCount integer, - attributionUrl varchar(1000), + attributionUrl longtext, contentLicense varchar(255), contentType varchar(255), audioFormat varchar(255), @@ -173,56 +173,56 @@ storyBookParagraph_id bigint, word_id bigint, primary key (id) - ) engine=MyISAM; + ) type=MyISAM; create table Audio_Letter ( Audio_id bigint not null, letters_id bigint not null, primary key (Audio_id, letters_id) - ) engine=MyISAM; + ) type=MyISAM; create table Audio_literacySkills ( Audio_id bigint not null, literacySkills varchar(255) - ) engine=MyISAM; + ) type=MyISAM; create table Audio_Number ( Audio_id bigint not null, numbers_id bigint not null, primary key (Audio_id, numbers_id) - ) engine=MyISAM; + ) type=MyISAM; create table Audio_numeracySkills ( Audio_id bigint not null, numeracySkills varchar(255) - ) engine=MyISAM; + ) type=MyISAM; create table Audio_Word ( Audio_id bigint not null, words_id bigint not null, primary key (Audio_id, words_id) - ) engine=MyISAM; + ) type=MyISAM; create table AudioContributionEvent ( id bigint not null auto_increment, - comment varchar(1000), + comment longtext, revisionNumber integer, timeSpentMs bigint, timestamp datetime, contributor_id bigint, audio_id bigint, primary key (id) - ) engine=MyISAM; + ) type=MyISAM; create table AudioPeerReviewEvent ( id bigint not null auto_increment, approved bit, - comment varchar(1000), + comment longtext, timestamp datetime, contributor_id bigint, audioContributionEvent_id bigint, primary key (id) - ) engine=MyISAM; + ) type=MyISAM; create table Contributor ( id bigint not null auto_increment, @@ -230,7 +230,7 @@ firstName varchar(255), imageUrl varchar(255), lastName varchar(255), - motivation varchar(1000), + motivation longtext, occupation varchar(255), providerIdDiscord varchar(255), providerIdGitHub varchar(255), @@ -240,20 +240,20 @@ usernameDiscord varchar(255), usernameGitHub varchar(255), primary key (id) - ) engine=MyISAM; + ) type=MyISAM; create table Contributor_roles ( Contributor_id bigint not null, roles varchar(255) - ) engine=MyISAM; + ) type=MyISAM; create table DbMigration ( id bigint not null auto_increment, calendar datetime, - script varchar(10000), + script longtext, version integer, primary key (id) - ) engine=MyISAM; + ) type=MyISAM; create table Device ( id bigint not null auto_increment, @@ -265,7 +265,7 @@ remoteAddress varchar(255), timeRegistered datetime, primary key (id) - ) engine=MyISAM; + ) type=MyISAM; create table Emoji ( id bigint not null auto_increment, @@ -278,13 +278,13 @@ unicodeEmojiVersion double precision, unicodeVersion double precision, primary key (id) - ) engine=MyISAM; + ) type=MyISAM; create table Emoji_Word ( Emoji_id bigint not null, words_id bigint not null, primary key (Emoji_id, words_id) - ) engine=MyISAM; + ) type=MyISAM; create table Image ( id bigint not null auto_increment, @@ -293,7 +293,7 @@ revisionNumber integer, timeLastUpdate datetime, usageCount integer, - attributionUrl varchar(1000), + attributionUrl longtext, contentLicense varchar(255), contentType varchar(255), bytes longblob, @@ -302,46 +302,46 @@ imageFormat varchar(255), title varchar(255), primary key (id) - ) engine=MyISAM; + ) type=MyISAM; create table Image_Letter ( Image_id bigint not null, letters_id bigint not null, primary key (Image_id, letters_id) - ) engine=MyISAM; + ) type=MyISAM; create table Image_literacySkills ( Image_id bigint not null, literacySkills varchar(255) - ) engine=MyISAM; + ) type=MyISAM; create table Image_Number ( Image_id bigint not null, numbers_id bigint not null, primary key (Image_id, numbers_id) - ) engine=MyISAM; + ) type=MyISAM; create table Image_numeracySkills ( Image_id bigint not null, numeracySkills varchar(255) - ) engine=MyISAM; + ) type=MyISAM; create table Image_Word ( Image_id bigint not null, words_id bigint not null, primary key (Image_id, words_id) - ) engine=MyISAM; + ) type=MyISAM; create table ImageContributionEvent ( id bigint not null auto_increment, - comment varchar(1000), + comment longtext, revisionNumber integer, timeSpentMs bigint, timestamp datetime, contributor_id bigint, image_id bigint, primary key (id) - ) engine=MyISAM; + ) type=MyISAM; create table Letter ( id bigint not null auto_increment, @@ -353,22 +353,22 @@ diacritic bit not null, text varchar(2), primary key (id) - ) engine=MyISAM; + ) type=MyISAM; create table LetterContributionEvent ( id bigint not null auto_increment, - comment varchar(1000), + comment longtext, revisionNumber integer, timeSpentMs bigint, timestamp datetime, contributor_id bigint, letter_id bigint, primary key (id) - ) engine=MyISAM; + ) type=MyISAM; create table LetterLearningEvent ( id bigint not null auto_increment, - additionalData varchar(1024), + additionalData longtext, androidId varchar(255), learningEventType varchar(255), packageName varchar(255), @@ -377,7 +377,7 @@ application_id bigint, letter_id bigint, primary key (id) - ) engine=MyISAM; + ) type=MyISAM; create table LetterSound ( id bigint not null auto_increment, @@ -387,42 +387,42 @@ timeLastUpdate datetime, usageCount integer, primary key (id) - ) engine=MyISAM; + ) type=MyISAM; create table LetterSound_Letter ( LetterSound_id bigint not null, letters_id bigint not null, letters_ORDER integer not null, primary key (LetterSound_id, letters_ORDER) - ) engine=MyISAM; + ) type=MyISAM; create table LetterSound_Sound ( LetterSound_id bigint not null, sounds_id bigint not null, sounds_ORDER integer not null, primary key (LetterSound_id, sounds_ORDER) - ) engine=MyISAM; + ) type=MyISAM; create table LetterSoundContributionEvent ( id bigint not null auto_increment, - comment varchar(1000), + comment longtext, revisionNumber integer, timeSpentMs bigint, timestamp datetime, contributor_id bigint, letterSound_id bigint, primary key (id) - ) engine=MyISAM; + ) type=MyISAM; create table LetterSoundPeerReviewEvent ( id bigint not null auto_increment, approved bit, - comment varchar(1000), + comment longtext, timestamp datetime, contributor_id bigint, letterSoundContributionEvent_id bigint, primary key (id) - ) engine=MyISAM; + ) type=MyISAM; create table Number ( id bigint not null auto_increment, @@ -434,35 +434,35 @@ symbol varchar(255), value integer, primary key (id) - ) engine=MyISAM; + ) type=MyISAM; create table Number_Word ( Number_id bigint not null, words_id bigint not null, words_ORDER integer not null, primary key (Number_id, words_ORDER) - ) engine=MyISAM; + ) type=MyISAM; create table NumberContributionEvent ( id bigint not null auto_increment, - comment varchar(1000), + comment longtext, revisionNumber integer, timeSpentMs bigint, timestamp datetime, contributor_id bigint, number_id bigint, primary key (id) - ) engine=MyISAM; + ) type=MyISAM; create table NumberPeerReviewEvent ( id bigint not null auto_increment, approved bit, - comment varchar(1000), + comment longtext, timestamp datetime, contributor_id bigint, numberContributionEvent_id bigint, primary key (id) - ) engine=MyISAM; + ) type=MyISAM; create table Sound ( id bigint not null auto_increment, @@ -484,18 +484,18 @@ vowelLength varchar(255), audio_id bigint, primary key (id) - ) engine=MyISAM; + ) type=MyISAM; create table SoundContributionEvent ( id bigint not null auto_increment, - comment varchar(1000), + comment longtext, revisionNumber integer, timeSpentMs bigint, timestamp datetime, contributor_id bigint, sound_id bigint, primary key (id) - ) engine=MyISAM; + ) type=MyISAM; create table StoryBook ( id bigint not null auto_increment, @@ -504,14 +504,14 @@ revisionNumber integer, timeLastUpdate datetime, usageCount integer, - attributionUrl varchar(1000), + attributionUrl longtext, contentLicense varchar(255), - description varchar(1024), + description longtext, readingLevel varchar(255), title varchar(255), coverImage_id bigint, primary key (id) - ) engine=MyISAM; + ) type=MyISAM; create table StoryBookChapter ( id bigint not null auto_increment, @@ -519,24 +519,24 @@ image_id bigint, storyBook_id bigint, primary key (id) - ) engine=MyISAM; + ) type=MyISAM; create table StoryBookContributionEvent ( id bigint not null auto_increment, - comment varchar(1000), + comment longtext, revisionNumber integer, timeSpentMs bigint, timestamp datetime, - paragraphTextAfter varchar(1000), - paragraphTextBefore varchar(1000), + paragraphTextAfter longtext, + paragraphTextBefore longtext, contributor_id bigint, storyBook_id bigint, primary key (id) - ) engine=MyISAM; + ) type=MyISAM; create table StoryBookLearningEvent ( id bigint not null auto_increment, - additionalData varchar(1024), + additionalData longtext, androidId varchar(255), learningEventType varchar(255), packageName varchar(255), @@ -546,32 +546,32 @@ application_id bigint, storyBook_id bigint, primary key (id) - ) engine=MyISAM; + ) type=MyISAM; create table StoryBookParagraph ( id bigint not null auto_increment, - originalText varchar(1024), + originalText longtext, sortOrder integer, storyBookChapter_id bigint, primary key (id) - ) engine=MyISAM; + ) type=MyISAM; create table StoryBookParagraph_Word ( StoryBookParagraph_id bigint not null, words_id bigint not null, words_ORDER integer not null, primary key (StoryBookParagraph_id, words_ORDER) - ) engine=MyISAM; + ) type=MyISAM; create table StoryBookPeerReviewEvent ( id bigint not null auto_increment, approved bit, - comment varchar(1000), + comment longtext, timestamp datetime, contributor_id bigint, storyBookContributionEvent_id bigint, primary key (id) - ) engine=MyISAM; + ) type=MyISAM; create table Syllable ( id bigint not null auto_increment, @@ -582,14 +582,14 @@ usageCount integer, text varchar(255), primary key (id) - ) engine=MyISAM; + ) type=MyISAM; create table Syllable_Sound ( Syllable_id bigint not null, sounds_id bigint not null, sounds_ORDER integer not null, primary key (Syllable_id, sounds_ORDER) - ) engine=MyISAM; + ) type=MyISAM; create table Video ( id bigint not null auto_increment, @@ -598,7 +598,7 @@ revisionNumber integer, timeLastUpdate datetime, usageCount integer, - attributionUrl varchar(1000), + attributionUrl longtext, contentLicense varchar(255), contentType varchar(255), bytes longblob, @@ -606,39 +606,39 @@ title varchar(255), videoFormat varchar(255), primary key (id) - ) engine=MyISAM; + ) type=MyISAM; create table Video_Letter ( Video_id bigint not null, letters_id bigint not null, primary key (Video_id, letters_id) - ) engine=MyISAM; + ) type=MyISAM; create table Video_literacySkills ( Video_id bigint not null, literacySkills varchar(255) - ) engine=MyISAM; + ) type=MyISAM; create table Video_Number ( Video_id bigint not null, numbers_id bigint not null, primary key (Video_id, numbers_id) - ) engine=MyISAM; + ) type=MyISAM; create table Video_numeracySkills ( Video_id bigint not null, numeracySkills varchar(255) - ) engine=MyISAM; + ) type=MyISAM; create table Video_Word ( Video_id bigint not null, words_id bigint not null, primary key (Video_id, words_id) - ) engine=MyISAM; + ) type=MyISAM; create table VideoLearningEvent ( id bigint not null auto_increment, - additionalData varchar(1024), + additionalData longtext, androidId varchar(255), learningEventType varchar(255), packageName varchar(255), @@ -648,7 +648,7 @@ application_id bigint, video_id bigint, primary key (id) - ) engine=MyISAM; + ) type=MyISAM; create table Word ( id bigint not null auto_increment, @@ -662,29 +662,29 @@ wordType varchar(255), rootWord_id bigint, primary key (id) - ) engine=MyISAM; + ) type=MyISAM; create table Word_LetterSound ( Word_id bigint not null, letterSounds_id bigint not null, letterSounds_ORDER integer not null, primary key (Word_id, letterSounds_ORDER) - ) engine=MyISAM; + ) type=MyISAM; create table WordContributionEvent ( id bigint not null auto_increment, - comment varchar(1000), + comment longtext, revisionNumber integer, timeSpentMs bigint, timestamp datetime, contributor_id bigint, word_id bigint, primary key (id) - ) engine=MyISAM; + ) type=MyISAM; create table WordLearningEvent ( id bigint not null auto_increment, - additionalData varchar(1024), + additionalData longtext, androidId varchar(255), learningEventType varchar(255), packageName varchar(255), @@ -693,17 +693,17 @@ application_id bigint, word_id bigint, primary key (id) - ) engine=MyISAM; + ) type=MyISAM; create table WordPeerReviewEvent ( id bigint not null auto_increment, approved bit, - comment varchar(1000), + comment longtext, timestamp datetime, contributor_id bigint, wordContributionEvent_id bigint, primary key (id) - ) engine=MyISAM; + ) type=MyISAM; alter table Contributor add constraint UK_se15thb3bqtr3sw28rgf1v8ia unique (email); diff --git a/src/main/resources/jdbc_PROD.properties b/src/main/resources/jdbc_PROD.properties index 93971580f..4dd4d5b8c 100644 --- a/src/main/resources/jdbc_PROD.properties +++ b/src/main/resources/jdbc_PROD.properties @@ -1,6 +1,6 @@ # JPA Settings jpa.database=MYSQL -jpa.databasePlatform=org.hibernate.dialect.MySQL5Dialect +jpa.databasePlatform=org.hibernate.dialect.MySQLDialect jpa.generateDdl=false jpa.showSql=false diff --git a/src/main/resources/jdbc_TEST.properties b/src/main/resources/jdbc_TEST.properties index 93971580f..4dd4d5b8c 100644 --- a/src/main/resources/jdbc_TEST.properties +++ b/src/main/resources/jdbc_TEST.properties @@ -1,6 +1,6 @@ # JPA Settings jpa.database=MYSQL -jpa.databasePlatform=org.hibernate.dialect.MySQL5Dialect +jpa.databasePlatform=org.hibernate.dialect.MySQLDialect jpa.generateDdl=false jpa.showSql=false