HsqlDatabaseProperties.java (hsqldb-2.6.0) | : | HsqlDatabaseProperties.java (hsqldb-2.6.1) | ||
---|---|---|---|---|
skipping to change at line 48 | skipping to change at line 48 | |||
import org.hsqldb.lib.HashMap; | import org.hsqldb.lib.HashMap; | |||
import org.hsqldb.lib.HashSet; | import org.hsqldb.lib.HashSet; | |||
import org.hsqldb.lib.Iterator; | import org.hsqldb.lib.Iterator; | |||
import org.hsqldb.lib.Set; | import org.hsqldb.lib.Set; | |||
import org.hsqldb.lib.StringUtil; | import org.hsqldb.lib.StringUtil; | |||
/** | /** | |||
* Manages a .properties file for a database. | * Manages a .properties file for a database. | |||
* | * | |||
* @author Fred Toussi (fredt@users dot sourceforge.net) | * @author Fred Toussi (fredt@users dot sourceforge.net) | |||
* @version 2.5.1 | * @version 2.6.1 | |||
* @since 1.7.0 | * @since 1.7.0 | |||
*/ | */ | |||
public class HsqlDatabaseProperties extends HsqlProperties { | public class HsqlDatabaseProperties extends HsqlProperties { | |||
private static final String hsqldb_method_class_names = | private static final String hsqldb_method_class_names = | |||
"hsqldb.method_class_names"; | "hsqldb.method_class_names"; | |||
public static final String textdb_allow_full_path = | public static final String textdb_allow_full_path = | |||
"textdb.allow_full_path"; | "textdb.allow_full_path"; | |||
private static HashSet accessibleJavaMethodNames; | private static HashSet accessibleJavaMethodNames; | |||
private static boolean allowFullPath; | private static boolean allowFullPath; | |||
skipping to change at line 156 | skipping to change at line 156 | |||
// allowed property metadata | // allowed property metadata | |||
private static final HashMap dbMeta = new HashMap(67); | private static final HashMap dbMeta = new HashMap(67); | |||
private static final HashMap textMeta = new HashMap(17); | private static final HashMap textMeta = new HashMap(17); | |||
// versions | // versions | |||
public static final String VERSION_STRING_1_8_0 = "1.8.0"; | public static final String VERSION_STRING_1_8_0 = "1.8.0"; | |||
public static final String PRODUCT_NAME = "HSQL Database Engine"; | public static final String PRODUCT_NAME = "HSQL Database Engine"; | |||
//#ifdef JAVA8 | //#ifdef JAVA8 | |||
public static final String THIS_VERSION = "2.6.0"; | public static final String THIS_VERSION = "2.6.1"; | |||
public static final String THIS_FULL_VERSION = "2.6.0"; | public static final String THIS_FULL_VERSION = "2.6.1"; | |||
public static final int MAJOR = 2, | public static final int MAJOR = 2, | |||
MINOR = 6, | MINOR = 6, | |||
REVISION = 0; | REVISION = 1; | |||
//#else | //#else | |||
/* | /* | |||
public static final String THIS_VERSION = "2.3.9"; | public static final String THIS_VERSION = "2.3.9"; | |||
public static final String THIS_FULL_VERSION = "2.3.9"; | public static final String THIS_FULL_VERSION = "2.3.9"; | |||
public static final int MAJOR = 2, | public static final int MAJOR = 2, | |||
MINOR = 3, | MINOR = 3, | |||
REVISION = 9; | REVISION = 9; | |||
*/ | */ | |||
skipping to change at line 295 | skipping to change at line 295 | |||
public static final String sql_syntax_db2 = "sql.syntax_db2"; | public static final String sql_syntax_db2 = "sql.syntax_db2"; | |||
public static final String sql_syntax_mss = "sql.syntax_mss"; | public static final String sql_syntax_mss = "sql.syntax_mss"; | |||
public static final String sql_syntax_mys = "sql.syntax_mys"; | public static final String sql_syntax_mys = "sql.syntax_mys"; | |||
public static final String sql_syntax_ora = "sql.syntax_ora"; | public static final String sql_syntax_ora = "sql.syntax_ora"; | |||
public static final String sql_syntax_pgs = "sql.syntax_pgs"; | public static final String sql_syntax_pgs = "sql.syntax_pgs"; | |||
public static final String sql_longvar_is_lob = "sql.longvar_is_lob"; | public static final String sql_longvar_is_lob = "sql.longvar_is_lob"; | |||
public static final String sql_pad_space = "sql.pad_space"; | public static final String sql_pad_space = "sql.pad_space"; | |||
public static final String sql_ignore_case = "sql.ignore_case"; | public static final String sql_ignore_case = "sql.ignore_case"; | |||
public static final String sql_live_object = "sql.live_object"; | public static final String sql_live_object = "sql.live_object"; | |||
public static final String sql_sys_index_names = "sql.sys_index_names"; | public static final String sql_sys_index_names = "sql.sys_index_names"; | |||
public static final String sql_lowercase_ident = "sql.lowercase_ident"; | ||||
// | // | |||
public static final String textdb_cache_scale = "textdb.cache_scale"; | public static final String textdb_cache_scale = "textdb.cache_scale"; | |||
public static final String textdb_cache_size_scale = | public static final String textdb_cache_size_scale = | |||
"textdb.cache_size_scale"; | "textdb.cache_size_scale"; | |||
public static final String textdb_cache_rows = "textdb.cache_rows"; | public static final String textdb_cache_rows = "textdb.cache_rows"; | |||
public static final String textdb_cache_size = "textdb.cache_size"; | public static final String textdb_cache_size = "textdb.cache_size"; | |||
public static final String textdb_all_quoted = "textdb.all_quoted"; | public static final String textdb_all_quoted = "textdb.all_quoted"; | |||
public static final String textdb_encoding = "textdb.encoding"; | public static final String textdb_encoding = "textdb.encoding"; | |||
public static final String textdb_ignore_first = "textdb.ignore_first"; | public static final String textdb_ignore_first = "textdb.ignore_first"; | |||
public static final String textdb_quoted = "textdb.quoted"; | public static final String textdb_quoted = "textdb.quoted"; | |||
public static final String textdb_fs = "textdb.fs"; | public static final String textdb_fs = "textdb.fs"; | |||
public static final String textdb_vs = "textdb.vs"; | public static final String textdb_vs = "textdb.vs"; | |||
public static final String textdb_lvs = "textdb.lvs"; | public static final String textdb_lvs = "textdb.lvs"; | |||
public static final String textdb_qc = "textdb.qc"; | public static final String textdb_qc = "textdb.qc"; | |||
public static final String textdb_null_def = "textdb.null_def"; | public static final String textdb_null_def = "textdb.null_def"; | |||
// | // obsolete property from version 2.5.1 | |||
public static final String hsqldb_min_reuse = "hsqldb.min_reuse"; | public static final String hsqldb_min_reuse = "hsqldb.min_reuse"; | |||
static { | static { | |||
// text table defaults | // text table defaults | |||
textMeta.put(textdb_allow_full_path, | textMeta.put(textdb_allow_full_path, | |||
HsqlProperties.getMeta(textdb_allow_full_path, | HsqlProperties.getMeta(textdb_allow_full_path, | |||
SYSTEM_PROPERTY, allowFullPath)); | SYSTEM_PROPERTY, allowFullPath)); | |||
textMeta.put(textdb_quoted, | textMeta.put(textdb_quoted, | |||
HsqlProperties.getMeta(textdb_quoted, SQL_PROPERTY, | HsqlProperties.getMeta(textdb_quoted, SQL_PROPERTY, | |||
skipping to change at line 511 | skipping to change at line 512 | |||
HsqlProperties.getMeta(sql_longvar_is_lob, SQL_PROPERTY, | HsqlProperties.getMeta(sql_longvar_is_lob, SQL_PROPERTY, | |||
false)); | false)); | |||
dbMeta.put(sql_pad_space, | dbMeta.put(sql_pad_space, | |||
HsqlProperties.getMeta(sql_pad_space, SQL_PROPERTY, true)); | HsqlProperties.getMeta(sql_pad_space, SQL_PROPERTY, true)); | |||
dbMeta.put(sql_ignore_case, | dbMeta.put(sql_ignore_case, | |||
HsqlProperties.getMeta(sql_ignore_case, SQL_PROPERTY, | HsqlProperties.getMeta(sql_ignore_case, SQL_PROPERTY, | |||
false)); | false)); | |||
dbMeta.put(sql_sys_index_names, | dbMeta.put(sql_sys_index_names, | |||
HsqlProperties.getMeta(sql_sys_index_names, SQL_PROPERTY, | HsqlProperties.getMeta(sql_sys_index_names, SQL_PROPERTY, | |||
false)); | false)); | |||
dbMeta.put(sql_lowercase_ident, | ||||
HsqlProperties.getMeta(sql_lowercase_ident, SQL_PROPERTY, | ||||
false)); | ||||
dbMeta.put(hsqldb_files_space, | dbMeta.put(hsqldb_files_space, | |||
HsqlProperties.getMeta(hsqldb_files_space, SQL_PROPERTY, 0, | HsqlProperties.getMeta(hsqldb_files_space, SQL_PROPERTY, 0, | |||
new int[] { | new int[] { | |||
0, 1, 2, 4, 8, 16, 32, 64 | 0, 1, 2, 4, 8, 16, 32, 64 | |||
})); | })); | |||
// integral defaults for user-defined props - sets | // integral defaults for user-defined props - sets | |||
dbMeta.put(hsqldb_write_delay_millis, | dbMeta.put(hsqldb_write_delay_millis, | |||
HsqlProperties.getMeta(hsqldb_write_delay_millis, | HsqlProperties.getMeta(hsqldb_write_delay_millis, | |||
SQL_PROPERTY, 500, 0, 10000)); | SQL_PROPERTY, 500, 0, 10000)); | |||
End of changes. 6 change blocks. | ||||
5 lines changed or deleted | 9 lines changed or added |