Skip to content

fixes issues when importing data from history #407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GitTomahawk wants to merge 7 commits into
base: master
Choose a base branch
from
Open

fixes issues when importing data from history #407

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
aae44e9
Update main.js
GitTomahawk Nov 1, 2024
f72ac74
Revert "Update main.js"
GitTomahawk Nov 1, 2024
7d5dfa5
Update mysql.js
GitTomahawk Nov 1, 2024
b089473
Update mysql.js
GitTomahawk Nov 4, 2024
ae3db2f
Update mysql.js
GitTomahawk Nov 4, 2024
1fe6d1d
Merge branch 'ioBroker:master' into master
GitTomahawk Nov 4, 2024
d7ed936
Merge branch 'ioBroker:master' into master
GitTomahawk Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions lib/mysql.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ exports.insert = function (dbname, index, values) {
for (let db in insertValues) {
if (db === 'ts_counter') {
while (insertValues[db].length) {
query += `INSERT INTO \`${dbname}\`.ts_counter (id, ts, val) VALUES ${insertValues[db].splice(0, 500).join(',')};`;
query += `INSERT IGNORE INTO \`${dbname}\`.ts_counter (id, ts, val) VALUES ${insertValues[db].splice(0, 1000).join(',')};\n`;
}
} else {
while (insertValues[db].length) {
query += `INSERT INTO \`${dbname}\`.${db} (id, ts, val, ack, _from, q) VALUES ${insertValues[db].splice(0, 500).join(',')};`;
query += `INSERT IGNORE INTO \`${dbname}\`.${db} (id, ts, val, ack, _from, q) VALUES ${insertValues[db].splice(0, 1000).join(',')};\n`;
}
}
}
Expand Down Expand Up @@ -88,11 +88,11 @@ exports.getIdSelect = function (dbname, name) {
};

exports.getIdInsert = function (dbname, name, type) {
return `INSERT INTO \`${dbname}\`.datapoints (name, type) VALUES('${name}', ${type});`;
return `INSERT IGNORE INTO \`${dbname}\`.datapoints (name, type) VALUES('${name}', ${type});`;
};

exports.getIdUpdate = function (dbname, id, type) {
return `UPDATE \`${dbname}\`.datapoints SET type=${type} WHERE id=${id};`;
return `UPDATE IGNORE \`${dbname}\`.datapoints SET type=${type} WHERE id=${id};`;
};

exports.getFromSelect = function (dbname, from) {
Expand All @@ -104,7 +104,7 @@ exports.getFromSelect = function (dbname, from) {
};

exports.getFromInsert = function (dbname, from) {
return `INSERT INTO \`${dbname}\`.sources (name) VALUES('${from}');`;
return `INSERT IGNORE INTO \`${dbname}\`.sources (name) VALUES('${from}');`;
};

exports.getCounterDiff = function (dbname, options) {
Expand Down