Skip to content

Commit

Permalink
Merge pull request jhipster#12645 from pascalgrimaud/postgresql-defau…
Browse files Browse the repository at this point in the history 
…lt-jdl

Put postgresql by default for prodDatabaseType in JDL
  • Loading branch information
@DanielFran
DanielFran authored Oct 4, 2020
2 parents 07c32f0 + 9c51187 commit 14ffdc3
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion jdl/jhipster/default-application-options.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ function getDefaultConfigForNewApplication(customOptions = {}) {
[LANGUAGES]: OptionValues[LANGUAGES],
[MESSAGE_BROKER]: OptionValues[MESSAGE_BROKER].false,
[NATIVE_LANGUAGE]: OptionValues[NATIVE_LANGUAGE],
[PROD_DATABASE_TYPE]: OptionValues[PROD_DATABASE_TYPE].mysql,
[PROD_DATABASE_TYPE]: OptionValues[PROD_DATABASE_TYPE].postgresql,
[SEARCH_ENGINE]: OptionValues[SEARCH_ENGINE].false,
[SKIP_CLIENT]: OptionValues[SKIP_CLIENT],
[TEST_FRAMEWORKS]: [],
Expand Down
2 changes: 1 addition & 1 deletion test/jdl/converters/parsedJDLToJDLObject/parsed-jdl-to-jdl-object-converter.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ describe('ParsedJDLToJDLObjectConverter', () => {
nativeLanguage: 'en',
packageFolder: 'com/mathieu/sample',
packageName: 'com.mathieu.sample',
prodDatabaseType: 'mysql',
prodDatabaseType: 'postgresql',
searchEngine: false,
serverPort: '8080',
serviceDiscoveryType: false,
Expand Down
24 changes: 12 additions & 12 deletions test/jdl/jdl-importer.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,7 @@ relationship OneToOne {
websocket: false,
databaseType: 'sql',
devDatabaseType: 'h2Disk',
prodDatabaseType: 'mysql',
prodDatabaseType: 'postgresql',
buildTool: 'maven',
searchEngine: false,
enableTranslation: true,
Expand Down Expand Up @@ -724,7 +724,7 @@ relationship OneToOne {
websocket: false,
databaseType: 'sql',
devDatabaseType: 'h2Disk',
prodDatabaseType: 'mysql',
prodDatabaseType: 'postgresql',
buildTool: 'maven',
searchEngine: false,
enableTranslation: true,
Expand Down Expand Up @@ -760,7 +760,7 @@ relationship OneToOne {
websocket: false,
databaseType: 'sql',
devDatabaseType: 'h2Disk',
prodDatabaseType: 'mysql',
prodDatabaseType: 'postgresql',
buildTool: 'maven',
searchEngine: false,
enableTranslation: true,
Expand Down Expand Up @@ -791,7 +791,7 @@ relationship OneToOne {
websocket: false,
databaseType: 'sql',
devDatabaseType: 'h2Disk',
prodDatabaseType: 'mysql',
prodDatabaseType: 'postgresql',
buildTool: 'maven',
searchEngine: false,
enableTranslation: true,
Expand Down Expand Up @@ -861,7 +861,7 @@ relationship OneToOne {
enableHibernateCache: true,
databaseType: 'sql',
devDatabaseType: 'h2Disk',
prodDatabaseType: 'mysql',
prodDatabaseType: 'postgresql',
buildTool: 'maven',
searchEngine: false,
enableTranslation: true,
Expand Down Expand Up @@ -897,7 +897,7 @@ relationship OneToOne {
enableHibernateCache: true,
databaseType: 'sql',
devDatabaseType: 'h2Disk',
prodDatabaseType: 'mysql',
prodDatabaseType: 'postgresql',
buildTool: 'maven',
searchEngine: false,
enableTranslation: true,
Expand Down Expand Up @@ -928,7 +928,7 @@ relationship OneToOne {
enableHibernateCache: true,
databaseType: 'sql',
devDatabaseType: 'h2Disk',
prodDatabaseType: 'mysql',
prodDatabaseType: 'postgresql',
buildTool: 'maven',
searchEngine: false,
enableTranslation: true,
Expand Down Expand Up @@ -1197,7 +1197,7 @@ relationship OneToOne {
websocket: false,
databaseType: 'sql',
devDatabaseType: 'h2Disk',
prodDatabaseType: 'mysql',
prodDatabaseType: 'postgresql',
buildTool: 'maven',
searchEngine: false,
enableTranslation: true,
Expand Down Expand Up @@ -1233,7 +1233,7 @@ relationship OneToOne {
websocket: false,
databaseType: 'sql',
devDatabaseType: 'h2Disk',
prodDatabaseType: 'mysql',
prodDatabaseType: 'postgresql',
buildTool: 'maven',
searchEngine: false,
enableTranslation: true,
Expand Down Expand Up @@ -1269,7 +1269,7 @@ relationship OneToOne {
websocket: false,
databaseType: 'sql',
devDatabaseType: 'h2Disk',
prodDatabaseType: 'mysql',
prodDatabaseType: 'postgresql',
buildTool: 'maven',
searchEngine: false,
enableTranslation: true,
Expand Down Expand Up @@ -1300,7 +1300,7 @@ relationship OneToOne {
websocket: false,
databaseType: 'sql',
devDatabaseType: 'h2Disk',
prodDatabaseType: 'mysql',
prodDatabaseType: 'postgresql',
buildTool: 'maven',
searchEngine: false,
enableTranslation: true,
Expand Down Expand Up @@ -1920,7 +1920,7 @@ paginate * with infinite-scroll
nativeLanguage: 'en',
packageFolder: 'com/mycompany/myapp',
packageName: 'com.mycompany.myapp',
prodDatabaseType: 'mysql',
prodDatabaseType: 'postgresql',
searchEngine: false,
serverPort: '8080',
serviceDiscoveryType: false,
Expand Down
4 changes: 2 additions & 2 deletions test/jdl/jhipster/default-application-options.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -496,8 +496,8 @@ describe('DefaultApplicationOptions', () => {
it('should set the package name to com.mycompany.myapp', () => {
expect(options.packageName).to.equal('com.mycompany.myapp');
});
it('should set the production database type option to mysql', () => {
expect(options.prodDatabaseType).to.equal('mysql');
it('should set the production database type option to postgresql', () => {
expect(options.prodDatabaseType).to.equal('postgresql');
});
it('should set the search engine option to false', () => {
expect(options.searchEngine).to.be.false;
Expand Down

0 comments on commit 14ffdc3

Please sign in to comment.