Skip to content

1.1 forward merge examples #171

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 8 commits into from
Dec 13, 2016
Merged

1.1 forward merge examples #171

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
31c525c
Added params and made format consistent for all queries
Nov 24, 2016
3ab0f14
Changed `localhost` -> `myserver:7687` in examples
Nov 25, 2016
1d29f2b
`myserver` -> `localhost` in examples
Nov 25, 2016
a9965f5
Addressed Oskar's comments
Nov 25, 2016
b325492
Merge pull request #163 from petraselmer/1-0-Add-params-to-queries-fi…
Dec 13, 2016
f18cd93
Merge branch '1.0' into 1-0-Update-URI-examples
Dec 13, 2016
3478d64
Merge pull request #164 from petraselmer/1-0-Update-URI-examples
Dec 13, 2016
61c0531
Merge branch '1.0' into 1.1-forward-merge-examples
Dec 13, 2016
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
54 changes: 30 additions & 24 deletions test/v1/examples.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ describe('examples', function() {
jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;

//tag::construct-driver[]
var driver = neo4j.driver("bolt://localhost", neo4j.auth.basic("neo4j", "neo4j"));
var driver = neo4j.driver("bolt://localhost:7687", neo4j.auth.basic("neo4j", "neo4j"));
//end::construct-driver[]
driverGlobal = driver;
});
Expand Down Expand Up @@ -68,13 +68,14 @@ describe('examples', function() {
var neo4j = require('neo4j-driver').v1;
// end::minimal-example-import[]
// tag::minimal-example[]
var driver = neo4j.driver("bolt://localhost", neo4j.auth.basic("neo4j", "neo4j"));
var driver = neo4j.driver("bolt://localhost:7687", neo4j.auth.basic("neo4j", "neo4j"));
var session = driver.session();
session
.run( "CREATE (a:Person {name:'Arthur', title:'King'})" )
.run( "CREATE (a:Person {name: {name}, title: {title}})", {name: "Arthur", title: "King"})
.then( function()
{
return session.run( "MATCH (a:Person) WHERE a.name = 'Arthur' RETURN a.name AS name, a.title AS title" )
return session.run( "MATCH (a:Person) WHERE a.name = {name} RETURN a.name AS name, a.title AS title",
{name: "Arthur"})
})
.then( function( result ) {
console.log( result.records[0].get("title") + " " + result.records[0].get("name") );
Expand All @@ -91,11 +92,11 @@ describe('examples', function() {
it('should be able to configure session pool size', function (done) {
var neo4j = neo4jv1;
// tag::configuration[]
var driver = neo4j.driver("bolt://localhost", neo4j.auth.basic("neo4j", "neo4j"), {connectionPoolSize: 50});
var driver = neo4j.driver("bolt://localhost:7687", neo4j.auth.basic("neo4j", "neo4j"), {connectionPoolSize: 50});
//end::configuration[]

var s = driver.session();
s.run( "CREATE (p:Person { name: {name} })", {name: "The One"} )
s.run( "CREATE (p:Person {name: {name}})", {name: "The One"} )
.then( function(result) {
var theOnesCreated = result.summary.counters.nodesCreated();
console.log(theOnesCreated);
Expand Down Expand Up @@ -129,7 +130,7 @@ describe('examples', function() {
var session = driverGlobal.session();
// tag::statement-without-parameters[]
session
.run( "CREATE (p:Person { name: 'Arthur' })" )
.run( "CREATE (p:Person {name: 'Arthur'})" )
// end::statement-without-parameters[]
.then( function(result) {
var theOnesCreated = result.summary.counters.nodesCreated();
Expand All @@ -147,12 +148,12 @@ describe('examples', function() {
it('should be able to iterate results', function(done) {
var session = driverGlobal.session();
session
.run( "CREATE (weapon:Weapon { name: 'Sword in the stone' })" )
.run( "CREATE (weapon:Weapon {name: {name}})", {name: "Sword in the stone"} )
.then(function() {
// tag::result-traversal[]
var searchTerm = "Sword";
session
.run( "MATCH (weapon:Weapon) WHERE weapon.name CONTAINS {term} RETURN weapon.name", {term : searchTerm} )
.run( "MATCH (weapon:Weapon) WHERE weapon.name CONTAINS {term} RETURN weapon.name", {term: searchTerm} )
.subscribe({
onNext: function(record) {
console.log("" + record.get("weapon.name"));
Expand All @@ -176,12 +177,14 @@ describe('examples', function() {
it('should be able to access records', function(done) {
var session = driverGlobal.session();
session
.run( "CREATE (weapon:Weapon { name: 'Sword in the stone', owner: 'Arthur', material: 'Stone', size: 'Huge' })" )
.run( "CREATE (weapon:Weapon {name: {name}, owner: {owner}, material: {material}, size: {size}})",
{name: "Sword in the stone", owner: "Arthur", material: "Stone", size: "Huge"})
.then(function() {
// tag::access-record[]
var searchTerm = "Arthur";
session
.run( "MATCH (weapon:Weapon) WHERE weapon.owner CONTAINS {term} RETURN weapon.name, weapon.material, weapon.size", {term : searchTerm} )
.run( "MATCH (weapon:Weapon) WHERE weapon.owner CONTAINS {term} RETURN weapon.name, weapon.material, weapon.size",
{term: searchTerm} )
.subscribe({
onNext: function(record) {
var sword = [];
Expand Down Expand Up @@ -212,11 +215,12 @@ describe('examples', function() {
var session = driverGlobal.session();

session
.run("CREATE (knight:Person:Knight { name: 'Lancelot', castle: 'Camelot' })")
.run("CREATE (knight:Person:Knight {name: {name}, castle: {castle}})", {name: "Lancelot", castle: "Camelot"})
.then(function() {
// tag::retain-result[]
session
.run("MATCH (knight:Person:Knight) WHERE knight.castle = {castle} RETURN knight.name AS name", {castle: "Camelot"})
.run("MATCH (knight:Person:Knight) WHERE knight.castle = {castle} RETURN knight.name AS name",
{castle: "Camelot"})
.then(function (result) {
var records = [];
for (var i = 0; i < result.records.length; i++) {
Expand Down Expand Up @@ -244,17 +248,19 @@ describe('examples', function() {
it('should be able to do nested queries', function(done) {
var session = driverGlobal.session();;
session
.run( "CREATE (knight:Person:Knight { name: 'Lancelot', castle: 'Camelot' })" +
"CREATE (king:Person { name: 'Arthur', title: 'King' })" )
.run( "CREATE (knight:Person:Knight {name: {name1}, castle: {castle}})" +
"CREATE (king:Person {name: {name2}, title: {title}})",
{name1: "Lancelot", castle: "Camelot", name2: "Arthur", title: "King"})
.then(function() {
// tag::nested-statements[]
session
.run("MATCH (knight:Person:Knight) WHERE knight.castle = {castle} RETURN id(knight) AS knight_id", {"castle": "Camelot"})
.run("MATCH (knight:Person:Knight) WHERE knight.castle = {castle} RETURN id(knight) AS knight_id",
{castle: "Camelot"})
.subscribe({
onNext: function(record) {
session
.run("MATCH (knight) WHERE id(knight) = {id} MATCH (king:Person) WHERE king.name = {king} CREATE (knight)-[:DEFENDS]->(king)",
{"id": record.get("knight_id"), "king": "Arthur"});
{id: record.get("knight_id"), king: "Arthur"});
},
onCompleted: function() {
session
Expand Down Expand Up @@ -295,7 +301,7 @@ describe('examples', function() {
it('should be able to profile', function(done) {
var session = driverGlobal.session();

session.run("CREATE (:Person {name:'Arthur'})").then(function() {
session.run("CREATE (:Person {name: {name}})", {name: "Arthur"}).then(function() {
// tag::result-summary-query-profile[]
session
.run("PROFILE MATCH (p:Person {name: {name}}) RETURN id(p)", {name: "Arthur"})
Expand Down Expand Up @@ -340,7 +346,7 @@ describe('examples', function() {

// tag::transaction-commit[]
var tx = session.beginTransaction();
tx.run( "CREATE (:Person {name: 'Guinevere'})" );
tx.run( "CREATE (:Person {name: {name}})", {name: "Guinevere"} );
tx.commit().then(function() {session.close()});
// end::transaction-commit[]
});
Expand All @@ -350,15 +356,15 @@ describe('examples', function() {

// tag::transaction-rollback[]
var tx = session.beginTransaction();
tx.run( "CREATE (:Person {name: 'Merlin'})" );
tx.run( "CREATE (:Person {name: {name}})", {name: "Merlin"});
tx.rollback().then(function() {session.close()});
// end::transaction-rollback[]
});

it('should document how to require encryption', function() {
var neo4j = neo4jv1;
// tag::tls-require-encryption[]
var driver = neo4j.driver("bolt://localhost", neo4j.auth.basic("neo4j", "neo4j"), {
var driver = neo4j.driver("bolt://localhost:7687", neo4j.auth.basic("neo4j", "neo4j"), {
//In NodeJS, encryption is ENCRYPTION_NON_LOCAL on by default. In the web bundle, it is ENCRYPTION_OFF.
encrypted:"ENCRYPTION_ON"
});
Expand All @@ -369,7 +375,7 @@ describe('examples', function() {
it('should document how to configure trust-on-first-use', function() {
var neo4j = neo4jv1;
// tag::tls-trust-on-first-use[]
var driver = neo4j.driver("bolt://localhost", neo4j.auth.basic("neo4j", "neo4j"), {
var driver = neo4j.driver("bolt://localhost:7687", neo4j.auth.basic("neo4j", "neo4j"), {
// Note that trust-on-first-use is not available in the browser bundle,
// in NodeJS, trust-on-first-use is the default trust mode. In the browser
// it is TRUST_CUSTOM_CA_SIGNED_CERTIFICATES.
Expand All @@ -383,7 +389,7 @@ describe('examples', function() {
it('should document how to configure a trusted signing certificate', function() {
var neo4j = neo4jv1;
// tag::tls-signed[]
var driver = neo4j.driver("bolt://localhost", neo4j.auth.basic("neo4j", "neo4j"), {
var driver = neo4j.driver("bolt://localhost:7687", neo4j.auth.basic("neo4j", "neo4j"), {
trust: "TRUST_CUSTOM_CA_SIGNED_CERTIFICATES",
// Configuring which certificates to trust here is only available
// in NodeJS. In the browser bundle the browsers list of trusted
Expand All @@ -398,7 +404,7 @@ describe('examples', function() {
it('should document how to disable auth', function() {
var neo4j = neo4jv1;
// tag::connect-with-auth-disabled[]
var driver = neo4j.driver("bolt://localhost", {
var driver = neo4j.driver("bolt://localhost:7687", {
// In NodeJS, encryption is on by default. In the web bundle, it is off.
encrypted:"ENCRYPTION_NON_LOCAL"
});
Expand Down