Fixed CORE-4055: Dialect is not set in internal connections to securi…

…ty database
FirebirdSQL · Feb 26, 2013 · 87ab3bf · 87ab3bf
1 parent 1ceba37
commit 87ab3bf
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/jrd/UserManagement.cpp b/src/jrd/UserManagement.cpp
@@ -46,6 +46,8 @@ UserManagement::UserManagement(jrd_tra* tra)
 	ClumpletWriter dpb(ClumpletReader::Tagged, MAX_DPB_SIZE, isc_dpb_version1);
 	dpb.insertByte(isc_dpb_gsec_attach, TRUE);
 	dpb.insertString(isc_dpb_trusted_auth, att->att_user->usr_user_name);
+
+	bool dpbHasRole = true;
 	if (att->att_user->usr_flags & USR_trole)
 	{
 		dpb.insertString(isc_dpb_trusted_role, ADMIN_ROLE, strlen(ADMIN_ROLE));
@@ -58,6 +60,14 @@ UserManagement::UserManagement(jrd_tra* tra)
     {
     	dpb.insertString(isc_dpb_sql_role_name, att->att_requested_role);
 	}
+	else
+	{
+		dpbHasRole = false;
+	}
+	if (dpbHasRole)
+	{
+		dpb.insertByte(isc_dpb_sql_dialect, 0);
+	}
 
 	if (isc_attach_database(status, 0, securityDatabaseName, &database,
 							dpb.getBufferLength(), reinterpret_cast<const char*>(dpb.getBuffer())))