using OOTB location of liquibase (#50)

* using OOTB location of liquibase

* revert loc in sync with saperation of concerns

* fixes issue with npm tests

Author: rajadilipkolli

generators/controller/index.js

@@ -119,7 +119,7 @@ module.exports = class extends BaseGenerator {
             "01-new_table_with_seq.xml" : "01-new_table_no_seq.xml";
         this.fs.copyTpl(
             this.templatePath('app/src/main/resources/db/migration/liquibase/changelog/'+scriptTemplate),
-            this.destinationPath('src/main/resources/db/migration/changelog/0'+counter+'-create_'+configOptions.tableName+'_table.xml'),
+            this.destinationPath('src/main/resources/db/changelog/migration/0'+counter+'-create_'+configOptions.tableName+'_table.xml'),
             configOptions
         );
         const liquibaseMigrantCounter = {

generators/controller/templates/app/src/main/resources/db/migration/liquibase/changelog/01-new_table_no_seq.xml

@@ -3,8 +3,8 @@
         xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
-         http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
-    <changeSet author="sivalabs" id="createTable-<%= tableName %>">
+         http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.2.xsd">
+    <changeSet author="app" id="createTable-<%= tableName %>">
 
         <createTable tableName="<%= tableName %>">
             <column name="id" type="bigint" autoIncrement="true">

generators/controller/templates/app/src/main/resources/db/migration/liquibase/changelog/01-new_table_with_seq.xml

@@ -3,8 +3,8 @@
         xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
-         http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
-    <changeSet author="sivalabs" id="createTable-<%= tableName %>">
+         http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.2.xsd">
+    <changeSet author="app" id="createTable-<%= tableName %>">
         <createSequence
                         sequenceName="<%= tableName %>_id_seq"
                         incrementBy="100"

generators/server/index.js

@@ -244,8 +244,8 @@ module.exports = class extends BaseGenerator {
 
         if(configOptions.dbMigrationTool === 'liquibase') {
             const resTemplates = [
-                {src: 'db/migration/liquibase/liquibase-changelog.xml', dest: 'db/migration/liquibase-changelog.xml'},
-                {src: 'db/migration/liquibase/changelog/01-init.xml', dest: 'db/migration/changelog/01-init.xml'},
+                {src: 'db/migration/liquibase/changelog/db.changelog-master.yaml', dest: 'db/changelog/db.changelog-master.yaml'},
+                {src: 'db/migration/liquibase/changelog/01-init.xml', dest: 'db/changelog/migration/01-init.xml'},
 
             ];
             this.generateFiles(configOptions, resTemplates, 'app/','src/main/resources/');

generators/server/templates/app/src/main/resources/application.properties

@@ -42,10 +42,6 @@ spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
 <%_ if (dbMigrationTool === 'flywaydb') { _%>
 spring.flyway.locations=classpath:/db/migration/{vendor}
 <%_ } _%>
-<%_ if (dbMigrationTool === 'liquibase') { _%>
-spring.liquibase.change-log=classpath:/db/migration/liquibase-changelog.xml
-<%_ } _%>
-
  <%_ if (features.includes('elk')) { _%>
 application.logstash-host=localhost
  <%_ } _%>

generators/server/templates/app/src/main/resources/db/migration/liquibase/changelog/01-init.xml

@@ -3,6 +3,6 @@
         xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
-         http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+         http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.2.xsd">
 
 </databaseChangeLog>

generators/server/templates/app/src/main/resources/db/migration/liquibase/changelog/db.changelog-master.yaml

@@ -0,0 +1,5 @@
+databaseChangeLog:
+  - includeAll:
+      path: migration/
+      errorIfMissingOrEmpty: true
+      relativeToChangelogFile: true

generators/server/templates/app/src/main/resources/db/migration/liquibase/liquibase-changelog.xml

@@ -44,7 +44,7 @@ describe('SpringBoot Generator', () => {
             assert.file('src/main/java/com/mycompany/myservice/repositories/CustomerRepository.java');
             assert.file('src/main/java/com/mycompany/myservice/services/CustomerService.java');
             assert.file('src/main/java/com/mycompany/myservice/web/controllers/CustomerController.java');
-            assert.file('src/main/resources/db/migration/changelog/02-create_customers_table.xml');
+            assert.file('src/main/resources/db/changelog/migration/02-create_customers_table.xml');
         });
     });
 });