Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
H
h2database
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Administrator
h2database
Commits
a52381e5
提交
a52381e5
authored
10 年前
作者:
noelgrandin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Improve error message when the user specifies an unsupported combination of database settings.
上级
b4047421
master
noel-pr1
plus33-master
pr/267
stumc-Issue#576
version-1.4.198
version-1.4.197
version-1.4.196
version-1.4.195
version-1.4.194
version-1.4.193
version-1.4.192
version-1.4.191
version-1.4.190
version-1.4.188
version-1.4.187
version-1.4.186
version-1.4.185
version-1.4.184
version-1.4.183
version-1.4.182
version-1.4.181
version-1.4.178
version-1.3
无相关合并请求
隐藏空白字符变更
内嵌
并排
正在显示
13 个修改的文件
包含
23 行增加
和
6 行删除
+23
-6
changelog.html
h2/src/docsrc/html/changelog.html
+2
-1
ErrorCode.java
h2/src/main/org/h2/api/ErrorCode.java
+8
-2
Database.java
h2/src/main/org/h2/engine/Database.java
+3
-3
_messages_cs.prop
h2/src/main/org/h2/res/_messages_cs.prop
+1
-0
_messages_de.prop
h2/src/main/org/h2/res/_messages_de.prop
+1
-0
_messages_en.prop
h2/src/main/org/h2/res/_messages_en.prop
+1
-0
_messages_es.prop
h2/src/main/org/h2/res/_messages_es.prop
+1
-0
_messages_ja.prop
h2/src/main/org/h2/res/_messages_ja.prop
+1
-0
_messages_pl.prop
h2/src/main/org/h2/res/_messages_pl.prop
+1
-0
_messages_pt_br.prop
h2/src/main/org/h2/res/_messages_pt_br.prop
+1
-0
_messages_ru.prop
h2/src/main/org/h2/res/_messages_ru.prop
+1
-0
_messages_sk.prop
h2/src/main/org/h2/res/_messages_sk.prop
+1
-0
_messages_zh_cn.prop
h2/src/main/org/h2/res/_messages_zh_cn.prop
+1
-0
没有找到文件。
h2/src/docsrc/html/changelog.html
浏览文件 @
a52381e5
...
...
@@ -18,7 +18,8 @@ Change Log
<h1>
Change Log
</h1>
<h2>
Next Version (unreleased)
</h2>
<ul><li>
MVStore: support for volatile maps (that don't store changes).
<ul><li>
Improve error message when the user specifies an unsupported combination of database settings.
</li><li>
MVStore: support for volatile maps (that don't store changes).
</li><li>
MVStore mode: in-memory databases now also use the MVStore.
</li><li>
In server mode, appending ";autocommit=false" to the database URL was working,
but the return value of Connection.getAutoCommit() was wrong.
...
...
This diff is collapsed.
Click to expand it.
h2/src/main/org/h2/api/ErrorCode.java
浏览文件 @
a52381e5
...
...
@@ -643,6 +643,13 @@ public class ErrorCode {
*/
public
static
final
int
DATABASE_ALREADY_OPEN_1
=
90020
;
/**
* The error with code <code>90021</code> is thrown when
* trying to change a specific database property that conflicts with other
* database properties.
*/
public
static
final
int
UNSUPPORTED_SETTING_COMBINATION
=
90021
;
/**
* The error with code <code>90022</code> is thrown when
* trying to call a unknown function.
...
...
@@ -1908,8 +1915,7 @@ public class ErrorCode {
public
static
final
int
JAVA_OBJECT_SERIALIZER_CHANGE_WITH_DATA_TABLE
=
90141
;
// next are 90021, 90039,
// 90051, 90056, 90110, 90122, 90142
// next are 90039, 90051, 90056, 90110, 90122, 90142
private
ErrorCode
()
{
// utility class
...
...
This diff is collapsed.
Click to expand it.
h2/src/main/org/h2/engine/Database.java
浏览文件 @
a52381e5
...
...
@@ -2071,7 +2071,7 @@ public class Database implements DataHandler {
// currently the combination of LOCK_MODE=0 and MULTI_THREADED
// is not supported
throw
DbException
.
get
(
ErrorCode
.
CANNOT_CHANGE_SETTING_WHEN_OPEN_1
,
ErrorCode
.
UNSUPPORTED_SETTING_COMBINATION
,
"LOCK_MODE=0 & MULTI_THREADED"
);
}
break
;
...
...
@@ -2250,14 +2250,14 @@ public class Database implements DataHandler {
// currently the combination of MVCC and MULTI_THREADED is not
// supported
throw
DbException
.
get
(
ErrorCode
.
CANNOT_CHANGE_SETTING_WHEN_OPEN_1
,
ErrorCode
.
UNSUPPORTED_SETTING_COMBINATION
,
"MVCC & MULTI_THREADED"
);
}
if
(
lockMode
==
0
)
{
// currently the combination of LOCK_MODE=0 and MULTI_THREADED
// is not supported
throw
DbException
.
get
(
ErrorCode
.
CANNOT_CHANGE_SETTING_WHEN_OPEN_1
,
ErrorCode
.
UNSUPPORTED_SETTING_COMBINATION
,
"LOCK_MODE=0 & MULTI_THREADED"
);
}
}
...
...
This diff is collapsed.
Click to expand it.
h2/src/main/org/h2/res/_messages_cs.prop
浏览文件 @
a52381e5
...
...
@@ -48,6 +48,7 @@
90018=Připojení nebylo ukončeno aplikací a bude automaticky odstraněno
90019=Nelze smazat stávajícího uživatele
90020=Databáze je pravděpodobně používána: {0}. Možná řešení: uzavřete všechny ostatní připojení; použijte režim server
#90021=This combination of database settings: {0} is not supported
90022=Funkce {0} nenalezena
90023=Sloupec {0} nesmí mít možnou hodnotu NULL
90024=Chyba při přejmenování souboru {0} na {1}
...
...
This diff is collapsed.
Click to expand it.
h2/src/main/org/h2/res/_messages_de.prop
浏览文件 @
a52381e5
...
...
@@ -48,6 +48,7 @@
90018=Die Datenbank-Verbindung wurde nicht explizit geschlossen (jetzt in der Müllabfuhr)
90019=Kann aktuellen Benutzer nicht löschen
90020=Datenbank wird wahrscheinlich bereits benutzt: {0}. Mögliche Lösungen: alle Verbindungen schliessen; Server Modus verwenden
#90021=This combination of database settings: {0} is not supported
90022=Funktion {0} nicht gefunden
90023=Feld {0} darf nicht NULL nicht erlauben
90024=Fehler beim Umbenennen der Datei {0} nach {1}
...
...
This diff is collapsed.
Click to expand it.
h2/src/main/org/h2/res/_messages_en.prop
浏览文件 @
a52381e5
...
...
@@ -48,6 +48,7 @@
90018=The connection was not closed by the application and is garbage collected
90019=Cannot drop the current user
90020=Database may be already in use: {0}. Possible solutions: close all other connection(s); use the server mode
90021=This combination of database settings: {0} is not supported
90022=Function {0} not found
90023=Column {0} must not be nullable
90024=Error while renaming file {0} to {1}
...
...
This diff is collapsed.
Click to expand it.
h2/src/main/org/h2/res/_messages_es.prop
浏览文件 @
a52381e5
...
...
@@ -48,6 +48,7 @@
90018=La conexión no fue cerrada por la aplicación y esta siendo limpiada (garbage collected)
90019=Imposible eliminar el usuario actual
90020=La base de datos puede que ya esté siendo utilizada: {0}. Soluciones Posibles: cierre todas las otras conexiones; use el modo server
#90021=This combination of database settings: {0} is not supported
90022=Función {0} no encontrada
90023=Columna {0} no puede ser nullable
90024=Error mientras se renombraba el archivo {0} a {1}
...
...
This diff is collapsed.
Click to expand it.
h2/src/main/org/h2/res/_messages_ja.prop
浏览文件 @
a52381e5
...
...
@@ -48,6 +48,7 @@
90018=アプリケーションにより閉じられていない接続がガベージコレクトされました
90019=使用中のユーザをドロップすることはできません
90020=データベースが使用中です: {0}. 可能な解決策: 他の接続を全て閉じる; サーバモードを使う
#90021=This combination of database settings: {0} is not supported
90022=関数 {0} が見つかりません
90023=列 {0} にはnull値を許すべきてはありません
90024=ファイル名を {0} から {1} に変更中にエラーが発生しました
...
...
This diff is collapsed.
Click to expand it.
h2/src/main/org/h2/res/_messages_pl.prop
浏览文件 @
a52381e5
...
...
@@ -48,6 +48,7 @@
90018=Połączenie zostało zamknięte przez aplikacje i zostało usunięte przez kolektor nieużytków
90019=Nie można skasować aktualnego użytkownika
90020=Baza danych może być już otwarta: {0}
#90021=This combination of database settings: {0} is not supported
90022=Funkcja {0} nie istnieje
90023=Kolumna {0} nie może zawierać wartości pustej
90024=Błąd w zmianie nazwy pliku {0} na {1}
...
...
This diff is collapsed.
Click to expand it.
h2/src/main/org/h2/res/_messages_pt_br.prop
浏览文件 @
a52381e5
...
...
@@ -48,6 +48,7 @@
90018=A conecção foi fechada pela aplicação e retirada da memória
90019=Não pode remover o usuário corrente
90020=A base de dados talvez esteja em uso: {0}. Solução possível: fechar todas as outras conecções; use o modo servidor
#90021=This combination of database settings: {0} is not supported
90022=Função {0} não encontrada
90023=Coluna {0} não deve permitir valor nulo
90024=Erro ao renomear arquivo {0} para {1}
...
...
This diff is collapsed.
Click to expand it.
h2/src/main/org/h2/res/_messages_ru.prop
浏览文件 @
a52381e5
...
...
@@ -48,6 +48,7 @@
90018=Незакрытое приложением соединение уничтожено сборщиком мусора
90019=Невозможно удалить текущего пользователя
90020=База данных уже используется: {0}. Возможные решения: закрыть все другие соединения; использовать режим сервера
#90021=This combination of database settings: {0} is not supported
90022=Функция {0} не найдена
90023=Поле {0} не должно поддерживать значение NULL
90024=Ошибка при переименовании файла {0} в {1}
...
...
This diff is collapsed.
Click to expand it.
h2/src/main/org/h2/res/_messages_sk.prop
浏览文件 @
a52381e5
...
...
@@ -48,6 +48,7 @@
90018=Spojenie neuzatvorené aplikáciou bolo zrušené
90019=Nemôžem zmazať aktuálneho používateľa
90020=Databáza sa už asi používa: {0}. Možné riešenia: zatvorte všetky dalšie spojenia; použite serverový mód
#90021=This combination of database settings: {0} is not supported
90022=Funkcia {0} nenájdená
90023=Stĺpec {0} nesmie umožniť vložiť NULL
90024=Chyba pri premenovaní súboru {0} na {1}
...
...
This diff is collapsed.
Click to expand it.
h2/src/main/org/h2/res/_messages_zh_cn.prop
浏览文件 @
a52381e5
...
...
@@ -48,6 +48,7 @@
90018=连接未被关闭但已被垃圾回收器回收
90019=不能移除当前用户
90020=数据可可能当前已正被使用: {0}. 解决方案有:关闭所有其他连接; 使用服务器模式(server mode)
#90021=This combination of database settings: {0} is not supported
90022=未找到函数 {0}
90023=字段 {0} 不能为空
90024=将文件 {0} 命名为 {1} 发生错误
...
...
This diff is collapsed.
Click to expand it.
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论