Merge pull request #11 from topcoder-platform/dev-spl-chr-fix [skip ci]

Applying Special character fix [skip ci]

Author: Gunasekar-K

.circleci/config.yml

@@ -50,9 +50,9 @@ builddeploy_steps: &builddeploy_steps
             # # consumer deployment
             # rm -rf buildenvvar
             # ./unsetenv.sh
-            # ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-consumer-deployvar
-            # source buildenvvar            
-            # ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-${APPNAME}-appvar -i ${APPNAME}
+            ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-consumer-deployvar
+            source buildenvvar            
+            ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-${APPNAME}-appvar -i ${APPNAME}
             # # without kafka dynamodb
             # rm -rf buildenvvar
             # ./unsetenv.sh
@@ -98,6 +98,7 @@ workflows:
               only:
                 - dev
                 - dev-chr-fix
+                - dev-spl-chr-fix
 
       # Production builds are exectuted only on tagged commits to the
       # master branch.

informix_auditing/audit_util.c

@@ -588,9 +588,6 @@ char * escapecharjson( char *jsonvalue_org)
 			} else if (*jsonvalue_copy == '\b') {
                 posi = strlen(escjsonvalue);
                 sprintf(&escjsonvalue[posi], "%s","\\b") ;  
-			} else if ('\x00' >= *jsonvalue_copy && *jsonvalue_copy <= '\x1f') {
-                posi = strlen(escjsonvalue);
-                sprintf(&escjsonvalue[posi], "\\u%4x",(int)*jsonvalue_copy) ; 
             } else {
                 posi = strlen(escjsonvalue);
                 sprintf(&escjsonvalue[posi], "%c",*jsonvalue_copy) ;  

src/api/migrateifxpg.js

@@ -24,7 +24,7 @@ async function migrateifxinsertdata(payload, client) {
     //Primary key retrival
     //var datapk = [];
     var datapk = await dbcommonfunction.pgfetchprimarykey(client, schemaname, tablename);
-    payload = await dbcommonfunction.hextoutf_insertpayload(columnNames, datatypeobj, payload)
+    //payload = await dbcommonfunction.hextoutf_insertpayload(columnNames, datatypeobj, payload)
     const paramSql = Array.from(Array(columnNames.length).keys(), x => `$${x + 1}`).join(',');
     const insertSql = `insert into "${tablename}" (${columnNames.map(x => `"${x}"`).join(',')}) values(${paramSql})`;
     var conditionstr = ""
@@ -84,7 +84,7 @@ async function migrateifxupdatedata(payload, client) {
     //Primary key retrival
     // var datapk = [];
     datapk = await dbcommonfunction.pgfetchprimarykey(client, schemaname, tablename);
-    payload = await dbcommonfunction.hextoutf_updatepayload(columnNames, datatypeobj, payload)
+    //payload = await dbcommonfunction.hextoutf_updatepayload(columnNames, datatypeobj, payload)
     var conditionstr = ""
     var updatestr = ""
     var oldconditionstr = ""
@@ -154,7 +154,7 @@ async function migrateifxdeletedata(payload, client) {
     let schemaname = (dbname == pg_dbname) ? 'public' : dbname;
     datatypeobj = await dbcommonfunction.pgfetchdatatype(client, schemaname, tablename);
     datapk = await dbcommonfunction.pgfetchprimarykey(client, schemaname, tablename);
-    payload = await dbcommonfunction.hextoutf_insertpayload(columnNames, datatypeobj, payload)
+    //payload = await dbcommonfunction.hextoutf_insertpayload(columnNames, datatypeobj, payload)
     usepkforcond = 0
     if (datapk.length != 0) {
       usepkforcond = await dbcommonfunction.ivalidatetousepkcondition(columnNames, payload, datapk)

src/api/migratepg.js

@@ -20,7 +20,7 @@ async function migratepgInsert(dbpool, payload) {
     const columnNames = Object.keys(payload)
     let schemaname = (dbname == pg_dbname) ? 'public' : dbname;
     datatypeobj = await dbcommonfunction.pgfetchdatatype(client, schemaname, tablename);
-    payload = await dbcommonfunction.hextoutf_insertpayload(columnNames, datatypeobj, payload)
+    //payload = await dbcommonfunction.hextoutf_insertpayload(columnNames, datatypeobj, payload)
     logger.debug("Payload after hex validation : " + JSON.stringify(payload))
     sql = `SET search_path TO ${schemaname};`;
     logger.info(sql);
@@ -53,7 +53,7 @@ async function migratepgUpdate(dbpool, payload) {
     datatypeobj = await dbcommonfunction.pgfetchdatatype(client, schemaname, tablename);
     //Primary key retrival
     datapk = await dbcommonfunction.pgfetchprimarykey(client, schemaname, tablename);
-    payload = await dbcommonfunction.hextoutf_updatepayload(columnNames, datatypeobj, payload)
+    //payload = await dbcommonfunction.hextoutf_updatepayload(columnNames, datatypeobj, payload)
     var setdatastr = ""
     var oldconditionstr = ""
     setdatastr = await dbcommonfunction.updatesetdatastr(columnNames, payload, datatypeobj)
@@ -99,7 +99,7 @@ async function migratepgDelete(dbpool, payload) {
     //Primary key retrival
     //var datapk = [];
     datapk = await dbcommonfunction.pgfetchprimarykey(client, schemaname, tablename);
-    payload = await dbcommonfunction.hextoutf_insertpayload(columnNames, datatypeobj, payload)
+    //payload = await dbcommonfunction.hextoutf_insertpayload(columnNames, datatypeobj, payload)
     var conditionstr = ""
     if (datapk.length == 0) {
       conditionstr = await dbcommonfunction.deletedatacondition_withoutpk(columnNames, payload, datatypeobj, tablename)

src/common/dbmigratefunctions.js

@@ -382,11 +382,11 @@ async function db_datavalues_from_fetched_row(columnNames, row, dbname, tablenam
                 if (fieldname == colName) {
                     row[colName] = row[colName].substr(1)
                 }
-                if (datatypeobj[colName] == 'varchar') {
+/*                 if (datatypeobj[colName] == 'varchar') {
                     if (await checkdataishex(row[colName])) {
                         row[colName] = await converthextoutf(row[colName])
                     }
-                }
+                } */
                 if (isUtf8(row[colName]) || datatypeobj[colName] == 'timestamp' || datatypeobj[colName] == 'date') {
                     logger.debug(`utf8 or datetime format ${colName}`);
                     values.push(row[colName]);