From 3aa9d6ce92f1d5ce8bd9b1c3140e41339c93ce98 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Mon, 11 Nov 2019 07:15:15 +1100
Subject: [PATCH] dev/core#183 Convert database testing to use
 CRM_Utils_SQL_TempTable fuctionality and remove Incomplete Jobs handling as
 it is not called

---
 CRM/Contact/Import/Form/DataSource.php        |  8 ++-
 CRM/Contact/Import/ImportJob.php              | 20 ------
 CRM/Contact/Import/Importer.php               | 62 -------------------
 .../phpunit/CRM/Import/DataSource/CsvTest.php |  2 +-
 4 files changed, 6 insertions(+), 86 deletions(-)
 delete mode 100644 CRM/Contact/Import/Importer.php

diff --git a/CRM/Contact/Import/Form/DataSource.php b/CRM/Contact/Import/Form/DataSource.php
index be17749522..e84183a3bf 100644
--- a/CRM/Contact/Import/Form/DataSource.php
+++ b/CRM/Contact/Import/Form/DataSource.php
@@ -54,9 +54,11 @@ class CRM_Contact_Import_Form_DataSource extends CRM_Core_Form {
     //Test database user privilege to create table(Temporary) CRM-4725
     $errorScope = CRM_Core_TemporaryErrorScope::ignoreException();
     $daoTestPrivilege = new CRM_Core_DAO();
-    $daoTestPrivilege->query("CREATE TEMPORARY TABLE import_job_permission_one(test int) ENGINE=InnoDB");
-    $daoTestPrivilege->query("CREATE TEMPORARY TABLE import_job_permission_two(test int) ENGINE=InnoDB");
-    $daoTestPrivilege->query("DROP TEMPORARY TABLE IF EXISTS import_job_permission_one, import_job_permission_two");
+    $tempTable1 = CRM_Utils_SQL_TempTable::build()->getName();
+    $tempTable2 = CRM_Utils_SQL_TempTable::build()->getName();
+    $daoTestPrivilege->query("CREATE TEMPORARY TABLE {$tempTable1} (test int) ENGINE=InnoDB");
+    $daoTestPrivilege->query("CREATE TEMPORARY TABLE {$tempTable2} (test int) ENGINE=InnoDB");
+    $daoTestPrivilege->query("DROP TEMPORARY TABLE IF EXISTS {$tempTable1}, {$tempTable2}");
     unset($errorScope);
 
     if ($daoTestPrivilege->_lastError) {
diff --git a/CRM/Contact/Import/ImportJob.php b/CRM/Contact/Import/ImportJob.php
index 94dfc7b7e9..2ebabbec72 100644
--- a/CRM/Contact/Import/ImportJob.php
+++ b/CRM/Contact/Import/ImportJob.php
@@ -403,24 +403,4 @@ class CRM_Contact_Import_ImportJob {
     return FALSE;
   }
 
-  /**
-   * @return array
-   */
-  public static function getIncompleteImportTables() {
-    $dao = new CRM_Core_DAO();
-    $database = $dao->database();
-    $query = "SELECT   TABLE_NAME FROM INFORMATION_SCHEMA
-                  WHERE    TABLE_SCHEMA = ? AND
-                           TABLE_NAME LIKE 'civicrm_import_job_%'
-                  ORDER BY TABLE_NAME";
-    $result = CRM_Core_DAO::executeQuery($query, array($database));
-    $incompleteImportTables = array();
-    while ($importTable = $result->fetch()) {
-      if (!self::isComplete($importTable)) {
-        $incompleteImportTables[] = $importTable;
-      }
-    }
-    return $incompleteImportTables;
-  }
-
 }
diff --git a/CRM/Contact/Import/Importer.php b/CRM/Contact/Import/Importer.php
deleted file mode 100644
index 6092e1367f..0000000000
--- a/CRM/Contact/Import/Importer.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/*
- +--------------------------------------------------------------------+
- | CiviCRM version 5                                                  |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2020                                |
- +--------------------------------------------------------------------+
- | This file is a part of CiviCRM.                                    |
- |                                                                    |
- | CiviCRM is free software; you can copy, modify, and distribute it  |
- | under the terms of the GNU Affero General Public License           |
- | Version 3, 19 November 2009 and the CiviCRM Licensing Exception.   |
- |                                                                    |
- | CiviCRM is distributed in the hope that it will be useful, but     |
- | WITHOUT ANY WARRANTY; without even the implied warranty of         |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
- | See the GNU Affero General Public License for more details.        |
- |                                                                    |
- | You should have received a copy of the GNU Affero General Public   |
- | License and the CiviCRM Licensing Exception along                  |
- | with this program; if not, contact CiviCRM LLC                     |
- | at info[AT]civicrm[DOT]org. If you have questions about the        |
- | GNU Affero General Public License or the licensing of CiviCRM,     |
- | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
- +--------------------------------------------------------------------+
- */
-
-/**
- *
- * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2020
- */
-
-/**
- * This class mainly exists to allow imports to be triggered synchronously (i.e.
- *  via a form post) and asynchronously (i.e. by the workflow system)
- */
-class CRM_Contact_Import_Importer {
-
-  /**
-   */
-  public function __construct() {
-    // may not need this
-  }
-
-  /**
-   * @param int $timeout
-   */
-  public function runIncompleteImportJobs($timeout = 55) {
-    $startTime = time();
-    $incompleteImportTables = CRM_Contact_Import_ImportJob::getIncompleteImportTables();
-    foreach ($incompleteImportTables as $importTable) {
-      $importJob = new CRM_Contact_Import_ImportJob($importTable);
-      $importJob->runImport(NULL, $timeout);
-      $currentTime = time();
-      if (($currentTime - $startTime) >= $timeout) {
-        break;
-      }
-    }
-  }
-
-}
diff --git a/tests/phpunit/CRM/Import/DataSource/CsvTest.php b/tests/phpunit/CRM/Import/DataSource/CsvTest.php
index 53a7e09385..9cda8d1ec4 100644
--- a/tests/phpunit/CRM/Import/DataSource/CsvTest.php
+++ b/tests/phpunit/CRM/Import/DataSource/CsvTest.php
@@ -38,7 +38,7 @@ class CRM_Import_DataSource_CsvTest extends CiviUnitTestCase {
    * @dataProvider getCsvFiles
    */
   public function testToCsv($fileName) {
-    $dataSource = new CRM_Import_DataSource_Csv();
+    $dataSource = new CRM_Import_DataSource_CSV();
     $params = [
       'uploadFile' => [
         'name' => __DIR__ . '/' . $fileName,
-- 
2.25.1