Abstract: The present invention is directed toward a method for storing, verifying and salvaging user-defined queries in a database environment. The method comprises retrieving a stored query and an associated stored application version identifier and comparing the stored application version identifier with a current application version identifier. If the application version identifiers do not match, the entire stored query is checked for validity. If an error is found in the stored query, the query is parsed into subparts and each subpart of the stored query is checked for validity. If a subpart is valid, it is built into a new, updated query. The stored version identifier is updated to reflect the current application version so that verification is not performed again.