[Projekt: xRM-ContactManagement][TicketNr.: 1078787][Leadimport triggert Index nicht]

- Customized if-statement to only catch the case when tablename
    is "LEAD", to fix not triggering index when importing leads
    via. leadimport.

.liquibase/Data_alias/basic/2021.0.3/changelog.xml

@@ -14,4 +14,5 @@
     <include relativeToChangelogFile="true" file="update_ab_countryinfo_name_native.xml"/>
     <include relativeToChangelogFile="true" file="create_probability_keywords.xml"/>
     <include relativeToChangelogFile="true" file="LinkWorkflows/changelog.xml"/>
+    <include relativeToChangelogFile="true" file="renameLeadTable.xml"/>
 </databaseChangeLog>
\ No newline at end of file

.liquibase/Data_alias/basic/2021.0.3/renameLeadTable.xml

+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="d.tran" id="22056191-8d5a-4690-8872-d0aa6cca43b4">
+      <renameTable oldTableName="LEAD" newTableName="LEADS"/>
+      <renameColumn tableName="LEADS" columnDataType="CHAR(36)" oldColumnName="LEADID" newColumnName="LEADSID"/>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file

aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/lead/documentation.adoc

-== LEAD
-
-Used to store leads (potential interested contacts)
\ No newline at end of file

entity/Lead_entity/Lead_entity.aod

@@ -66,7 +66,7 @@
       <expose v="true" />
     </entityParameter>
     <entityField>
-      <name>LEADID</name>
+      <name>LEADSID</name>
     </entityField>
     <entityField>
       <name>LEAD_SOURCE</name>
@@ -134,88 +134,88 @@
       <recordFieldMappings>
         <dbRecordFieldMapping>
           <name>LEAD_ADDRESS.value</name>
-          <recordfield>LEAD.ADDRESS</recordfield>
+          <recordfield>LEADS.ADDRESS</recordfield>
           <isFilterable v="true" />
           <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>LEAD_CITY.value</name>
-          <recordfield>LEAD.CITY</recordfield>
+          <recordfield>LEADS.CITY</recordfield>
           <isFilterable v="true" />
           <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>LEAD_COUNTRY.value</name>
-          <recordfield>LEAD.COUNTRY</recordfield>
+          <recordfield>LEADS.COUNTRY</recordfield>
           <isFilterable v="true" />
           <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>LEAD_FIRSTNAME.value</name>
-          <recordfield>LEAD.FIRSTNAME</recordfield>
+          <recordfield>LEADS.FIRSTNAME</recordfield>
           <isFilterable v="true" />
           <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>LEAD_LASTNAME.value</name>
-          <recordfield>LEAD.LASTNAME</recordfield>
+          <recordfield>LEADS.LASTNAME</recordfield>
           <isFilterable v="true" />
           <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>LEAD_NAME.value</name>
-          <recordfield>LEAD.NAME</recordfield>
+          <recordfield>LEADS.NAME</recordfield>
           <isFilterable v="true" />
           <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>LEAD_SALUTATION.value</name>
-          <recordfield>LEAD.SALUTATION</recordfield>
+          <recordfield>LEADS.SALUTATION</recordfield>
           <isFilterable v="true" />
           <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>LEAD_TITLE.value</name>
-          <recordfield>LEAD.TITLE</recordfield>
+          <recordfield>LEADS.TITLE</recordfield>
           <isFilterable v="true" />
           <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>LEAD_ZIP.value</name>
-          <recordfield>LEAD.ZIP</recordfield>
+          <recordfield>LEADS.ZIP</recordfield>
           <isFilterable v="true" />
           <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
-          <name>LEADID.value</name>
-          <recordfield>LEAD.LEADID</recordfield>
+          <name>LEADSID.value</name>
+          <recordfield>LEADS.LEADSID</recordfield>
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>LEAD_SOURCE.value</name>
-          <recordfield>LEAD.SOURCE</recordfield>
+          <recordfield>LEADS.SOURCE</recordfield>
           <isFilterable v="true" />
           <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>LEADDUP_STATUS.value</name>
-          <recordfield>LEAD.DUPSTATUS</recordfield>
+          <recordfield>LEADS.STATUS</recordfield>
           <isFilterable v="true" />
           <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>LEAD_PERSON.value</name>
-          <recordfield>LEAD.PERSON_ID</recordfield>
+          <recordfield>LEADS.PERSON_ID</recordfield>
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>LEAD_ORGANISATIONID.value</name>
-          <recordfield>LEAD.ORGANISATION_ID</recordfield>
+          <recordfield>LEADS.ORGANISATION_ID</recordfield>
         </dbRecordFieldMapping>
       </recordFieldMappings>
       <linkInformation>
         <linkInformation>
-          <name>c4a59fcc-2c94-4944-ae57-790a4adcca30</name>
-          <tableName>LEAD</tableName>
-          <primaryKey>LEADID</primaryKey>
+          <name>b0fe187f-a6e9-456b-a523-de40ea2d674d</name>
+          <tableName>LEADS</tableName>
+          <primaryKey>LEADSID</primaryKey>
           <isUIDTable v="true" />
           <readonly v="false" />
         </linkInformation>

entity/Lead_entity/recordcontainers/db/conditionProcess.js

 import("system.result");
 import("Sql_lib");
 
-result.string(newWhere("LEAD.LEADIMPORT_ID", "$param.LeadImportId").toString());
\ No newline at end of file
+result.string(newWhere("LEADS.LEADIMPORT_ID", "$param.LeadImportId").toString());
\ No newline at end of file

entity/Leadimport_entity/entityfields/leadimportreset/onActionProcess.js

@@ -26,9 +26,9 @@ newWhere("LEADLOG.LEADIMPORT_ID", leadimportId)
     .from("LEADLOG")
     .deleteData();
 
-newWhere("LEAD.LEADIMPORT_ID", leadimportId)
-    .and("LEAD.DATE_NEW", dateADayBefore.getTime(), "# >= ?")
-    .from("LEAD")
+newWhere("LEADS.LEADIMPORT_ID", leadimportId)
+    .and("LEADS.DATE_NEW", dateADayBefore.getTime(), "# >= ?")
+    .from("LEADS")
     .deleteData();
 // Ändern des Status auf Created
 newWhere("LEADIMPORT.LEADIMPORTID", leadimportId).updateData(true, "LEADIMPORT", ["Status"], null, [$KeywordRegistry.importStatus$created()]);

entity/Leadimport_entity/recordcontainers/db/onDBDelete.js

@@ -27,7 +27,7 @@ if(leadImportId != "")//delete the connected importfields und der Mappings
 {
     newWhere("IMPORTFIELD.LEADIMPORT_ID", leadImportId).deleteData();
     newWhere("LEADTEMP.ROW_ID", leadImportId).deleteData();
-    newWhere("LEAD.LEADIMPORT_ID", leadImportId).deleteData();
+    newWhere("LEADS.LEADIMPORT_ID", leadImportId).deleteData();
     newWhere("LEADLOG.LEADIMPORT_ID", leadImportId).deleteData();
     newWhere("LEADIMPORTMAPPINGASSISTANT.LEADIMPORT_ID", leadImportId).deleteData();
 }

process/Dependency_lib/process.js

@@ -718,7 +718,7 @@ Dependency.mapping = function ()
                 "options" : {
                     "isObservable" : true
                 },
-                "getUIDsfn" : Dependency.defaultFunctionForField("LEAD.LEADIMPORT_ID")
+                "getUIDsfn" : Dependency.defaultFunctionForField("LEADS.LEADIMPORT_ID")
             }
         }
     };

process/Leadimport_lib/process.js

@@ -153,7 +153,7 @@ LeadImportUtils.loadImportFile = function(pBinId, pFieldSep, pFieldLimit, pRecor
  */
 LeadImportUtils.importData = function(pDataFields, pDataTypes, pFieldDef, pFieldValues, pImportDefID, pAttrObject, pSource, pUser, pDate)
 {
-    var LeadValues = LeadImportUtils.setValues(pDataFields["LEAD"], pFieldDef, pFieldValues); // set the Lead values
+    var LeadValues = LeadImportUtils.setValues(pDataFields["LEADS"], pFieldDef, pFieldValues); // set the Lead values
  
     var orgid = "";
     var persid = ""; 
@@ -214,7 +214,7 @@ LeadImportUtils.importData = function(pDataFields, pDataTypes, pFieldDef, pField
     LeadValues["ORGANISATION_ID"] = orgid;
     LeadValues["PERSON_ID"] = persid;
     
-    var leadId = LeadImportUtils.insertTable(pDataFields, pDataTypes ,LeadValues, "LEAD", pUser, pDate);//inserts the LEAD dataset
+    var leadId = LeadImportUtils.insertTable(pDataFields, pDataTypes ,LeadValues, "LEADS", pUser, pDate);//inserts the LEAD dataset
 
     LeadImportUtils.insertLeadAttr(pAttrObject, orgid, persid, LeadValues["DATE_NEW"], pUser, pDate, (orgRet && orgRet.length >= 4 && orgRet[3]));
     
@@ -698,11 +698,6 @@ LeadImportUtils.insertTable = function(pDataFields, pDataTypes, pValues, pTable,
         TableValues[i] = pValues[Fields[i]];
     }
     
-    if (db.getDatabaseType(vars.getString("$sys.dbalias")) == db.DBTYPE_MARIADB10)
-    {
-        pTable = "`" + pTable + "`";
-    }
-    
     db.insertData(pTable, Fields, Types, TableValues);
     
     return pValues[TableID];
@@ -898,7 +893,7 @@ LeadImportUtils.getEntityFieldsPers = function(pPersDataFields, pContactDataFiel
  */
 LeadImportUtils.scanLeadDups = function(pAllContactData)
 {
-    var dupUpdateLeadTable = "LEAD";
+    var dupUpdateLeadTable = "LEADS";
 
     var leadID = "";
     var toUpdate = [];

process/importLead_serverProcess/process.js

@@ -45,7 +45,7 @@ var FieldDef = LeadImportUtils.addArray(ImportFieldDef, new Array(DataFieldCount
 FieldDef.push(new Array(DataFieldCount++, "DATE_NEW", ""));
 
 //  für Tabellen Felder und Typen ermitteln
-var DataTables = new Array("ORGANISATION", "PERSON", "CONTACT", "ADDRESS", "LEAD", "COMMUNICATION", "AB_ATTRIBUTERELATION");
+var DataTables = new Array("ORGANISATION", "PERSON", "CONTACT", "ADDRESS", "LEADS", "COMMUNICATION", "AB_ATTRIBUTERELATION");
 var DataFields = LeadImportUtils.getDataFields(DataTables);
 var DataTypes = LeadImportUtils.getDataTypes(DataFields, DataTables);