FirebirdSQL · AlexPeshkoff · Nov 25, 2021 · Nov 25, 2021 · Dec 20, 2021 · Dec 21, 2021
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,6 +1,6 @@
 name: CI
 
-on: [push, pull_request]
+on: [pull_request]
 
 jobs:
 

diff --git a/src/alice/exe.cpp b/src/alice/exe.cpp
@@ -73,7 +73,7 @@ int EXE_action(const TEXT* database, const SINT64 switches)
 	bool error = false;
 	AliceGlobals* tdgbl = AliceGlobals::getSpecific();
 	{
-		Firebird::AutoMemoryPool newPool(MemoryPool::createPool());
+		Firebird::AutoMemoryPool newPool(MemoryPool::createPool(ALLOC_ARGS0));
 		AliceContextPoolHolder context(tdgbl, newPool);
 
 		for (USHORT i = 0; i < MAX_VAL_ERRORS; i++)
@@ -145,7 +145,7 @@ int EXE_two_phase(const TEXT* database, const SINT64 switches)
 	bool error = false;
 	AliceGlobals* tdgbl = AliceGlobals::getSpecific();
 	{
-		Firebird::AutoMemoryPool newPool(MemoryPool::createPool());
+		Firebird::AutoMemoryPool newPool(MemoryPool::createPool(ALLOC_ARGS0));
 		AliceContextPoolHolder context(tdgbl, newPool);
 
 		for (USHORT i = 0; i < MAX_VAL_ERRORS; i++)

diff --git a/src/burp/backup.epp b/src/burp/backup.epp
@@ -767,13 +767,13 @@ burp_fld* get_fields( burp_rel* relation)
 
 			if (!Y.RDB$CHARACTER_SET_ID.NULL)
 			{
-				field->fld_character_set_id = Y.RDB$CHARACTER_SET_ID;
+				field->fld_character_set_id = CSetId(Y.RDB$CHARACTER_SET_ID);
 				field->fld_flags |= FLD_charset_flag;
 			}
 
 			if (!X.RDB$COLLATION_ID.NULL)
 			{
-				field->fld_collation_id = X.RDB$COLLATION_ID;
+				field->fld_collation_id = CollId(X.RDB$COLLATION_ID);
 				field->fld_flags |= FLD_collate_flag;
 			}
 
@@ -886,13 +886,13 @@ burp_fld* get_fields( burp_rel* relation)
 
 			if (!Y.RDB$CHARACTER_SET_ID.NULL)
 			{
-				field->fld_character_set_id = Y.RDB$CHARACTER_SET_ID;
+				field->fld_character_set_id = CSetId(Y.RDB$CHARACTER_SET_ID);
 				field->fld_flags |= FLD_charset_flag;
 			}
 
 			if (!X.RDB$COLLATION_ID.NULL)
 			{
-				field->fld_collation_id = X.RDB$COLLATION_ID;
+				field->fld_collation_id = CollId(X.RDB$COLLATION_ID);
 				field->fld_flags |= FLD_collate_flag;
 			}
 
@@ -1647,7 +1647,8 @@ void put_index( burp_rel* relation)
 		FOR (REQUEST_HANDLE tdgbl->handles_put_index_req_handle1)
 			X IN RDB$INDICES WITH
 			X.RDB$SCHEMA_NAME EQUIV NULLIF(relation->rel_name.schema.c_str(), '') AND
-			X.RDB$RELATION_NAME EQ relation->rel_name.object.c_str()
+			X.RDB$RELATION_NAME EQ relation->rel_name.object.c_str() AND
+			X.RDB$INDEX_NAME NOT STARTING TEMP_DEPEND
 		{
 			count = 0;
 			FOR (REQUEST_HANDLE tdgbl->handles_put_index_req_handle2)

diff --git a/src/burp/burp.h b/src/burp/burp.h
@@ -49,6 +49,7 @@
 #include "../common/status.h"
 #include "../common/sha.h"
 #include "../common/classes/ImplementHelper.h"
+#include "../jrd/intl.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -767,8 +768,8 @@ struct burp_fld
 	SSHORT		fld_null_flag;
 	ISC_QUAD	fld_default_value;
 	ISC_QUAD	fld_default_source;
-	SSHORT		fld_character_set_id;
-	SSHORT		fld_collation_id;
+	CSetId		fld_character_set_id;
+	CollId		fld_collation_id;
 	RCRD_OFFSET	fld_sql;
 	RCRD_OFFSET	fld_null;
 };
@@ -984,7 +985,7 @@ class GblPool
 	}
 
 	explicit GblPool(bool ownPool)
-		: gbl_pool(ownPool ? MemoryPool::createPool(getDefaultMemoryPool()) : getDefaultMemoryPool())
+		: gbl_pool(ownPool ? MemoryPool::createPool(ALLOC_ARGS1 getDefaultMemoryPool()) : getDefaultMemoryPool())
 	{ }
 
 	~GblPool()

diff --git a/src/burp/restore.epp b/src/burp/restore.epp
@@ -298,13 +298,19 @@ void activateIndex(BurpGlobals* tdgbl, const QualifiedMetaString& indexName)
 	{
 		MODIFY IND1 USING
 			IND1.RDB$INDEX_INACTIVE = FALSE;
-		END_MODIFY
+		END_MODIFY;
+		ON_ERROR
+			fError = true;
+			fb_utils::copyStatus(&local_status_vector, isc_status);
+		END_ERROR;
 	}
-	END_FOR
+	END_FOR;
+
 	ON_ERROR
+		if (!fError)
+			fb_utils::copyStatus(&local_status_vector, isc_status);
 		fError = true;
-		fb_utils::copyStatus(&local_status_vector, isc_status);
-	END_ERROR
+	END_ERROR;
 
 	if (!fError)
 	{
@@ -4029,11 +4035,11 @@ burp_fld* get_field(BurpGlobals* tdgbl, burp_rel* relation, USHORT id)
 					break;
 
 				case att_field_character_set:
-					field->fld_character_set_id = (USHORT) get_int32(tdgbl);
+					field->fld_character_set_id = CSetId(get_int32(tdgbl));
 					break;
 
 				case att_field_collation_id:
-					field->fld_collation_id = (USHORT) get_int32(tdgbl);
+					field->fld_collation_id = CollId(get_int32(tdgbl));
 					X.RDB$COLLATION_ID.NULL = FALSE;
 					X.RDB$COLLATION_ID = field->fld_collation_id;
 					break;
@@ -4236,11 +4242,11 @@ burp_fld* get_field(BurpGlobals* tdgbl, burp_rel* relation, USHORT id)
 					break;
 
 				case att_field_character_set:
-					field->fld_character_set_id = (USHORT) get_int32(tdgbl);
+					field->fld_character_set_id = CSetId(get_int32(tdgbl));
 					break;
 
 				case att_field_collation_id:
-					field->fld_collation_id = (USHORT) get_int32(tdgbl);
+					field->fld_collation_id = CollId(get_int32(tdgbl));
 					X.RDB$COLLATION_ID.NULL = FALSE;
 					X.RDB$COLLATION_ID = field->fld_collation_id;
 					break;
@@ -8575,9 +8581,8 @@ bool get_schema(BurpGlobals* tdgbl)
 
 	QualifiedMetaString name;
 	bool securityClass = false;
-	ITransaction* local_trans = tdgbl->global_trans ? tdgbl->global_trans : gds_trans;
 
-	STORE (TRANSACTION_HANDLE local_trans REQUEST_HANDLE tdgbl->handles_get_schema_req_handle1)
+	STORE (REQUEST_HANDLE tdgbl->handles_get_schema_req_handle1)
 		X IN RDB$SCHEMAS
 	{
 		X.RDB$SCHEMA_NAME.NULL = TRUE;
@@ -13385,13 +13390,13 @@ bool WriteRelationMeta::prepareBatch(BurpGlobals* tdgbl)
 
 			SLONG sqlLength, sqlSubType, sqlScale, sqlType;
 			desc.getSqlInfo(&sqlLength, &sqlSubType, &sqlScale, &sqlType);
-			SLONG characterSetId = field->fld_character_set_id;
+			CSetId characterSetId = field->fld_character_set_id;
 
 			if (tdgbl->gbl_sw_fix_fss_data && field->fld_character_set_id == CS_UNICODE_FSS &&
 				((sqlType == SQL_BLOB && field->fld_sub_type == isc_blob_text && !(field->fld_flags & FLD_array)) ||
 				sqlType == SQL_TEXT || sqlType == SQL_VARYING))
 			{
-				characterSetId = tdgbl->gbl_sw_fix_fss_data_id;
+				characterSetId = CSetId(tdgbl->gbl_sw_fix_fss_data_id);
 			}
 			else if (field->fld_flags & FLD_array)
 			{

diff --git a/src/common/CharSet.h b/src/common/CharSet.h
@@ -32,18 +32,19 @@
 
 #include "CsConvert.h"
 #include "IntlUtil.h"
+#include "../jrd/intl.h"
 
 namespace Firebird {
 
-	template <>
-	inline void SimpleDelete<charset>::clear(charset* cs)
+template <>
+inline void SimpleDelete<charset>::clear(charset* cs)
+{
+	if (cs)
 	{
-		if (cs)
-		{
-			Firebird::IntlUtil::finiCharset(cs);
-			delete cs;
-		}
+		Firebird::IntlUtil::finiCharset(cs);
+		delete cs;
 	}
+}
 
 class CharSet
 {
@@ -84,7 +85,7 @@ class CharSet
 public:
 	virtual ~CharSet() {}
 
-	USHORT getId() const { return id; }
+	CSetId getId() const { return id; }
 	const char* getName() const { return cs->charset_name; }
 	UCHAR minBytesPerChar() const { return cs->charset_min_bytes_per_char; }
 	UCHAR maxBytesPerChar() const { return cs->charset_max_bytes_per_char; }
@@ -133,7 +134,7 @@ class CharSet
 							const ULONG startPos, const ULONG length) const = 0;
 
 private:
-	USHORT id;
+	CSetId id;
 	charset* cs;
 	UCHAR sqlMatchAny[sizeof(ULONG)];
 	UCHAR sqlMatchOne[sizeof(ULONG)];

diff --git a/src/common/CvtFormat.cpp b/src/common/CvtFormat.cpp
@@ -1849,7 +1849,7 @@ ISC_TIMESTAMP_TZ CVT_format_string_to_datetime(const dsc* desc, const Firebird::
 	if (format.isEmpty())
 		cb->err(Arg::Gds(isc_sysf_invalid_null_empty) << Arg::Str(STRINGIZE(format)));
 
-	USHORT dtype;
+	TTypeId dtype;
 	UCHAR* sourceString;
 	const USHORT stringLength = CVT_get_string_ptr_common(desc, &dtype, &sourceString, nullptr, 0, 0, cb);
 

diff --git a/src/common/StdHelper.h b/src/common/StdHelper.h
@@ -30,6 +30,7 @@
 #include <utility>
 #include <variant>
 #include <cstddef>
+#include <stdexcept>
 #include "boost/type_traits/copy_cv.hpp"
 
 namespace Firebird {

diff --git a/src/common/TextType.cpp b/src/common/TextType.cpp
@@ -94,14 +94,15 @@
 #include "firebird.h"
 #include "iberror.h"
 #include "../jrd/intl_classes.h"
+#include "../common/TextType.h"
 #include "../common/IntlUtil.h"
 #include "../common/classes/Aligner.h"
 
 
 namespace Firebird {
 
 
-TextType::TextType(TTYPE_ID _type, texttype *_tt, USHORT _attributes, CharSet* _cs)
+TextType::TextType(TTypeId _type, texttype *_tt, USHORT _attributes, CharSet* _cs)
 	: tt(_tt), cs(_cs), type(_type), attributes(_attributes)
 {
 	if (cs->getSqlMatchAnyLength() != 0)

diff --git a/src/common/TextType.h b/src/common/TextType.h
@@ -31,6 +31,7 @@
 #define COMMON_TEXTTYPE_H
 
 #include "../common/classes/QualifiedMetaString.h"
+#include "../jrd/intl.h"
 
 struct texttype;
 
@@ -41,7 +42,7 @@ class CharSet;
 class TextType
 {
 public:
-	TextType(TTYPE_ID _type, texttype* _tt, USHORT _attributes, CharSet* _cs);
+	TextType(TTypeId _type, texttype* _tt, USHORT _attributes, CharSet* _cs);
 
 private:
 	TextType(const TextType&);	// Not implemented
@@ -77,7 +78,7 @@ class TextType
 					ULONG dstLen,
 					UCHAR* dst);
 
-	USHORT getType() const
+	TTypeId getType() const
 	{
 		return type;
 	}
@@ -103,7 +104,7 @@ class TextType
 	CharSet* cs;
 
 private:
-	TTYPE_ID type;
+	TTypeId type;
 	USHORT attributes;
 
 public:

diff --git a/src/common/classes/MetaString.h b/src/common/classes/MetaString.h
@@ -85,7 +85,7 @@ class MetaString
 	MetaString() noexcept { init(); count = 0; }
 	MetaString(const char* s) noexcept { assign(s); }
 	MetaString(const char* s, FB_SIZE_T l) noexcept { assign(s, l); }
-	MetaString(const MetaString& m) noexcept { set(m); }
+	MetaString(const MetaString& m) noexcept  = default;
 	MetaString(const AbstractString& s) noexcept { assign(s.c_str(), s.length()); }
 	explicit MetaString(MemoryPool&) noexcept { init(); count = 0; }
 	MetaString(MemoryPool&, const char* s) noexcept { assign(s); }
@@ -214,7 +214,7 @@ class MetaString
 	MetaString& clear() noexcept { return assign(nullptr, 0); }
 	MetaString& operator=(const char* s) noexcept { return assign(s); }
 	MetaString& operator=(const AbstractString& s) noexcept { return assign(s.c_str(), s.length()); }
-	MetaString& operator=(const MetaString& m) noexcept { return set(m); }
+	MetaString& operator=(const MetaString& m) noexcept = default;
 	char* getBuffer(const FB_SIZE_T l) noexcept;
 
 	FB_SIZE_T length() const noexcept { return count; }