Skip to content
Merged
Changes from all commits
Commits
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
12 changes: 5 additions & 7 deletions testing/postgres-client-tests/node/workbenchTests/docs.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,27 +47,25 @@ export const docsTests = [
},
},
{
skip: true, // TODO: the ON CONFLICT clause provided is not yet supported
q: "INSERT INTO schema.searches VALUES ($1, $2) ON CONFLICT (doc_name) DO UPDATE SET doc_text = $2",
q: "INSERT INTO dolt.docs VALUES ($1, $2) ON CONFLICT (doc_name) DO UPDATE SET doc_text = $2",
p: ["README.md", updatedReadmeText],
res: {
command: "INSERT",
rowCount: null,
oid: null,
rowCount: 2, // TODO: This should be 1, but there's a bug in the GMS iterators that overcounts
oid: 0,
rows: [],
fields: [],
},
},
{
skip: true,
q: `select * from dolt.docs where doc_name=$1`,
p: ["README.md"],
res: {
command: "SELECT",
rowCount: 1,
oid: null,
rows: [{ doc_name: "README.md", doc_text: updatedReadmeText }],
fields: [],
fields: doltDocsFields,
},
},
{
Expand Down Expand Up @@ -98,7 +96,7 @@ export const docsTests = [
command: "SELECT",
rowCount: 1,
oid: null,
rows: [{ doc_name: "README.md", doc_text: readmeText }],
rows: [{ doc_name: "README.md", doc_text: updatedReadmeText }],
fields: doltDocsFields,
},
},
Expand Down