[DMI] merge from main repo
authorGuillermo Alvarez de Eulate <guillermo.alvarez@openbravo.com>
Tue, 14 May 2019 00:54:35 +0200
changeset 35796 df96ff60c3c4
parent 35795 32469d8b110c (current diff)
parent 35757 39feb7c05796 (diff)
child 35797 668e3c8609c4
[DMI] merge from main repo
modules/org.openbravo.base.weld/lib/runtime/jboss-classfilewriter-1.2.3.Final.jar
modules/org.openbravo.base.weld/lib/runtime/weld-core-impl-3.1.0.Final.jar
modules/org.openbravo.base.weld/lib/runtime/weld-environment-common-3.1.0.Final.jar
modules/org.openbravo.base.weld/lib/runtime/weld-jsf-3.1.0.Final.jar
modules/org.openbravo.base.weld/lib/runtime/weld-servlet-core-3.1.0.Final.jar
modules/org.openbravo.base.weld/lib/runtime/weld-web-3.1.0.Final.jar
--- a/legal/Licensing.txt	Thu May 09 09:05:05 2019 +0200
+++ b/legal/Licensing.txt	Tue May 14 00:54:35 2019 +0200
@@ -202,13 +202,14 @@
 # guava-21.0.jar
 # javax.inject-1.jar
 # jboss-logging-3.3.2.Final.jar
-# jboss-classfilewriter-1.2.3.Final.jar
+# jboss-classfilewriter-1.2.4.Final.jar
 # weld-api-3.1.Final.jar
-# weld-core-impl-3.1.0.Final.jar
-# weld-environment-common-3.1.0.Final.jar
-# weld-servlet-core-3.1.0.Final.jar
+# weld-core-impl-3.1.1.Final.jar
+# weld-environment-common-3.1.1.Final.jar
+# weld-jsf-3.1.1.Final.jar
+# weld-servlet-core-3.1.1.Final.jar
 # weld-spi-3.1.Final.jar
-# weld-web-3.1.0.Final.jar
+# weld-web-3.1.1.Final.jar
 # arquillian-config-api-1.4.1.Final.jar
 # arquillian-config-impl-base-1.4.1.Final.jar
 # arquillian-config-spi-1.4.1.Final.jar
Binary file modules/org.openbravo.base.weld/lib/runtime/jboss-classfilewriter-1.2.3.Final.jar has changed
Binary file modules/org.openbravo.base.weld/lib/runtime/jboss-classfilewriter-1.2.4.Final.jar has changed
Binary file modules/org.openbravo.base.weld/lib/runtime/weld-core-impl-3.1.0.Final.jar has changed
Binary file modules/org.openbravo.base.weld/lib/runtime/weld-core-impl-3.1.1.Final.jar has changed
Binary file modules/org.openbravo.base.weld/lib/runtime/weld-environment-common-3.1.0.Final.jar has changed
Binary file modules/org.openbravo.base.weld/lib/runtime/weld-environment-common-3.1.1.Final.jar has changed
Binary file modules/org.openbravo.base.weld/lib/runtime/weld-jsf-3.1.0.Final.jar has changed
Binary file modules/org.openbravo.base.weld/lib/runtime/weld-jsf-3.1.1.Final.jar has changed
Binary file modules/org.openbravo.base.weld/lib/runtime/weld-servlet-core-3.1.0.Final.jar has changed
Binary file modules/org.openbravo.base.weld/lib/runtime/weld-servlet-core-3.1.1.Final.jar has changed
Binary file modules/org.openbravo.base.weld/lib/runtime/weld-web-3.1.0.Final.jar has changed
Binary file modules/org.openbravo.base.weld/lib/runtime/weld-web-3.1.1.Final.jar has changed
Binary file src-db/database/lib/dbsourcemanager.jar has changed
--- a/src-db/database/model/prescript-PostgreSql.sql	Thu May 09 09:05:05 2019 +0200
+++ b/src-db/database/model/prescript-PostgreSql.sql	Tue May 14 00:54:35 2019 +0200
@@ -79,7 +79,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2001-2006 Openbravo SLU
+* All portions are Copyright (C) 2001-2019 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -89,7 +89,13 @@
   DECLARE  v_p3 NUMERIC;
   DECLARE  v_i NUMERIC;
 begin
-  v_text := replace($1, ' = ANY',' in');
+  v_text := $1;
+  if v_text like 'CHECK (%' then
+    v_text := substring(v_text, 8);
+    v_text := substring(v_text, 1, length(v_text) - 1);
+  end if;
+
+  v_text := replace(v_text, ' = ANY',' in');
   v_text := replace(v_text, 'ARRAY[', '');
   v_text := replace(v_text, ']' , '');
   v_text := replace(v_text, '::bpchar', '');
@@ -1070,7 +1076,7 @@
             WHEN 'P'::text THEN upper(pg_constraint.conname::text)
             WHEN 'U'::text THEN upper(pg_constraint.conname::text)
             ELSE ''::text
-        END AS index_name, dba_getstandard_search_text(pg_constraint.consrc) AS search_condition, 'ENABLED'::text AS STATUS
+        END AS index_name, (case pg_constraint.contype when 'c' then dba_getstandard_search_text(pg_get_constraintdef(pg_constraint.oid)) else null end) AS search_condition, 'ENABLED'::text AS STATUS
    FROM pg_constraint
    JOIN pg_class ON pg_class.oid = pg_constraint.conrelid
    LEFT JOIN pg_class fk_table ON fk_table.oid = pg_constraint.confrelid
@@ -1171,7 +1177,7 @@
             ELSE 0
         END AS data_scale,
         CASE pg_attribute.atthasdef
-            WHEN true THEN ( SELECT pg_attrdef.adsrc
+            WHEN true THEN ( SELECT pg_get_expr(adbin, adrelid)
                FROM pg_attrdef
               WHERE pg_attrdef.adrelid = pg_class.oid AND pg_attrdef.adnum = pg_attribute.attnum)
             ELSE NULL::text
@@ -1435,7 +1441,7 @@
               END),'.')|| (not pg_attribute.attnotnull)::TEXT||
               COALESCE(
               (CASE pg_attribute.atthasdef
-                  WHEN true THEN ( SELECT pg_attrdef.adsrc FROM pg_attrdef WHERE pg_attrdef.adrelid = pg_class.oid AND pg_attrdef.adnum = pg_attribute.attnum)
+                  WHEN true THEN ( SELECT pg_get_expr(adbin, adrelid) FROM pg_attrdef WHERE pg_attrdef.adrelid = pg_class.oid AND pg_attrdef.adnum = pg_attribute.attnum)
                   ELSE NULL::text
               END),'.')) as cl
               FROM pg_class, pg_namespace, pg_attribute, pg_type
--- a/src/org/openbravo/authentication/AuthenticationManager.java	Thu May 09 09:05:05 2019 +0200
+++ b/src/org/openbravo/authentication/AuthenticationManager.java	Tue May 14 00:54:35 2019 +0200
@@ -88,7 +88,7 @@
    * @return true if this is a stateless request
    */
   public static boolean isStatelessRequest(HttpServletRequest request) {
-    return "true".equals(request.getParameter(STATELESS_REQUEST_PARAMETER))
+    return request == null || "true".equals(request.getParameter(STATELESS_REQUEST_PARAMETER))
         || "true".equals(request.getAttribute(STATELESS_REQUEST_PARAMETER));
   }
 
@@ -263,7 +263,7 @@
     // If the current license has unlimited number of WS calls no limit will be checked, so there is
     // no need to create a new register in the AD_Session table
     if (activationKey.hasUnlimitedWsAccess()) {
-      if (request != null && !AuthenticationManager.isStatelessRequest(request)) {
+      if (!AuthenticationManager.isStatelessRequest(request)) {
         // force creation of the http session in stateful WS requests
         request.getSession(true);
       }