From ef5fd75e2213dc4712e43a874cde5c01c411b522 Mon Sep 17 00:00:00 2001 From: Anibal Gomez Date: Thu, 1 Jun 2017 15:22:35 -0600 Subject: [PATCH] Revert "#11757: Fixed integrity-checker issue with empty results due to runs" This reverts commit b558d7062e5e09bff29b04af94ad6248cb76bfa7. --- .../integritycheckers/ContentFileAssetIntegrityChecker.java | 2 +- .../integritycheckers/ContentPageIntegrityChecker.java | 2 +- .../com/dotcms/integritycheckers/FolderIntegrityChecker.java | 2 +- .../com/dotcms/integritycheckers/RoleIntegrityChecker.java | 2 +- .../src/main/java/com/dotmarketing/common/db/DotConnect.java | 5 +---- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dotCMS/src/main/java/com/dotcms/integritycheckers/ContentFileAssetIntegrityChecker.java b/dotCMS/src/main/java/com/dotcms/integritycheckers/ContentFileAssetIntegrityChecker.java index d602da1c4143..f5215b917d59 100644 --- a/dotCMS/src/main/java/com/dotcms/integritycheckers/ContentFileAssetIntegrityChecker.java +++ b/dotCMS/src/main/java/com/dotcms/integritycheckers/ContentFileAssetIntegrityChecker.java @@ -65,7 +65,7 @@ public boolean generateIntegrityResults(final String endpointId) throws Exceptio // Get data from results table DotConnect dc = new DotConnect(); - return (Long) dc.getRecordCount(getIntegrityType().getResultsTableName(), "where endpoint_id = '"+ endpointId+ "'") > 0; + return (Long) dc.getRecordCount(getIntegrityType().getResultsTableName()) > 0; } catch (Exception e) { throw new Exception("Error running the File Assets Integrity Check", e); } diff --git a/dotCMS/src/main/java/com/dotcms/integritycheckers/ContentPageIntegrityChecker.java b/dotCMS/src/main/java/com/dotcms/integritycheckers/ContentPageIntegrityChecker.java index ea295e20422a..7fded46fe981 100644 --- a/dotCMS/src/main/java/com/dotcms/integritycheckers/ContentPageIntegrityChecker.java +++ b/dotCMS/src/main/java/com/dotcms/integritycheckers/ContentPageIntegrityChecker.java @@ -99,7 +99,7 @@ public boolean generateIntegrityResults(final String endpointId) throws Exceptio checkPages(endpointId, IntegrityType.HTMLPAGES); // Legacy HTML pages and contentlet pages share the same result table - return (Long) dc.getRecordCount(getIntegrityType().getResultsTableName(), "where endpoint_id = '"+ endpointId+ "'") > 0; + return (Long) dc.getRecordCount(getIntegrityType().getResultsTableName()) > 0; } catch (Exception e) { throw new Exception("Error running the HTML Pages Integrity Check", e); } diff --git a/dotCMS/src/main/java/com/dotcms/integritycheckers/FolderIntegrityChecker.java b/dotCMS/src/main/java/com/dotcms/integritycheckers/FolderIntegrityChecker.java index aed0197c7cbb..20ffd0943f11 100644 --- a/dotCMS/src/main/java/com/dotcms/integritycheckers/FolderIntegrityChecker.java +++ b/dotCMS/src/main/java/com/dotcms/integritycheckers/FolderIntegrityChecker.java @@ -206,7 +206,7 @@ public boolean generateIntegrityResults(String endpointId) throws Exception { } - return (Long) dc.getRecordCount(getIntegrityType().getResultsTableName(), "where endpoint_id = '"+ endpointId+ "'") > 0; + return (Long) dc.getRecordCount(getIntegrityType().getResultsTableName()) > 0; } catch (Exception e) { throw new Exception("Error running the Folders Integrity Check", e); } diff --git a/dotCMS/src/main/java/com/dotcms/integritycheckers/RoleIntegrityChecker.java b/dotCMS/src/main/java/com/dotcms/integritycheckers/RoleIntegrityChecker.java index 915790bb1e02..46b4e82e35a4 100644 --- a/dotCMS/src/main/java/com/dotcms/integritycheckers/RoleIntegrityChecker.java +++ b/dotCMS/src/main/java/com/dotcms/integritycheckers/RoleIntegrityChecker.java @@ -180,7 +180,7 @@ public boolean generateIntegrityResults(String endpointId) throws Exception { } - return (Long) dc.getRecordCount(getIntegrityType().getResultsTableName(), "where endpoint_id = '"+ endpointId+ "'") > 0; + return (Long) dc.getRecordCount(getIntegrityType().getResultsTableName()) > 0; } catch (Exception e) { throw new Exception("Error running the Roles Integrity Check", e); } diff --git a/dotCMS/src/main/java/com/dotmarketing/common/db/DotConnect.java b/dotCMS/src/main/java/com/dotmarketing/common/db/DotConnect.java index d26984a457c6..bd6ed79fdfea 100644 --- a/dotCMS/src/main/java/com/dotmarketing/common/db/DotConnect.java +++ b/dotCMS/src/main/java/com/dotmarketing/common/db/DotConnect.java @@ -929,11 +929,8 @@ public List> getObjectResults(String dataSource)throws DotDa * An error occurred when interacting with the database. */ public Long getRecordCount(String tableName) throws DotDataException { - return getRecordCount(tableName, ""); - } - public Long getRecordCount(String tableName, String whereClause) throws DotDataException { Long recordCount = 0L; - setSQL("SELECT COUNT(*) AS count FROM " + tableName +" "+ whereClause); + setSQL("SELECT COUNT(*) AS count FROM " + tableName); if (DbConnectionFactory.isOracle()) { BigDecimal result = (BigDecimal) loadObjectResults().get(0).get("count"); recordCount = new Long(result.toPlainString());