Skip to content

Fix for executeBulkSql #24

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
Krzychu81 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix for executeBulkSql #24

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6490704
Fix for executeBulkSql
Krzychu81 Feb 8, 2020
49a92da
Fix for try...catch
Krzychu81 Feb 15, 2020
9f43c79
Fix for Android
Krzychu81 Feb 22, 2020
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
18 changes: 14 additions & 4 deletions src/DatabaseLayer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,18 @@ export default class DatabaseLayer {
tx.executeSql(
sql,
params[index],
(_, { rows, insertId }) => {
sqlResolve({ rows: rows._array, insertId })
(_, result) => {

// rows._array on Android, rows on Web
const rows = [...(result.rows._array || result.rows)]
let insertId
try {
// Extracting insertId when no rows have been added results in an error
insertId = result.insertId
} catch (err) {
insertId = null
}
sqlResolve({ rows, insertId })
},
(_, error) => { sqlReject(error) }
)
Expand All @@ -29,7 +39,7 @@ export default class DatabaseLayer {
async executeSql(sql, params = []) {
return this.executeBulkSql([sql], [params])
.then(res => res[0])
.catch(errors => {throw errors[0]})
.catch(errors => { throw errors[0] })
}

createTable(columnMapping) {
Expand Down Expand Up @@ -81,7 +91,7 @@ export default class DatabaseLayer {
}

findBy(where = {}) {
const options = { where, limit: 1 }
const options = { where, limit: 1, page: 1 }
const sql = QueryBuilder.query(this.tableName, options)
const params = Object.values(options.where)
return this.executeSql(sql, params).then(({ rows }) => rows[0])
Expand Down