Skip to content

Commit 7b170bc

Browse files
committed
rename listTables to SQLListTables; update SQLListTables reponse format
1 parent 7e726e3 commit 7b170bc

File tree

2 files changed

+19
-24
lines changed

2 files changed

+19
-24
lines changed

src/client.ts

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1731,36 +1731,31 @@ class ImmudbClient {
17311731
}
17321732
}
17331733

1734-
async listTables (): Promise<schemaTypes.SQLQueryResult.AsObject | undefined> {
1734+
async SQLListTables (): Promise<Array<Array<SQLValue>> | undefined> {
17351735
try {
17361736
const req = new empty.Empty()
17371737

17381738
return new Promise((resolve, reject) => this.client.listTables(req, this._metadata, (err, res) => {
17391739
if (err) {
1740-
console.error('listTables error', err);
1740+
console.error('SQLListTables error', err);
17411741

17421742
reject(err);
17431743
} else {
1744-
const columnsList = res
1745-
.getColumnsList()
1746-
.map(column => column.toObject());
1747-
const rowsList = res
1744+
resolve(res
17481745
.getRowsList()
1749-
.map(row => {
1750-
const valuesList = row
1751-
.getValuesList()
1752-
.map(value => value.toObject());
1753-
1754-
return {
1755-
columnsList: row.getColumnsList(),
1756-
valuesList
1757-
}
1758-
});
1759-
1760-
resolve({
1761-
columnsList,
1762-
rowsList,
1763-
})
1746+
.map(row => row
1747+
.getValuesList()
1748+
.map(value => value.hasNull()
1749+
? value.getNull()
1750+
: value.hasS()
1751+
? value.getS()
1752+
: value.hasN()
1753+
? value.getN()
1754+
: value.hasB()
1755+
? value.getB()
1756+
: value.hasBs()
1757+
? value.getBs_asU8()
1758+
: null)))
17641759
}
17651760
}))
17661761
} catch(err) {

tests/tap-parallel-not-ok/client.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -443,6 +443,8 @@ tap.test('[OPERATIONS]: SQL', async t => {
443443
sql: `create table ${ tableName } (id integer, name varchar, primary key id);`,
444444
})
445445

446+
await immudbClient.SQLListTables()
447+
446448
const sqlExecParams = [
447449
{
448450
id: 1,
@@ -466,9 +468,7 @@ tap.test('[OPERATIONS]: SQL', async t => {
466468

467469
await immudbClient.SQLQuery({
468470
sql: `select id,name from ${ tableName } where name=@name;`,
469-
params: {
470-
name: 'Joe',
471-
}
471+
params: { name: 'Joe' }
472472
})
473473

474474
t.end();

0 commit comments

Comments
 (0)