Simple patch to remove UNICODEESCAPE option in IJ.
Satheesh
Index: java/tools/org/apache/derby/impl/tools/ij/ij.jj
===================================================================
--- java/tools/org/apache/derby/impl/tools/ij/ij.jj (revision 168631)
+++ java/tools/org/apache/derby/impl/tools/ij/ij.jj (working copy)
@@ -610,7 +610,6 @@
| <SHOW: "show">
| <SHUTDOWN: "shutdown">
| <STATEMENT: "statement">
-| <UNICODEESCAPE: "unicodeescape">
| <USER: "user">
| <USING: "using">
| <WAIT: "wait">
@@ -973,7 +972,6 @@
| r=RunStatement()
| r=SetConnectionStatement()
| r=ShowConnectionsStatement()
-| r=UnicodeEscape()
| r=WaitForStatement()
| r=XA_DataSourceStatement()
| r=XA_ConnectStatement()
@@ -2146,28 +2144,6 @@
}
/**
- * Unicodeescape controls ASCII Unicode escape processing
- * <p>
- * Syntax:
- * UNICODEESCAPE [ ON | OFF ] ;
- */
-ijResult UnicodeEscape()
-:
-{
- Token on=null;
-}
-{
- <UNICODEESCAPE>
- ( on=<ON>
- | <OFF>
- )
- {
- LocalizedResource.setUnicodeEscape((on==null?false:true));
- return null;
- }
-}
-
-/**
* ReadOnly lets you control this aspect of the connection.
* REMIND: should have a general way to set all connection attributes,
* this is a shortcut for immediate needs.
@@ -3128,7 +3104,6 @@
| tok = <SHOW>
| tok = <SHUTDOWN>
| tok = <STATEMENT>
-| tok = <UNICODEESCAPE>
| tok = <USER>
| tok = <USING>
| tok = <WAIT>
Index: java/tools/org/apache/derby/impl/tools/ij/Main.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/ij/Main.java (revision 168631)
+++ java/tools/org/apache/derby/impl/tools/ij/Main.java (working copy)
@@ -85,7 +85,6 @@
String inputResourceName;
boolean gotProp;
- String tmpUnicode = null;
Properties connAttributeDefaults = null;
// load the property file if specified
@@ -133,11 +132,6 @@
}
}
- // set initial Unicode Escape Mode
- tmpUnicode = util.getSystemProperty("ij.unicodeEscape");
- if ((tmpUnicode != null) && tmpUnicode.toUpperCase(Locale.ENGLISH).equals("ON")) {
- LocalizedResource.setUnicodeEscape(true);
- }
String outFile = util.getSystemProperty("ij.outfile");
if (outFile != null && outFile.length()>0) {
LocalizedOutput oldOut = out;
Index: java/tools/org/apache/derby/loc/toolsmessages_it.properties
===================================================================
--- java/tools/org/apache/derby/loc/toolsmessages_it.properties (revision 168631)
+++ java/tools/org/apache/derby/loc/toolsmessages_it.properties (working copy)
@@ -90,7 +90,6 @@
\ GETCURRENTROWNUMBER name; -- restituisce il numero di righe per la posizione corrente del cursore di scorrimento denominato\n\
\ -- (quando il cursore non \u00e8 posizionato su una riga viene restituito 0.) \n\
\ CLOSE name; -- chiude il cursore denominato\n\
-\ UNICODEESCAPE [ ON | OFF ]; -- imposta la modalit\u00e0 unicode escape per il flusso di input\n\
\ LOCALIZEDDISPLAY [ ON | OFF ];\n\
\ -- controlla la rappresentazione dei dati sensibile alle impostazioni internazionali\n\
\ \n\
Index: java/tools/org/apache/derby/loc/toolsmessages.properties
===================================================================
--- java/tools/org/apache/derby/loc/toolsmessages.properties (revision 168631)
+++ java/tools/org/apache/derby/loc/toolsmessages.properties (working copy)
@@ -87,7 +87,6 @@
\ GETCURRENTROWNUMBER name; -- returns the row number for the current position of the named scroll cursor\n\
\ -- (0 is returned when the cursor is not positioned on a row.) \n\
\ CLOSE name; -- closes the named cursor\n\
-\ UNICODEESCAPE [ ON | OFF ]; -- sets unicode escape mode for the input stream\n\
\ LOCALIZEDDISPLAY [ ON | OFF ];\n\
\ -- controls locale sensitive data representation\n\
\ \n\
Index: java/tools/org/apache/derby/loc/toolsmessages_ja_JP.properties
===================================================================
--- java/tools/org/apache/derby/loc/toolsmessages_ja_JP.properties (revision 168631)
+++ java/tools/org/apache/derby/loc/toolsmessages_ja_JP.properties (working copy)
@@ -90,7 +90,6 @@
\ GETCURRENTROWNUMBER name; -- \u6307\u5b9a\u3057\u305f\u30b9\u30af\u30ed\u30fc\u30eb\u30fb\u30ab\u30fc\u30bd\u30eb\u306e\u73fe\u884c\u4f4d\u7f6e\u306e\u884c\u756a\u53f7\u3092\u623b\u3059\n\
\ -- (\u30ab\u30fc\u30bd\u30eb\u304c\u884c\u306b\u4f4d\u7f6e\u4ed8\u3051\u3089\u308c\u3066\u3044\u306a\u3044\u3068\u30010 \u304c\u623b\u3055\u308c\u307e\u3059\u3002) \n\
\ CLOSE name; -- \u6307\u5b9a\u3057\u305f\u30ab\u30fc\u30bd\u30eb\u3092\u30af\u30ed\u30fc\u30ba\u3059\u308b\n\
-\ UNICODEESCAPE [ ON | OFF ]; -- \u5165\u529b\u30b9\u30c8\u30ea\u30fc\u30e0\u306b\u5bfe\u3057\u3066\u30e6\u30cb\u30b3\u30fc\u30c9\u30fb\u30a8\u30b9\u30b1\u30fc\u30d7\u30fb\u30e2\u30fc\u30c9\u3092\u8a2d\u5b9a\u3059\u308b\n\
\ LOCALIZEDDISPLAY [ ON | OFF ];\n\
\ -- \u30ed\u30b1\u30fc\u30eb\u4f9d\u5b58\u30c7\u30fc\u30bf\u306e\u8868\u8a18\u3092\u5236\u5fa1\u3059\u308b\n\
\ \n\
Index: java/tools/org/apache/derby/loc/toolsmessages_zh_TW.properties
===================================================================
--- java/tools/org/apache/derby/loc/toolsmessages_zh_TW.properties (revision 168631)
+++ java/tools/org/apache/derby/loc/toolsmessages_zh_TW.properties (working copy)
@@ -90,7 +90,6 @@
\ GETCURRENTROWNUMBER name; -- \u50b3\u56de\u5177\u540d\u6372\u52d5\u6e38\u6a19\u76ee\u524d\u4f4d\u7f6e\u7684\u5217\u865f\n\
\ --\uff08\u7576\u6e38\u6a19\u4e0d\u5728\u5217\u4e0a\uff0c\u6703\u50b3\u56de 0\u3002\uff09\n\
\ CLOSE name; -- \u95dc\u9589\u5177\u540d\u6e38\u6a19\n\
-\ UNICODEESCAPE [ ON | OFF ]; -- \u8a2d\u5b9a\u8f38\u5165\u4e32\u6d41\u7684 Unicode \u8df3\u51fa\u6a21\u5f0f\n\
\ LOCALIZEDDISPLAY [ ON | OFF ];\n\
\ -- \u63a7\u5236\u80fd\u5340\u5206\u8a9e\u8a00\u74b0\u5883\u7684\u8cc7\u6599\u8868\u793a\u6cd5\n\
\ \n\
Index: java/tools/org/apache/derby/loc/toolsmessages_de_DE.properties
===================================================================
--- java/tools/org/apache/derby/loc/toolsmessages_de_DE.properties (revision 168631)
+++ java/tools/org/apache/derby/loc/toolsmessages_de_DE.properties (working copy)
@@ -90,7 +90,6 @@
\ GETCURRENTROWNUMBER Name; -- gibt f\u00fcr die aktuelle Position des benannten Scroll-Cursors die Zeilennummer an\n\
\ -- (Befindet sich der Cursor nicht in einer Zeile, wird 0 zur\u00fcckgegeben.) \n\
\ CLOSE Name; -- schlie\u00dft den benannten Cursor\n\
-\ UNICODEESCAPE [ ON | OFF ]; -- definiert f\u00fcr den Eingabedatenstrom den Unicode-Escape-Modus\n\
\ LOCALIZEDDISPLAY [ ON | OFF ];\n\
\ -- steuert die Darstellung von Daten, die von der L\u00e4ndereinstellung abh\u00e4ngen\n\
\ \n\
Index: java/tools/org/apache/derby/loc/toolsmessages_zh_CN.properties
===================================================================
--- java/tools/org/apache/derby/loc/toolsmessages_zh_CN.properties (revision 168631)
+++ java/tools/org/apache/derby/loc/toolsmessages_zh_CN.properties (working copy)
@@ -90,7 +90,6 @@
\ GETCURRENTROWNUMBER name; \uff0d \u8fd4\u56de\u547d\u540d\u6eda\u52a8\u6e38\u6807\u5f53\u524d\u4f4d\u7f6e\u7684\u884c\u53f7\n\
\ \uff0d\uff08\u5f53\u6e38\u6807\u7684\u4f4d\u7f6e\u4e0d\u5728\u4e00\u4e2a\u884c\u4e0a\u65f6\u8fd4\u56de 0\u3002\uff09\n\
\ CLOSE name; \uff0d \u5173\u95ed\u5df2\u547d\u540d\u7684\u6e38\u6807\n\
-\ UNICODEESCAPE [ ON | OFF ]; \uff0d \u5bf9\u8f93\u5165\u6d41\u8bbe\u7f6e unicode \u8f6c\u4e49\u65b9\u5f0f\n\
\ LOCALIZEDDISPLAY [ ON | OFF ];\n\
\ \uff0d \u63a7\u5236\u8bed\u8a00\u73af\u5883\u654f\u611f\u6570\u636e\u8868\u793a\u6cd5\n\
\ \n\
Index: java/tools/org/apache/derby/loc/toolsmessages_ko_KR.properties
===================================================================
--- java/tools/org/apache/derby/loc/toolsmessages_ko_KR.properties (revision 168631)
+++ java/tools/org/apache/derby/loc/toolsmessages_ko_KR.properties (working copy)
@@ -90,7 +90,6 @@
\ GETCURRENTROWNUMBER name; -- \uc774\ub984 \uc9c0\uc815\ub41c \ud654\uba74\uc774\ub3d9 \ucee4\uc11c\uc758 \ud604\uc7ac \uc704\uce58\uc5d0 \ub300\ud55c \ud589 \ubc88\ud638\ub97c \ub9ac\ud134\ud569\ub2c8\ub2e4.\n\
\ -- (\ucee4\uc11c\uac00 \ud589\uc5d0 \uc788\uc9c0 \uc54a\uc73c\uba74 0\uc774\ub9ac\ud134\ub429\ub2c8\ub2e4.) \n\
\ CLOSE name; -- \uc774\ub984 \uc9c0\uc815\ub41c \ucee4\uc11c\ub97c \ub2eb\uc2b5\ub2c8\ub2e4.\n\
-\ UNICODEESCAPE [ ON | OFF ]; -- \uc785\ub825 \uc2a4\ud2b8\ub9bc\uc5d0 \ub300\ud55c \uc720\ub2c8\ucf54\ub4dc \ud574\uc81c \ubaa8\ub4dc\ub97c \uc124\uc815\ud569\ub2c8\ub2e4.\n\
\ LOCALIZEDDISPLAY [ ON | OFF ];\n\
\ -- \ub85c\ucf00\uc77c \uad6c\ubd84 \ub370\uc774\ud130 \ud45c\uc2dc\ub97c \uc81c\uc5b4\ud569\ub2c8\ub2e4.\n\
\ \n\
Index: java/tools/org/apache/derby/loc/toolsmessages_pt_BR.properties
===================================================================
--- java/tools/org/apache/derby/loc/toolsmessages_pt_BR.properties (revision 168631)
+++ java/tools/org/apache/derby/loc/toolsmessages_pt_BR.properties (working copy)
@@ -87,7 +87,6 @@
\ GETCURRENTROWNUMBER name; -- retorna o n\u00famero de linhas \u00e0 posi\u00e7\u00e3o atual do cursor de rolagem nomeado\n\
\ -- (0 \u00e9 retornado quando o cursor n\u00e3o est\u00e1 posicionado em uma linha.) \n\
\ CLOSE name; -- fecha o cursor nomeado\n\
-\ UNICODEESCAPE [ ON | OFF ]; -- define o modo de escape unicode para o fluxo de entrada\n\
\ LOCALIZEDDISPLAY [ ON | OFF ];\n\
\ -- controla a representa\u00e7\u00e3o de dados sens\u00edveis a locale\n\
\ \n\
Index: java/tools/org/apache/derby/loc/toolsmessages_fr.properties
===================================================================
--- java/tools/org/apache/derby/loc/toolsmessages_fr.properties (revision 168631)
+++ java/tools/org/apache/derby/loc/toolsmessages_fr.properties (working copy)
@@ -90,7 +90,6 @@
\ GETCURRENTROWNUMBER name; -- renvoie le num\u00e9ro de ligne pour la position en cours du curseur de d\u00e9filement nomm\u00e9\n\
\ -- (0 est renvoy\u00e9 lorsque le curseur n'est pas positionn\u00e9 sur une ligne.) \n\
\ CLOSE name; -- ferme le curseur nomm\u00e9\n\
-\ UNICODEESCAPE [ ON | OFF ]; -- d\u00e9finit le mode d'\u00e9chappement unicode pour le flux en entr\u00e9e\n\
\ LOCALIZEDDISPLAY [ ON | OFF ];\n\
\ -- contr\u00f4le la repr\u00e9sentation des donn\u00e9es li\u00e9es \u00e0 l'environnement local\n\
\ \n\
Index: java/tools/org/apache/derby/loc/toolsmessages_es.properties
===================================================================
--- java/tools/org/apache/derby/loc/toolsmessages_es.properties (revision 168631)
+++ java/tools/org/apache/derby/loc/toolsmessages_es.properties (working copy)
@@ -93,7 +93,6 @@
\ GETCURRENTROWNUMBER nombre; -- devuelve el n\u00famero de fila de la posici\u00f3n actual del cursor de desplazamiento indicado\n\
\ -- (devuelve 0 cuando el cursor no est\u00e1 situado en una fila)\n\
\ CLOSE nombre; -- cierra el cursor indicado\n\
-\ UNICODEESCAPE [ ON | OFF ]; -- establece la modalidad de escape unicode para la corriente de entrada\n\
\ LOCALIZEDDISPLAY [ ON | OFF ];\n\
\ -- controla la representaci\u00f3n de datos sensible al entorno local\n\
\ \n\
Index: java/testing/org/apache/derbyTesting/functionTests/tests/i18n/UnicodeEscape_JP.sql
===================================================================
--- java/testing/org/apache/derbyTesting/functionTests/tests/i18n/UnicodeEscape_JP.sql (revision 168631)
+++ java/testing/org/apache/derbyTesting/functionTests/tests/i18n/UnicodeEscape_JP.sql (working copy)
@@ -1,6 +1,5 @@
drop table jtest;
create table jtest(jint integer, jtime time, jvarchar varchar(255));
-UNICODEESCAPE ON;
insert into jtest values(1,'15:32:06','\u30a4\u30d9\u30f3\u30c8\u30a2\u30e9\u30fc\u30e0\u304c\u6709\u52b9\u3067\u3059\u3002');
insert into jtest values(2,'15:32:10','DR:DRAUTO\u306f0 (Off)\u3067\u3059\u3002');
insert into jtest values(3,'15:32:28','INFORMIX-OnLine\u304c\u521d\u671f\u5316\u3055\u308c\u3001\u30c7\u30a3\u30b9\u30af\u306e\u521d\u671f\u5316\u304c\u5b8c\u4e86\u3057\u307e\u3057\u305f\u3002');
Index: java/testing/org/apache/derbyTesting/functionTests/master/ij.out
===================================================================
--- java/testing/org/apache/derbyTesting/functionTests/master/ij.out (revision 168631)
+++ java/testing/org/apache/derbyTesting/functionTests/master/ij.out (working copy)
@@ -81,7 +81,6 @@
GETCURRENTROWNUMBER name; -- returns the row number for the current position of the named scroll cursor
-- (0 is returned when the cursor is not positioned on a row.)
CLOSE name; -- closes the named cursor
- UNICODEESCAPE [ ON | OFF ]; -- sets unicode escape mode for the input stream
LOCALIZEDDISPLAY [ ON | OFF ];
-- controls locale sensitive data representation
EXIT; -- exits ij
Index: java/testing/org/apache/derbyTesting/functionTests/master/UnicodeEscape_JP.out
===================================================================
--- java/testing/org/apache/derbyTesting/functionTests/master/UnicodeEscape_JP.out (revision 168631)
+++ java/testing/org/apache/derbyTesting/functionTests/master/UnicodeEscape_JP.out (working copy)
@@ -2,7 +2,6 @@
ERROR 42Y55: 'DROP TABLE' cannot be performed on 'JTEST' because it does not exist.
ij> create table jtest(jint integer, jtime time, jvarchar varchar(255));
0 rows inserted/updated/deleted
-ij> UNICODEESCAPE ON;
ij> insert into jtest values(1,'15:32:06','\u30a4\u30d9\u30f3\u30c8\u30a2\u30e9\u30fc\u30e0\u304c\u6709\u52b9\u3067\u3059\u3002');
1 row inserted/updated/deleted
ij> insert into jtest values(2,'15:32:10','DR:DRAUTO\u306f0 (Off)\u3067\u3059\u3002');
Index: java/testing/org/apache/derbyTesting/functionTests/master/j9_13/ij.out
===================================================================
--- java/testing/org/apache/derbyTesting/functionTests/master/j9_13/ij.out (revision 168631)
+++ java/testing/org/apache/derbyTesting/functionTests/master/j9_13/ij.out (working copy)
@@ -81,7 +81,6 @@
GETCURRENTROWNUMBER name; -- returns the row number for the current position of the named scroll cursor
-- (0 is returned when the cursor is not positioned on a row.)
CLOSE name; -- closes the named cursor
- UNICODEESCAPE [ ON | OFF ]; -- sets unicode escape mode for the input stream
LOCALIZEDDISPLAY [ ON | OFF ];
-- controls locale sensitive data representation
EXIT; -- exits ij
