Skip to content

Update transaction functions examples for using execute(Read|Write) #1009

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

Merged
merged 1 commit into from
Oct 21, 2022
Merged

Update transaction functions examples for using execute(Read|Write) #1009

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 26 additions & 26 deletions packages/neo4j-driver/test/examples.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ describe('#integration examples', () => {
// tag::cypher-error[]
const session = driver.session()
try {
await session.readTransaction(tx =>
await session.executeRead(tx =>
tx.run('SELECT * FROM Employees WHERE name = $name', {
name: personName
})
Expand Down Expand Up @@ -360,7 +360,7 @@ describe('#integration examples', () => {
const session = driver.session()

try {
const result = await session.writeTransaction(tx =>
const result = await session.executeWrite(tx =>
tx.run(
'CREATE (a:Greeting) SET a.message = $message RETURN a.message + ", from node " + id(a)',
{ message: 'hello, world' }
Expand Down Expand Up @@ -454,7 +454,7 @@ describe('#integration examples', () => {
RETURN p1, p2, k`

// Write transactions allow the driver to handle retries and transient errors
const writeResult = await session.writeTransaction(tx =>
const writeResult = await session.executeWrite(tx =>
tx.run(writeQuery, { person1Name, person2Name, knowsFrom })
)
writeResult.records.forEach(record => {
Expand All @@ -469,7 +469,7 @@ describe('#integration examples', () => {
const readQuery = `MATCH (p:Person)
WHERE p.name = $personName
RETURN p.name AS name`
const readResult = await session.readTransaction(tx =>
const readResult = await session.executeRead(tx =>
tx.run(readQuery, { personName: person1Name })
)
readResult.records.forEach(record => {
Expand Down Expand Up @@ -500,11 +500,11 @@ describe('#integration examples', () => {
const session = driver.session()

try {
await session.writeTransaction(tx =>
await session.executeWrite(tx =>
tx.run('CREATE (a:Person {name: $name})', { name: personName })
)

const result = await session.readTransaction(tx =>
const result = await session.executeRead(tx =>
tx.run('MATCH (a:Person {name: $name}) RETURN id(a)', {
name: personName
})
Expand Down Expand Up @@ -580,12 +580,12 @@ describe('#integration examples', () => {
// tag::async-multiple-tx[]
const session = driver.session()
try {
const names = await session.readTransaction(async tx => {
const names = await session.executeRead(async tx => {
const result = await tx.run('MATCH (a:Person) RETURN a.name AS name')
return result.records.map(record => record.get('name'))
})

const relationshipsCreated = await session.writeTransaction(tx =>
const relationshipsCreated = await session.executeWrite(tx =>
Promise.all(
names.map(name =>
tx
Expand Down Expand Up @@ -675,15 +675,15 @@ describe('#integration examples', () => {
// tag::async-result-retain[]
const session = driver.session()
try {
const result = await session.readTransaction(tx =>
const result = await session.executeRead(tx =>
tx.run('MATCH (a:Person) RETURN a.name AS name')
)

const nameRecords = result.records
for (let i = 0; i < nameRecords.length; i++) {
const name = nameRecords[i].get('name')

await session.writeTransaction(tx =>
await session.executeWrite(tx =>
tx.run(
'MATCH (emp:Person {name: $person_name}) ' +
'MERGE (com:Company {name: $company_name}) ' +
Expand Down Expand Up @@ -717,7 +717,7 @@ describe('#integration examples', () => {
})
const session = driver.session()

const writeTxPromise = session.writeTransaction(tx =>
const writeTxPromise = session.executeWrite(tx =>
tx.run('CREATE (a:Item)')
)

Expand Down Expand Up @@ -777,7 +777,7 @@ describe('#integration examples', () => {
const session = driver.session()
const titles = []
try {
const result = await session.readTransaction(tx =>
const result = await session.executeRead(tx =>
tx.run('MATCH (p:Product) WHERE p.id = $id RETURN p.title', { id: 0 })
)

Expand Down Expand Up @@ -814,7 +814,7 @@ describe('#integration examples', () => {

// tag::rx-transaction-function[]
const session = driver.rxSession()
const result = session.readTransaction(tx =>
const result = session.executeRead(tx =>
tx
.run('MATCH (p:Product) WHERE p.id = $id RETURN p.title', { id: 0 })
.records()
Expand Down Expand Up @@ -848,7 +848,7 @@ describe('#integration examples', () => {
// tag::transaction-timeout-config[]
const session = driver.session()
try {
const result = await session.writeTransaction(
const result = await session.executeWrite(
tx => addPerson(tx, personName),
{ timeout: 10 }
)
Expand Down Expand Up @@ -878,7 +878,7 @@ describe('#integration examples', () => {
// tag::transaction-metadata-config[]
const session = driver.session()
try {
const result = await session.writeTransaction(
const result = await session.executeWrite(
tx => addPerson(tx, personName),
{ metadata: { applicationId: '123' } }
)
Expand Down Expand Up @@ -919,7 +919,7 @@ describe('#integration examples', () => {
// tag::database-selection[]
const session = driver.session({ database: 'examples' })
try {
const result = await session.writeTransaction(tx =>
const result = await session.executeWrite(tx =>
tx.run(
'CREATE (a:Greeting {message: "Hello, Example-Database"}) RETURN a.message'
)
Expand All @@ -938,7 +938,7 @@ describe('#integration examples', () => {
defaultAccessMode: neo4j.READ
})
try {
const result = await readSession.writeTransaction(tx =>
const result = await readSession.executeWrite(tx =>
tx.run('MATCH (a:Greeting) RETURN a.message')
)

Expand Down Expand Up @@ -1012,10 +1012,10 @@ describe('#integration examples', () => {
// Create the first person and employment relationship.
const session1 = driver.session({ defaultAccessMode: neo4j.WRITE })
const first = session1
.writeTransaction(tx => addCompany(tx, 'Wayne Enterprises'))
.then(() => session1.writeTransaction(tx => addPerson(tx, 'Alice')))
.executeWrite(tx => addCompany(tx, 'Wayne Enterprises'))
.then(() => session1.executeWrite(tx => addPerson(tx, 'Alice')))
.then(() =>
session1.writeTransaction(tx =>
session1.executeWrite(tx =>
addEmployee(tx, 'Alice', 'Wayne Enterprises')
)
)
Expand All @@ -1027,10 +1027,10 @@ describe('#integration examples', () => {
// Create the second person and employment relationship.
const session2 = driver.session({ defaultAccessMode: neo4j.WRITE })
const second = session2
.writeTransaction(tx => addCompany(tx, 'LexCorp'))
.then(() => session2.writeTransaction(tx => addPerson(tx, 'Bob')))
.executeWrite(tx => addCompany(tx, 'LexCorp'))
.then(() => session2.executeWrite(tx => addPerson(tx, 'Bob')))
.then(() =>
session2.writeTransaction(tx => addEmployee(tx, 'Bob', 'LexCorp'))
session2.executeWrite(tx => addEmployee(tx, 'Bob', 'LexCorp'))
)
.then(() => {
savedBookmarks.push(session2.lastBookmarks())
Expand All @@ -1045,9 +1045,9 @@ describe('#integration examples', () => {
})

return session3
.writeTransaction(tx => makeFriends(tx, 'Alice', 'Bob'))
.executeWrite(tx => makeFriends(tx, 'Alice', 'Bob'))
.then(() =>
session3.readTransaction(findFriendships).then(() => session3.close())
session3.executeRead(findFriendships).then(() => session3.close())
)
})
// end::pass-bookmarks[]
Expand Down Expand Up @@ -1506,7 +1506,7 @@ describe('#integration examples', () => {
})

async function echo (session, value) {
return await session.readTransaction(async tx => {
return await session.executeRead(async tx => {
const result = await tx.run('RETURN $value as fieldName', {
value
})
Expand Down