Merge pull request #20302 from mshima/skip_ci-reactive_sql

sb3: fix sql reactive workflows.
jhipster · Nov 13, 2022 · cf3fc11 · cf3fc11
2 parents d8e79f7 + 75af398
commit cf3fc11
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/generators/liquibase/templates/src/main/resources/config/liquibase/master.xml.ejs b/generators/liquibase/templates/src/main/resources/config/liquibase/master.xml.ejs
@@ -39,7 +39,15 @@
     <property name="now" value="current_timestamp" dbms="postgresql"/>
     <property name="floatType" value="float4" dbms="postgresql"/>
     <property name="clobType" value="clob" dbms="postgresql"/>
+  <%_ if (reactive) { _%>
+    <%_
+      // hibernate/liquibase maps Blob type to oid by default https://liquibase.jira.com/browse/CORE-1863
+      // r2dbc-postgresql doesn't support mapping Blob to oid https://github.com/pgjdbc/r2dbc-postgresql/issues/255
+    _%>
+    <property name="blobType" value="bytea" dbms="postgresql"/>
+  <%_ } else { _%>
     <property name="blobType" value="blob" dbms="postgresql"/>
+  <%_ } _%>
     <property name="uuidType" value="uuid" dbms="postgresql"/>
     <property name="datetimeType" value="datetime" dbms="postgresql"/>
 <%_ } _%>

diff --git a/...ors/server/templates/src/main/java/package/config/SecurityConfiguration_reactive.java.ejs b/...ors/server/templates/src/main/java/package/config/SecurityConfiguration_reactive.java.ejs
@@ -241,6 +241,7 @@ public class SecurityConfiguration {
             .logout()
             .logoutUrl("/api/logout")
             .logoutSuccessHandler(new HttpStatusReturningServerLogoutSuccessHandler())
+        .and()
 <%_ } _%>
             .headers()
                 .contentSecurityPolicy(jHipsterProperties.getSecurity().getContentSecurityPolicy())