github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-29 13:22:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #829 from stefanneuhaus/fix-postgres-save-properties

Browse Source 
Fix save_properties on Postgres
This commit is contained in:
Jeremy Long
2017-07-29 22:14:42 -04:00
committed by GitHub
parent 2753bb97c8 c6c194dddb
commit 10a8bf5356
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CveDB.java
View File

@@ -512,7 +512,7 @@ public final class CveDB implements AutoCloseable {
if (mergeProperty != null) { if (mergeProperty != null) {
mergeProperty.setString(1, key); mergeProperty.setString(1, key);
mergeProperty.setString(2, value); mergeProperty.setString(2, value);
mergeProperty.executeUpdate(); mergeProperty.execute();
} else { } else {
// No Merge statement, so doing an Update/Insert... // No Merge statement, so doing an Update/Insert...
final PreparedStatement updateProperty = getPreparedStatement(UPDATE_PROPERTY); final PreparedStatement updateProperty = getPreparedStatement(UPDATE_PROPERTY);

2
dependency-check-core/src/main/resources/data/dbStatements_postgresql.properties
View File

@@ -12,5 +12,5 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
MERGE_PROPERTY=CALL save_property(?, ?) MERGE_PROPERTY=SELECT save_property(?, ?)
CLEANUP_ORPHANS=DELETE FROM cpeEntry WHERE id IN (SELECT id FROM cpeEntry LEFT JOIN software ON cpeEntry.id = software.CPEEntryId WHERE software.CPEEntryId IS NULL); CLEANUP_ORPHANS=DELETE FROM cpeEntry WHERE id IN (SELECT id FROM cpeEntry LEFT JOIN software ON cpeEntry.id = software.CPEEntryId WHERE software.CPEEntryId IS NULL);