preparse.cpp (Firebird-3.0.2.32703-0.tar.bz2) | : | preparse.cpp (Firebird-3.0.4.33054-0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 168 | skipping to change at line 168 | |||
ContextPoolHolder context(getDefaultMemoryPool()); | ContextPoolHolder context(getDefaultMemoryPool()); | |||
try | try | |||
{ | { | |||
if (!stmt) | if (!stmt) | |||
{ | { | |||
Arg::Gds(isc_command_end_err).raise(); | Arg::Gds(isc_command_end_err).raise(); | |||
} | } | |||
bool hasUser = true; | bool hasUser = true; | |||
status->init(); | ||||
for (int qStrip = 0; qStrip < 2; ++qStrip) | for (int qStrip = 0; qStrip < 2; ++qStrip) | |||
{ | { | |||
status->init(); | ||||
hasUser = false; | hasUser = false; | |||
Tokens tks; | Tokens tks; | |||
tks.quotes(quotes); | tks.quotes(quotes); | |||
tks.parse(stmt_length, stmt); | tks.parse(stmt_length, stmt); | |||
unsigned pos = 0; | unsigned pos = 0; | |||
if (getToken(pos, tks) != pp_symbols[PP_CREATE].symbol) | if (getToken(pos, tks) != pp_symbols[PP_CREATE].symbol) | |||
{ | { | |||
return false; | return false; | |||
skipping to change at line 295 | skipping to change at line 295 | |||
if ((!hasUser) || ((status->getState() & IStatus::STATE_E RRORS) == 0) || | if ((!hasUser) || ((status->getState() & IStatus::STATE_E RRORS) == 0) || | |||
(status->getErrors()[1] != isc_login)) | (status->getErrors()[1] != isc_login)) | |||
{ | { | |||
break; | break; | |||
} | } | |||
} | } | |||
} | } | |||
catch (const Exception& ex) | catch (const Exception& ex) | |||
{ | { | |||
ex.stuffException(status); | if (!(status->getState() & IStatus::STATE_ERRORS)) | |||
ex.stuffException(status); | ||||
return true; | return true; | |||
} | } | |||
return true; | return true; | |||
} | } | |||
/** | /** | |||
generate_error | generate_error | |||
End of changes. 3 change blocks. | ||||
2 lines changed or deleted | 3 lines changed or added |