H2 Console: data that is too long is now better abbreviated.

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,9 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>Faster data conversion from BIGINT or INT to DECIMAL.
+<ul><li>H2 Console: data that is too long is now abbreviated as follows: text... (100000 characters).
+    A large binary is abbreviated as follows: hex... (100000 bytes).
+</li><li>Faster data conversion from BIGINT or INT to DECIMAL.
 </li></ul>
 
 <h2>Version 1.2.126 (2009-12-18)</h2>

h2/src/main/org/h2/server/web/WebApp.java

@@ -69,11 +69,9 @@ public class WebApp implements DatabaseEventListener {
     protected String mimeType;
     protected long listenerLastEvent;
     protected int listenerLastState;
-
     protected boolean cache;
     protected boolean stop;
     protected String headerLanguage;
-
     protected Profiler profiler;
 
     WebApp(WebServer server) {
@@ -1635,14 +1633,32 @@ public class WebApp implements DatabaseEventListener {
         if (d == null) {
             return "<i>null</i>";
         } else if (d.length() > SysProperties.WEB_MAX_VALUE_LENGTH) {
-            return "<div style='display: none'>=+</div>" +
-                PageParser.escapeHtml(d.substring(0, 100) + "... (" + d.length() + ")");
+            String s;
+            if (isBinary(rs.getMetaData().getColumnType(columnIndex))) {
+                s = PageParser.escapeHtml(d.substring(0, 100)) + "... (" + (d.length() / 2) + " ${text.result.bytes})";
+            } else {
+                s = PageParser.escapeHtml(d.substring(0, 100)) + "... (" + d.length() + " ${text.result.characters})";
+            }
+            return "<div style='display: none'>=+</div>" + s;
         } else if (d.equals("null") || d.startsWith("= ") || d.startsWith("=+")) {
             return "<div style='display: none'>= </div>" + PageParser.escapeHtml(d);
         }
         return PageParser.escapeHtml(d);
     }
 
+    private boolean isBinary(int sqlType) {
+        switch (sqlType) {
+        case Types.BINARY:
+        case Types.BLOB:
+        case Types.JAVA_OBJECT:
+        case Types.LONGVARBINARY:
+        case Types.OTHER:
+        case Types.VARBINARY:
+            return true;
+        }
+        return false;
+    }
+
     private void unescapeData(String d, ResultSet rs, int columnIndex) throws SQLException {
         if (d.equals("null")) {
             rs.updateNull(columnIndex);

h2/src/main/org/h2/server/web/res/_text_de.properties

@@ -68,6 +68,8 @@ login.welcome=H2 Console
 result.1row=1 Datensatz
 result.autoCommitOff=Auto-Commit ist jetzt ausgeschaltet
 result.autoCommitOn=Auto-Commit ist jetzt eingeschaltet
+result.bytes=Bytes
+result.characters=Characters
 result.maxrowsSet=Maximale Anzahl Zeilen ist jetzt gesetzt
 result.noRows=keine Datensätze
 result.noRunningStatement=Im Moment wird kein Befehl ausgeführt

h2/src/main/org/h2/server/web/res/_text_en.properties

@@ -68,6 +68,8 @@ login.welcome=H2 Console
 result.1row=1 row
 result.autoCommitOff=Auto commit is now OFF
 result.autoCommitOn=Auto commit is now ON
+result.bytes=bytes
+result.characters=characters
 result.maxrowsSet=Max rowcount is set
 result.noRows=no rows
 result.noRunningStatement=There is currently no running statement

h2/src/main/org/h2/server/web/res/_text_es.properties

@@ -68,6 +68,8 @@ login.welcome=H2 Consola
 result.1row=1 fila
 result.autoCommitOff=El auto commit no está activo
 result.autoCommitOn=El auto commit está activo
+result.bytes=\#bytes
+result.characters=\#characters
 result.maxrowsSet=Número máximo de filas modificado
 result.noRows=No se han recuperado filas
 result.noRunningStatement=No hay una instrucción ejecutándose

h2/src/main/org/h2/server/web/res/_text_fr.properties

@@ -68,6 +68,8 @@ login.welcome=Console H2
 result.1row=1 enregistrement
 result.autoCommitOff=Validation automatique non activée
 result.autoCommitOn=Validation automatique activée
+result.bytes=\#bytes
+result.characters=\#characters
 result.maxrowsSet=Nombre max d'enregistrements défini
 result.noRows=Aucun enregistrement
 result.noRunningStatement=Pas d'instruction en cours

h2/src/main/org/h2/server/web/res/_text_hu.properties

@@ -68,6 +68,8 @@ login.welcome=H2 konzol
 result.1row=1 rekord
 result.autoCommitOff=Automatikus jóváhagyás kikapcsolva
 result.autoCommitOn=Automatikus jóváhagyás bekapcsolva
+result.bytes=\#bytes
+result.characters=\#characters
 result.maxrowsSet=Rekordok maximális száma beállítva
 result.noRows=nincs rekord
 result.noRunningStatement=Utasítás jelenleg nincs folyamatban

h2/src/main/org/h2/server/web/res/_text_in.properties

@@ -68,6 +68,8 @@ login.welcome=Konsol H2
 result.1row=1 baris
 result.autoCommitOff=Autocommit sekarang OFF
 result.autoCommitOn=Autocommit sekarang ON
+result.bytes=\#bytes
+result.characters=\#characters
 result.maxrowsSet=Hitungan baris maksimum terpasang
 result.noRows=Tidak ada hasil
 result.noRunningStatement=Saat ini tidak ada pernyataan yang beroperasi

h2/src/main/org/h2/server/web/res/_text_it.properties

@@ -68,6 +68,8 @@ login.welcome=Pannello di controllo H2
 result.1row=1 riga
 result.autoCommitOff=Auto inserimento adesso e' disattivo
 result.autoCommitOn=Auto inserimento adesso e' attivo
+result.bytes=\#bytes
+result.characters=\#characters
 result.maxrowsSet=Il numero massimo di righe e' stato impostato
 result.noRows=nessuna riga
 result.noRunningStatement=C'e' un comando in corso di esecuzione

h2/src/main/org/h2/server/web/res/_text_ja.properties

@@ -68,6 +68,8 @@ login.welcome=H2\u30B3\u30F3\u30BD\u30FC\u30EB
 result.1row=1 \u884C
 result.autoCommitOff=\u30AA\u30FC\u30C8\u30B3\u30DF\u30C3\u30C8\u304C\u7121\u52B9\u306B\u306A\u308A\u307E\u3057\u305F
 result.autoCommitOn=\u30AA\u30FC\u30C8\u30B3\u30DF\u30C3\u30C8\u304C\u6709\u52B9\u306B\u306A\u308A\u307E\u3057\u305F
+result.bytes=\#bytes
+result.characters=\#characters
 result.maxrowsSet=\u6700\u5927\u884C\u6570\u304C\u8A2D\u5B9A\u3055\u308C\u307E\u3057\u305F
 result.noRows=\u8A72\u5F53\u884C\u7121\u3057
 result.noRunningStatement=\u73FE\u5728\u5B9F\u884C\u4E2D\u306E\u30B9\u30C6\u30FC\u30C8\u30E1\u30F3\u30C8\u306F\u3042\u308A\u307E\u305B\u3093

h2/src/main/org/h2/server/web/res/_text_nl.properties

@@ -68,6 +68,8 @@ login.welcome=H2 Console
 result.1row=1 rij
 result.autoCommitOff=Auto commit is nu UIT
 result.autoCommitOn=Auto commit is nu AAN
+result.bytes=\#bytes
+result.characters=\#characters
 result.maxrowsSet=Het maximum aantal rijen is ingesteld
 result.noRows=geen rijen
 result.noRunningStatement=Er wordt momenteel geen statement uitgevoerd

h2/src/main/org/h2/server/web/res/_text_pl.properties

@@ -68,6 +68,8 @@ login.welcome=Konsola H2
 result.1row=1 rekord
 result.autoCommitOff=Automatyczne zatwierdzanie jest teraz WY&\#321;&\#260;CZONE
 result.autoCommitOn=Automatyczne zatwierdzanie jest teraz W&\#321;ACZONE
+result.bytes=\#bytes
+result.characters=\#characters
 result.maxrowsSet=Maksymalna ilo&\#347;&\#263; rekordów
 result.noRows=brak danych
 result.noRunningStatement=Obecnie nie jest wykonywane &\#380;edne zapytanie

h2/src/main/org/h2/server/web/res/_text_pt_br.properties

@@ -68,6 +68,8 @@ login.welcome=Consola H2
 result.1row=Uma linha
 result.autoCommitOff=Auto commit agora está desligado
 result.autoCommitOn=Auto commit agora está ligado
+result.bytes=\#bytes
+result.characters=\#characters
 result.maxrowsSet=Número máximo de linhas foi alterado
 result.noRows=sem linhas
 result.noRunningStatement=Actualmente não existe nenhum comando em execução

h2/src/main/org/h2/server/web/res/_text_pt_pt.properties

@@ -68,6 +68,8 @@ login.welcome=Consola H2
 result.1row=1 linha
 result.autoCommitOff=O auto commit passou a estar desligado
 result.autoCommitOn=O auto commit passou a estar ligado
+result.bytes=\#bytes
+result.characters=\#characters
 result.maxrowsSet=O número máximo de linhas foi alterado
 result.noRows=sem linhas
 result.noRunningStatement=Actualmente não existe nenhum comando em execução

h2/src/main/org/h2/server/web/res/_text_ru.properties

@@ -68,6 +68,8 @@ login.welcome=H2 Console
 result.1row=1 &\#1089;&\#1090;&\#1088;&\#1086;&\#1082;&\#1072;
 result.autoCommitOff=&\#1040;&\#1074;&\#1090;&\#1086;-&\#1074;&\#1099;&\#1087;&\#1086;&\#1083;&\#1085;&\#1077;&\#1085;&\#1080;&\#1077; &\#1089;&\#1077;&\#1081;&\#1095;&\#1072;&\#1089; &\#1042;&\#1067;&\#1050;&\#1051;&\#1070;&\#1063;&\#1045;&\#1053;&\#1054;
 result.autoCommitOn=&\#1040;&\#1074;&\#1090;&\#1086;-&\#1074;&\#1099;&\#1087;&\#1086;&\#1083;&\#1085;&\#1077;&\#1085;&\#1080;&\#1077; &\#1089;&\#1077;&\#1081;&\#1095;&\#1072;&\#1089; &\#1042;&\#1050;&\#1051;&\#1070;&\#1063;&\#1045;&\#1053;&\#1054;
+result.bytes=\#bytes
+result.characters=\#characters
 result.maxrowsSet=&\#1059;&\#1089;&\#1090;&\#1072;&\#1085;&\#1086;&\#1074;&\#1083;&\#1077;&\#1085;&\#1086; &\#1084;&\#1072;&\#1082;&\#1089;&\#1080;&\#1084;&\#1072;&\#1083;&\#1100;&\#1085;&\#1086;&\#1077; &\#1082;&\#1086;&\#1083;&\#1080;&\#1095;&\#1077;&\#1089;&\#1090;&\#1074;&\#1086; &\#1089;&\#1090;&\#1088;&\#1086;&\#1082;
 result.noRows=&\#1085;&\#1077;&\#1090; &\#1089;&\#1090;&\#1088;&\#1086;&\#1082;
 result.noRunningStatement=&\#1057;&\#1077;&\#1081;&\#1095;&\#1072;&\#1089; &\#1085;&\#1077;&\#1090;&\#1091; &\#1074;&\#1099;&\#1087;&\#1086;&\#1083;&\#1085;&\#1103;&\#1077;&\#1084;&\#1099;&\#1093; &\#1079;&\#1072;&\#1087;&\#1088;&\#1086;&\#1089;&\#1086;&\#1074;

h2/src/main/org/h2/server/web/res/_text_tr.properties

@@ -68,6 +68,8 @@ login.welcome=H2 Konsolu
 result.1row=1 dizi
 result.autoCommitOff=Auto-Commit kapat&\#305;ld&\#305;
 result.autoCommitOn=Auto-Commit a&\#231;&\#305;ld&\#305;
+result.bytes=\#bytes
+result.characters=\#characters
 result.maxrowsSet=Maximum dizi say&\#305;s&\#305; ayar&\#305; yap&\#305;ld&\#305;
 result.noRows=Hi&\#231; bir bilgi yok
 result.noRunningStatement=&\#350;u an bir komut icra ediliyor

h2/src/main/org/h2/server/web/res/_text_uk.properties

@@ -68,6 +68,8 @@ login.welcome=&\#x041A;&\#x043E;&\#x043D;&\#x0441;&\#x043E;&\#x043B;&\#x044C; H2
 result.1row=1 &\#x0440;&\#x044F;&\#x0434;&\#x043E;&\#x043A;
 result.autoCommitOff=&\#x0410;&\#x0432;&\#x0442;&\#x043E;&\#x0437;&\#x0431;&\#x0435;&\#x0440;&\#x0435;&\#x0436;&\#x0435;&\#x043D;&\#x043D;&\#x044F; &\#x0432;&\#x0438;&\#x043A;&\#x043B;&\#x044E;&\#x0447;&\#x0435;&\#x043D;&\#x0435;
 result.autoCommitOn=&\#x0410;&\#x0432;&\#x0442;&\#x043E;&\#x0437;&\#x0431;&\#x0435;&\#x0440;&\#x0435;&\#x0436;&\#x0435;&\#x043D;&\#x043D;&\#x044F; &\#x0432;&\#x043A;&\#x043B;&\#x044E;&\#x0447;&\#x0435;&\#x043D;&\#x0435;
+result.bytes=\#bytes
+result.characters=\#characters
 result.maxrowsSet=&\#x0412;&\#x0441;&\#x0442;&\#x0430;&\#x043D;&\#x043E;&\#x0432;&\#x043B;&\#x0435;&\#x043D;&\#x043E; &\#x043C;&\#x0430;&\#x043A;&\#x0441;&\#x0438;&\#x043C;&\#x0430;&\#x043B;&\#x044C;&\#x043D;&\#x0443; &\#x043A;&\#x0456;&\#x043B;&\#x044C;&\#x043A;&\#x0456;&\#x0441;&\#x0442;&\#x044C; &\#x0440;&\#x044F;&\#x0434;&\#x043A;&\#x0456;&\#x0432;
 result.noRows=&\#x043D;&\#x0435;&\#x043C;&\#x0430;&\#x0454; &\#x0440;&\#x044F;&\#x0434;&\#x043A;&\#x0456;&\#x0432;
 result.noRunningStatement=&\#x0412; &\#x0434;&\#x0430;&\#x043D;&\#x0438;&\#x0439; &\#x043C;&\#x043E;&\#x043C;&\#x0435;&\#x043D;&\#x0442; &\#x043D;&\#x0435; &\#x0432;&\#x0438;&\#x043A;&\#x043E;&\#x043D;&\#x0443;&\#x0454;&\#x0442;&\#x044C;&\#x0441;&\#x044F; &\#x0436;&\#x043E;&\#x0434;&\#x0435;&\#x043D; &\#x0437;&\#x0430;&\#x043F;&\#x0438;&\#x0442;

h2/src/main/org/h2/server/web/res/_text_zh_cn.properties

@@ -68,6 +68,8 @@ login.welcome=H2 \u63A7\u5236\u53F0
 result.1row=1 \u884C
 result.autoCommitOff=\u81EA\u52A8\u63D0\u4EA4\u73B0\u5728\u4E3A\u5173\u95ED
 result.autoCommitOn=\u81EA\u52A8\u63D0\u4EA4\u73B0\u5728\u4E3A\u6253\u5F00
+result.bytes=\#bytes
+result.characters=\#characters
 result.maxrowsSet=\u6700\u5927\u8FD4\u56DE\u884C\u6570\u88AB\u8BBE\u7F6E
 result.noRows=\u65E0\u8FD4\u56DE\u884C
 result.noRunningStatement=\u5F53\u524D\u6CA1\u6709\u6B63\u5728\u6267\u884C\u7684SQL\u8BED\u53E5

h2/src/main/org/h2/server/web/res/_text_zh_tw.properties

@@ -68,6 +68,8 @@ login.welcome=H2 \u63A7\u5236\u53F0
 result.1row=1\u5217\u8CC7\u6599\u5217 (row)
 result.autoCommitOff=\u81EA\u52D5\u63D0\u4EA4\u73FE\u5728\u70BA\u95DC\u9589\u72C0\u614B
 result.autoCommitOn=\u81EA\u52D5\u63D0\u4EA4\u73FE\u5728\u70BA\u958B\u555F\u72C0\u614B
+result.bytes=\#bytes
+result.characters=\#characters
 result.maxrowsSet=\u6700\u5927\u8CC7\u6599\u5217 (rowcount) \u8A2D\u5B9A\u5B8C\u6210
 result.noRows=\u7121\u8CC7\u6599\u5217 (rows)
 result.noRunningStatement=\u76EE\u524D\u6C92\u6709\u6B63\u5728\u57F7\u884C\u7684SQL\u8FF0\u53E5