PHOENIX-4387 DefaultColumnValueIT failing in non-US build environments (Pedro Boado)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/ca1e17b7 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/ca1e17b7 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/ca1e17b7 Branch: refs/heads/system-catalog Commit: ca1e17b75ced1e618869ad2c2ada019fcc336c02 Parents: 03fc331 Author: James Taylor <jtay...@salesforce.com> Authored: Sat Nov 18 11:36:53 2017 -0800 Committer: James Taylor <jtay...@salesforce.com> Committed: Sat Nov 18 11:36:53 2017 -0800 ---------------------------------------------------------------------- .../org/apache/phoenix/end2end/DefaultColumnValueIT.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/ca1e17b7/phoenix-core/src/it/java/org/apache/phoenix/end2end/DefaultColumnValueIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DefaultColumnValueIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DefaultColumnValueIT.java index 62d79bc..59b15d8 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DefaultColumnValueIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DefaultColumnValueIT.java @@ -32,6 +32,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Time; import java.sql.Timestamp; +import java.text.DecimalFormatSymbols; import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.util.ByteUtil; @@ -44,6 +45,8 @@ public class DefaultColumnValueIT extends ParallelStatsDisabledIT { private String sharedTable1; private String sharedTable2; + private String DEFAULT_CURRENCY_SYMBOL = DecimalFormatSymbols.getInstance().getCurrencySymbol(); + @Before public void init() { sharedTable1 = generateUniqueName(); @@ -583,7 +586,7 @@ public class DefaultColumnValueIT extends ParallelStatsDisabledIT { "pk INTEGER PRIMARY KEY," + "c1 INTEGER DEFAULT 1 + 9," + "c2 DOUBLE DEFAULT SQRT(91506.25)," - + "c3 DECIMAL DEFAULT TO_NUMBER('$123.33', '\u00A4###.##')," + + "c3 DECIMAL DEFAULT TO_NUMBER('" + DEFAULT_CURRENCY_SYMBOL + "123.33', '\u00A4###.##')," + "c4 VARCHAR DEFAULT 'AB' || 'CD'," + "c5 CHAR(5) DEFAULT 'E' || 'F'," + "c6 INTEGER DEFAULT \"MONTH\"(TO_TIMESTAMP('2015-6-05'))" @@ -599,7 +602,7 @@ public class DefaultColumnValueIT extends ParallelStatsDisabledIT { "pk INTEGER NOT NULL," + "c1 INTEGER NOT NULL DEFAULT 1 + 9," + "c2 DOUBLE NOT NULL DEFAULT SQRT(91506.25)," - + "c3 DECIMAL NOT NULL DEFAULT TO_NUMBER('$123.33', '\u00A4###.##')," + + "c3 DECIMAL NOT NULL DEFAULT TO_NUMBER('" + DEFAULT_CURRENCY_SYMBOL + "123.33', '\u00A4###.##')," + "c4 VARCHAR NOT NULL DEFAULT 'AB' || 'CD'," + "c5 CHAR(5) NOT NULL DEFAULT 'E' || 'F'," + "c6 INTEGER NOT NULL DEFAULT \"MONTH\"(TO_TIMESTAMP('2015-6-05'))," @@ -1045,7 +1048,7 @@ public class DefaultColumnValueIT extends ParallelStatsDisabledIT { "pk INTEGER PRIMARY KEY," + "c1 INTEGER DEFAULT 1 + 9," + "c2 DOUBLE DEFAULT SQRT(91506.25)," - + "c3 DECIMAL DEFAULT TO_NUMBER('$123.33', '\u00A4###.##')," + + "c3 DECIMAL DEFAULT TO_NUMBER('" + DEFAULT_CURRENCY_SYMBOL + "123.33', '\u00A4###.##')," + "c4 VARCHAR DEFAULT 'AB' || 'CD'," + "c5 CHAR(5) DEFAULT 'E' || 'F'," + "c6 INTEGER DEFAULT \"MONTH\"(TO_TIMESTAMP('2015-6-05'))"
