Merge branch 'develop' into fixed_timestamp_error

jgebal · web-flow · commit 83f2792aa96f · 2018-05-07T23:54:03.000+01:00
diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks
@@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is
    *
    */
 
-  gc_version                 constant varchar2(50) := 'v3.1.2.1869-develop';
+  gc_version                 constant varchar2(50) := 'v3.1.2.1880-develop';
 
   /* Constants: Event names */
   subtype t_event_name           is varchar2(30);
diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb
@@ -132,14 +132,15 @@ create or replace type body ut_compound_data_value as
     l_result          integer;
     --the XML stylesheet is applied on XML representation of data to exclude column names from comparison
     --column names and data-types are compared separately
+    --user CHR(38) instead of ampersand to eliminate define request when installing through some IDEs
     l_xml_data_fmt    constant xmltype := xmltype(
         q'[<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
           <xsl:strip-space elements="*" />
           <xsl:template match="/child::*">
               <xsl:for-each select="child::node()">
                   <xsl:choose>
                       <xsl:when test="*[*]"><xsl:copy-of select="node()"/></xsl:when>
-                      <xsl:when test="position()=last()"><xsl:value-of select="normalize-space(.)"/><xsl:text>&#xD;</xsl:text></xsl:when>
+                      <xsl:when test="position()=last()"><xsl:value-of select="normalize-space(.)"/><xsl:text>'||CHR(38)||'#xD;</xsl:text></xsl:when>
                       <xsl:otherwise><xsl:value-of select="normalize-space(.)"/>,</xsl:otherwise>
                   </xsl:choose>
               </xsl:for-each>
diff --git a/source/install.sql b/source/install.sql
@@ -166,7 +166,6 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema
 @@install_component.sql 'expectations/data_values/ut_compound_data_diff_tmp.sql'
 @@install_component.sql 'expectations/data_values/ut_data_value.tps'
 @@install_component.sql 'expectations/data_values/ut_compound_data_value.tps'
-@@install_component.sql 'expectations/data_values/ut_compound_data_helper.pks'
 @@install_component.sql 'expectations/data_values/ut_data_value_anydata.tps'
 @@install_component.sql 'expectations/data_values/ut_data_value_collection.tps'
 @@install_component.sql 'expectations/data_values/ut_data_value_object.tps'
@@ -182,6 +181,7 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema
 @@install_component.sql 'expectations/data_values/ut_data_value_timestamp_ltz.tps'
 @@install_component.sql 'expectations/data_values/ut_data_value_varchar2.tps'
 @@install_component.sql 'expectations/data_values/ut_data_value_yminterval.tps'
+@@install_component.sql 'expectations/data_values/ut_compound_data_helper.pks'
 @@install_component.sql 'expectations/matchers/ut_matcher.tps'
 @@install_component.sql 'expectations/matchers/ut_comparison_matcher.tps'
 @@install_component.sql 'expectations/matchers/ut_be_false.tps'
diff --git a/source/uninstall.sql b/source/uninstall.sql
@@ -258,8 +258,6 @@ drop type ut_expectation_result force;
 
 drop package ut_event_manager;
 
-drop type ut_event_listener force;
-
 drop type ut_event_item force;
 
 drop type ut_key_value_pairs force;

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is`
`21`	`21`	`*`
`22`	`22`	`*/`
`23`	`23`
`24`		`- gc_version constant varchar2(50) := 'v3.1.2.1869-develop';`
	`24`	`+ gc_version constant varchar2(50) := 'v3.1.2.1880-develop';`
`25`	`25`
`26`	`26`	`/* Constants: Event names */`
`27`	`27`	`subtype t_event_name is varchar2(30);`