firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 20:03:02 +01:00
Code Issues

Introduce ODS 14 for v6

Browse Source
This commit is contained in:
Dmitry Yemanov 2024-08-07 10:58:52 +03:00
parent c03852efc9
commit c91d779ff8
6 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CMakeLists.txt
View File

@ -494,7 +494,7 @@ add_library (boot_engine SHARED ${engine_generated_src_boot} ${V
target_link_libraries (boot_engine engine_common boot_alice boot_burp common boot_yvalve)
set_output_directory (boot_engine plugins CURRENT_DIR)
set_exported_symbols (boot_engine fbplugin)
copy_and_rename_lib (boot_engine Engine13)
copy_and_rename_lib (boot_engine Engine14)
project_group (boot_engine Boot)
endif() # if (NOT CMAKE_CROSSCOMPILING)
@ -506,7 +506,7 @@ endif() # if (NOT CMAKE_CROSSCOMPILING)
add_library (engine SHARED ${engine_generated_src_master} ${VERSION_RC})
target_link_libraries (engine engine_common alice burp common yvalve)
set_target_properties (engine PROPERTIES OUTPUT_NAME Engine13)
set_target_properties (engine PROPERTIES OUTPUT_NAME Engine14)
set_output_directory (engine plugins)
set_exported_symbols (engine fbplugin)

2
src/isql/isql.epp
View File

@ -4034,7 +4034,7 @@ static void check_autoterm()
}
if (!(protocolVersion == 0 || protocolVersion >= 19) && // PROTOCOL_VERSION19
ENCODE_ODS(isqlGlob.major_ods, isqlGlob.minor_ods) >= ODS_13_2)
isqlGlob.major_ods >= ODS_VERSION14)
{
setValues.AutoTerm = false;

2
src/jrd/constants.h
View File

@ -464,7 +464,7 @@ const TraNumber MAX_TRA_NUMBER = 0x0000FFFFFFFFFFFF; // ~2.8 * 10^14
const unsigned OPT_STATIC_ITEMS = 16;
const unsigned OPT_STATIC_STREAMS = 64;
#define CURRENT_ENGINE "Engine13"
#define CURRENT_ENGINE "Engine14"
#define EMBEDDED_PROVIDERS "Providers=" CURRENT_ENGINE
// Features set for current version of engine provider

25
src/jrd/ods.h
View File

@ -54,8 +54,10 @@
** ODS 10 was shipped with IB version 6.0
** Here the Firebird history begins:
** ODS 10.0 is for FB1.0 and ODS 10.1 is for FB1.5.
** ODS 11.0 is for FB2.0, ODS11.1 is for FB2.1 and ODS11.2 is for FB2.5.
** ODS 12.0 is for FB3, ODS 13.0 is for FB4.
** ODS 11.0 is for FB2.0, ODS 11.1 is for FB2.1 and ODS 11.2 is for FB2.5.
** ODS 12.0 is for FB3.
** ODS 13.0 is for FB4, ODS 13.1 is for FB5.
** ODS 14.0 is for FB6.
**
***********************************************************************/
@ -70,6 +72,7 @@ const USHORT ODS_VERSION10 = 10; // V6.0 features. SQL delimited idetifier,
const USHORT ODS_VERSION11 = 11; // Firebird 2.x features
const USHORT ODS_VERSION12 = 12; // Firebird 3.x features
const USHORT ODS_VERSION13 = 13; // Firebird 4.x features
const USHORT ODS_VERSION14 = 14; // Firebird 6.x features
// ODS minor version -- minor versions ARE compatible, but may be
// increasingly functional. Add new minor versions, but leave previous
@ -124,8 +127,12 @@ const USHORT ODS_CURRENT12 = 0;
const USHORT ODS_CURRENT13_0 = 0; // Firebird 4.0 features
const USHORT ODS_CURRENT13_1 = 1; // Firebird 5.0 features
const USHORT ODS_CURRENT13_2 = 2; // Firebird 6.0 features
const USHORT ODS_CURRENT13 = 2;
const USHORT ODS_CURRENT13 = 1;
// Minor versions for ODS 14
const USHORT ODS_CURRENT14_0 = 0; // Firebird 6.0 features
const USHORT ODS_CURRENT14 = 0;
// useful ODS macros. These are currently used to flag the version of the
// system triggers and system indices in ini.e
@ -147,7 +154,7 @@ const USHORT ODS_11_2 = ENCODE_ODS(ODS_VERSION11, 2);
const USHORT ODS_12_0 = ENCODE_ODS(ODS_VERSION12, 0);
const USHORT ODS_13_0 = ENCODE_ODS(ODS_VERSION13, 0);
const USHORT ODS_13_1 = ENCODE_ODS(ODS_VERSION13, 1);
const USHORT ODS_13_2 = ENCODE_ODS(ODS_VERSION13, 2);
const USHORT ODS_14_0 = ENCODE_ODS(ODS_VERSION14, 0);
const USHORT ODS_FIREBIRD_FLAG = 0x8000;
@ -166,16 +173,16 @@ inline USHORT DECODE_ODS_MINOR(USHORT ods_version)
// Set current ODS major and minor version
const USHORT ODS_VERSION = ODS_VERSION13; // Current ODS major version -- always
const USHORT ODS_VERSION = ODS_VERSION14; // Current ODS major version -- always
// the highest.
const USHORT ODS_RELEASED = ODS_CURRENT13_0; // The lowest stable minor version
const USHORT ODS_RELEASED = ODS_CURRENT14_0; // The lowest stable minor version
// number for this ODS_VERSION!
const USHORT ODS_CURRENT = ODS_CURRENT13; // The highest defined minor version
const USHORT ODS_CURRENT = ODS_CURRENT14; // The highest defined minor version
// number for this ODS_VERSION!
const USHORT ODS_CURRENT_VERSION = ODS_13_2; // Current ODS version in use which includes
const USHORT ODS_CURRENT_VERSION = ODS_14_0; // Current ODS version in use which includes
// both major and minor ODS versions!

2
src/jrd/sys-packages/SqlPackage.cpp
View File

@ -165,7 +165,7 @@ SqlPackage::SqlPackage(MemoryPool& pool)
: SystemPackage(
pool,
"RDB$SQL",
ODS_13_2,
ODS_14_0,
// procedures
{
SystemProcedure(

2
src/jrd/version.h
View File

@ -30,7 +30,7 @@
#ifdef RC_TARGET_chacha
#define VER_FILEDESC "Wire Encryption plugin using ChaCha cypher"
#elif RC_TARGET_engine13
#elif RC_TARGET_engine14
#define VER_FILEDESC "Engine plugin"
#elif defined RC_TARGET_fb_lock_print