Skip to content

Commit a23b4cb

Browse files
committed
table name parameter issue
1 parent 50dd6cc commit a23b4cb

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

src/api/migrateifxpg.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ async function migrateifxinsertdata(payload, client) {
3333
usepkforcond = await dbcommonfunction.ivalidatetousepkcondition(columnNames, payload, datapk)
3434
}
3535
if (usepkforcond == 0) {
36-
conditionstr = await dbcommonfunction.insertretrivalcondition_withoutpk(columnNames, payload, datatypeobj)
36+
conditionstr = await dbcommonfunction.insertretrivalcondition_withoutpk(columnNames, payload, datatypeobj,tablename)
3737
} else {
38-
conditionstr = await dbcommonfunction.insertretrivalcondition_withpk(columnNames, payload, datatypeobj, datapk)
38+
conditionstr = await dbcommonfunction.insertretrivalcondition_withpk(columnNames, payload, datatypeobj, tablename, datapk)
3939
}
4040
infsql = `select * from ${tablename} where ${conditionstr};` // "insert into <schema>:<table> (col_1, col_2, ...) values (val_1, val_2, ...)"
4141
console.log(`informix query ${infsql}`);
@@ -93,9 +93,9 @@ async function migrateifxupdatedata(payload, client) {
9393
}
9494
//REtrival contion
9595
if (usepkforcond == 0) {
96-
conditionstr = await dbcommonfunction.updateretrivalcondition_withoutpk(columnNames,payload,datatypeobj )
96+
conditionstr = await dbcommonfunction.updateretrivalcondition_withoutpk(columnNames,payload,datatypeobj,tablename )
9797
} else {
98-
conditionstr = await dbcommonfunction.updateretrivalcondition_withpk(columnNames,payload,datatypeobj,datapk )
98+
conditionstr = await dbcommonfunction.updateretrivalcondition_withpk(columnNames,payload,datatypeobj,tablename,datapk )
9999
}
100100
//Exemption added it should always in sequence
101101
payload = await dbcommonfunction.uvalidateexemptiondatatype(dbname, tablename, payload);
@@ -160,9 +160,9 @@ async function migrateifxdeletedata(payload, client) {
160160
}
161161
var conditionstr = ""
162162
if (usepkforcond == 0) {
163-
conditionstr = await dbcommonfunction.deletedatacondition_withoutpk(columnNames, payload, datatypeobj)
163+
conditionstr = await dbcommonfunction.deletedatacondition_withoutpk(columnNames, payload, datatypeobj, tablename)
164164
} else {
165-
conditionstr = await dbcommonfunction.deletedatacondition_withpk(columnNames, payload, datatypeobj, datapk)
165+
conditionstr = await dbcommonfunction.deletedatacondition_withpk(columnNames, payload, datatypeobj, tablename, datapk)
166166
}
167167
sql = `SET search_path TO ${schemaname};`;
168168
console.log(sql);

src/api/migratepg.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@ async function migratepgDelete(dbpool, payload) {
106106
payload = await dbcommonfunction.hextoutf_insertpayload(columnNames, datatypeobj, payload)
107107
var conditionstr = ""
108108
if (datapk.length == 0) {
109-
conditionstr = await dbcommonfunction.deletedatacondition_withoutpk(columnNames, payload, datatypeobj)
109+
conditionstr = await dbcommonfunction.deletedatacondition_withoutpk(columnNames, payload, datatypeobj, tablename)
110110
} else {
111-
conditionstr = await dbcommonfunction.deletedatacondition_withpk(columnNames, payload, datatypeobj, datapk)
111+
conditionstr = await dbcommonfunction.deletedatacondition_withpk(columnNames, payload, datatypeobj, tablename, datapk)
112112
}
113113
sql = `SET search_path TO ${schemaname};`;
114114
console.log(sql);

src/common/dbmigratefunctions.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ async function converthextoutf(hexdata) {
9898
throw "converthextoutf : " + err
9999
}
100100
}
101-
async function updateretrivalcondition_withpk(columnNames, payload, datatypeobj, datapk) {
101+
async function updateretrivalcondition_withpk(columnNames, payload, datatypeobj, tablename, datapk) {
102102
try {
103103
var conditionstr = ""
104104
bufffernewcond = 0
@@ -126,7 +126,7 @@ async function updateretrivalcondition_withpk(columnNames, payload, datatypeobj,
126126
}
127127

128128
}
129-
async function insertretrivalcondition_withpk(columnNames, payload, datatypeobj, datapk) {
129+
async function insertretrivalcondition_withpk(columnNames, payload, datatypeobj, tablename, datapk) {
130130
try {
131131

132132
var conditionstr = ""
@@ -179,7 +179,7 @@ async function updatedatacondition_withpk(columnNames, payload, datatypeobj, dat
179179
throw "updatedatacondition_withpk : " + err
180180
}
181181
}
182-
async function updateretrivalcondition_withoutpk(columnNames, payload, datatypeobj) {
182+
async function updateretrivalcondition_withoutpk(columnNames, payload, datatypeobj, tablename) {
183183
try {
184184
var conditionstr = ""
185185
bufffernewcond = 0
@@ -204,7 +204,7 @@ async function updateretrivalcondition_withoutpk(columnNames, payload, datatypeo
204204
throw "updateretrivalcondition_withoutpk : " + err
205205
}
206206
}
207-
async function insertretrivalcondition_withoutpk(columnNames, payload, datatypeobj) {
207+
async function insertretrivalcondition_withoutpk(columnNames, payload, datatypeobj,tablename) {
208208
try {
209209
var conditionstr = ""
210210
bufffercond = 0
@@ -275,7 +275,7 @@ async function updatesetdatastr(columnNames, payload, datatypeobj) {
275275
throw "updatesetdatastr : " + err
276276
}
277277
}
278-
async function deletedatacondition_withoutpk(columnNames, payload, datatypeobj) {
278+
async function deletedatacondition_withoutpk(columnNames, payload, datatypeobj, tablename) {
279279
try {
280280
var conditionstr = ""
281281
bufffercond = 0
@@ -298,7 +298,7 @@ async function deletedatacondition_withoutpk(columnNames, payload, datatypeobj)
298298
throw "deletedatacondition_withoutpk : " + err
299299
}
300300
}
301-
async function deletedatacondition_withpk(columnNames, payload, datatypeobj, datapk) {
301+
async function deletedatacondition_withpk(columnNames, payload, datatypeobj, tablename, datapk) {
302302
try {
303303
var conditionstr = ""
304304
bufffercond = 0

0 commit comments

Comments
 (0)