From 98caf158e3db05d8a0e7705be92153af086600e7 Mon Sep 17 00:00:00 2001
From: Natalia Ivakina <natalia.ivakina@neotechnology.com>
Date: Fri, 20 Sep 2024 15:56:42 +0200
Subject: [PATCH 1/7] Add `--schema` to the neo4j-admin import tool

---
 .../tools/neo4j-admin/neo4j-admin-import.adoc | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc b/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
index bcc9da218..7a9457066 100644
--- a/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
+++ b/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
@@ -64,6 +64,9 @@ These are some things you need to keep in mind when creating your input files:
 ====
 Indexes and constraints are not created during the import.
 Instead, you have to add these afterward (see link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/indexes-for-full-text-search[Cypher Manual -> Indexes]).
+
+Starting from Neo4j 5.24, you can use the `--schema` option to create indexes and contraints during the import process.
+See <<indexes-constraints-import, Provide indexes and constraints during import>> for more information.
 ====
 
 [[import-tool-full]]
@@ -85,6 +88,7 @@ neo4j-admin database import full [-h] [--expand-commands] [--verbose] [--auto-sk
                                  [--bad-tolerance=<num>] [--delimiter=<char>] [--format=<format>]
                                  [--high-parallel-io=on|off|auto] [--id-type=string|integer|actual]
                                  [--input-encoding=<character-set>] [--max-off-heap-memory=<size>] [--quote=<char>]
+                                 [--schema=<path>]
                                  [--read-buffer-size=<size>] [--report-file=<path>] [--threads=<num>] --nodes=[<label>[:
                                  <label>]...=]<files>... [--nodes=[<label>[:<label>]...=]<files>...]...
                                  [--relationships=[<type>=]<files>...]... <database>
@@ -287,6 +291,12 @@ If you need to debug the import, it might be useful to collect the stack trace.
 This is done by using the `--verbose` option.
 |import.report
 
+|--schema=<path> label:new[Introduced in 5.24] label
+|File in which to store the Cypher schema commands to run as part of the data import.
+
+For an example, see <<indexes-constraints-import, Provide indexes and constraints during import>>
+|
+
 |--skip-bad-entries-logging[=true\|false]
 |When set to `true`, the details of bad entries are not written in the log. Disabling logging can improve performance when the data contains lots of faults. Cleaning the data before importing it is highly recommended because faults dramatically affect the tool's performance even without logging.
 |false
@@ -416,6 +426,29 @@ bin/neo4j-admin database import full --nodes import/movies_header.csv,import/mov
 --relationships import/roles_header.csv,import/roles.csv
 ----
 
+[[indexes-constraints-import]]
+==== Provide indexes and constraints during import
+
+Starting with Neo4j 5.24, you can use the `--schema` option that allows Cypher commands to be provided to create indexes/constraints during the initial import process.
+It currently only works for full import.
+
+You should have a Cypher script containing only `CREATE INDEX|CONSTRAINT` commands to be parsed and executed.
+This file uses ';' as the separator.
+
+List of supported indexes and constraints that can be created by the import tool:
+
+* RANGE
+* LOOKUP
+* FULL-TEXT
+* VECTOR
+
+For example:
+
+[source, shell, role=noplay]
+----
+bin/neo4j-admin database import full neo4j --nodes=import/movies.csv --nodes=import/actors.csv --relationships=import/roles.csv --schema=import/schema.cypher 
+----
+
 
 [[import-tool-multiple-input-files-regex-example]]
 ==== Import data from CSV files using regular expression

From 485f42eb9acc2da5acf060b5f52e417320a001a8 Mon Sep 17 00:00:00 2001
From: NataliaIvakina <82437520+NataliaIvakina@users.noreply.github.com>
Date: Mon, 23 Sep 2024 14:08:53 +0200
Subject: [PATCH 2/7] Update
 modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc

---
 modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc b/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
index 7a9457066..b11ac159a 100644
--- a/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
+++ b/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
@@ -439,6 +439,8 @@ List of supported indexes and constraints that can be created by the import tool
 
 * RANGE
 * LOOKUP
+* POINT
+* TEXT
 * FULL-TEXT
 * VECTOR
 

From f5661e6a767404be5dd10e013033f5a773e16c13 Mon Sep 17 00:00:00 2001
From: NataliaIvakina <82437520+NataliaIvakina@users.noreply.github.com>
Date: Mon, 23 Sep 2024 14:20:09 +0200
Subject: [PATCH 3/7] Add example of the Cypher script

---
 .../ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc b/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
index b11ac159a..c1c4ab8f8 100644
--- a/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
+++ b/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
@@ -435,6 +435,14 @@ It currently only works for full import.
 You should have a Cypher script containing only `CREATE INDEX|CONSTRAINT` commands to be parsed and executed.
 This file uses ';' as the separator.
 
+For example:
+
+[source, cypher, role=nocopy]
+----
+CREATE INDEX PersonNameIndex FOR (i:Person) ON (i.name);
+CREATE CONSTRAINT PersonAgeConstraint FOR (c:Person) REQUIRE c.age IS :: INTEGER
+----
+
 List of supported indexes and constraints that can be created by the import tool:
 
 * RANGE

From a9a3dff1772fa7f68971695e8d437a215b6e3079 Mon Sep 17 00:00:00 2001
From: NataliaIvakina <82437520+NataliaIvakina@users.noreply.github.com>
Date: Mon, 23 Sep 2024 15:59:47 +0200
Subject: [PATCH 4/7] Apply suggestions from code review

---
 modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc b/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
index c1c4ab8f8..bdf587bf7 100644
--- a/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
+++ b/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
@@ -291,7 +291,7 @@ If you need to debug the import, it might be useful to collect the stack trace.
 This is done by using the `--verbose` option.
 |import.report
 
-|--schema=<path> label:new[Introduced in 5.24] label
+|--schema=<path> label:new[Introduced in 5.24] label:enterprise[Enterprise edition]
 |File in which to store the Cypher schema commands to run as part of the data import.
 
 For an example, see <<indexes-constraints-import, Provide indexes and constraints during import>>
@@ -426,11 +426,12 @@ bin/neo4j-admin database import full --nodes import/movies_header.csv,import/mov
 --relationships import/roles_header.csv,import/roles.csv
 ----
 
+[role=label--enterprise-edition label--new-5.24]
 [[indexes-constraints-import]]
 ==== Provide indexes and constraints during import
 
 Starting with Neo4j 5.24, you can use the `--schema` option that allows Cypher commands to be provided to create indexes/constraints during the initial import process.
-It currently only works for full import.
+It currently only works for the block format and full import.
 
 You should have a Cypher script containing only `CREATE INDEX|CONSTRAINT` commands to be parsed and executed.
 This file uses ';' as the separator.

From 72a2d3c7d473a393863a63aab38e0def7b765395 Mon Sep 17 00:00:00 2001
From: NataliaIvakina <82437520+NataliaIvakina@users.noreply.github.com>
Date: Mon, 23 Sep 2024 16:00:29 +0200
Subject: [PATCH 5/7] Update
 modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc

---
 modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc b/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
index bdf587bf7..644ad366a 100644
--- a/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
+++ b/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
@@ -66,6 +66,7 @@ Indexes and constraints are not created during the import.
 Instead, you have to add these afterward (see link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/indexes-for-full-text-search[Cypher Manual -> Indexes]).
 
 Starting from Neo4j 5.24, you can use the `--schema` option to create indexes and contraints during the import process.
+The option is available in the Enterprise Edition and works only for the block format.
 See <<indexes-constraints-import, Provide indexes and constraints during import>> for more information.
 ====
 

From 61eb867d7e09f8809a2a4c39a1f27104052f3bc6 Mon Sep 17 00:00:00 2001
From: NataliaIvakina <82437520+NataliaIvakina@users.noreply.github.com>
Date: Mon, 23 Sep 2024 16:23:15 +0200
Subject: [PATCH 6/7] Update neo4j-admin-import.adoc

---
 modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc b/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
index 644ad366a..bd1068977 100644
--- a/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
+++ b/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
@@ -89,10 +89,9 @@ neo4j-admin database import full [-h] [--expand-commands] [--verbose] [--auto-sk
                                  [--bad-tolerance=<num>] [--delimiter=<char>] [--format=<format>]
                                  [--high-parallel-io=on|off|auto] [--id-type=string|integer|actual]
                                  [--input-encoding=<character-set>] [--max-off-heap-memory=<size>] [--quote=<char>]
-                                 [--schema=<path>]
                                  [--read-buffer-size=<size>] [--report-file=<path>] [--threads=<num>] --nodes=[<label>[:
                                  <label>]...=]<files>... [--nodes=[<label>[:<label>]...=]<files>...]...
-                                 [--relationships=[<type>=]<files>...]... <database>
+                                 [--relationships=[<type>=]<files>...]... [--schema=<path>] <database>
 ----
 
 === Description

From 46d1f244d88283058a6228546480f4fa86fd8f0b Mon Sep 17 00:00:00 2001
From: NataliaIvakina <82437520+NataliaIvakina@users.noreply.github.com>
Date: Mon, 23 Sep 2024 16:42:06 +0200
Subject: [PATCH 7/7] Update the USAGE section and descr according to the help
 output

---
 .../ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc  | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc b/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
index bd1068977..32ecc2d3e 100644
--- a/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
+++ b/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
@@ -89,9 +89,9 @@ neo4j-admin database import full [-h] [--expand-commands] [--verbose] [--auto-sk
                                  [--bad-tolerance=<num>] [--delimiter=<char>] [--format=<format>]
                                  [--high-parallel-io=on|off|auto] [--id-type=string|integer|actual]
                                  [--input-encoding=<character-set>] [--max-off-heap-memory=<size>] [--quote=<char>]
-                                 [--read-buffer-size=<size>] [--report-file=<path>] [--threads=<num>] --nodes=[<label>[:
-                                 <label>]...=]<files>... [--nodes=[<label>[:<label>]...=]<files>...]...
-                                 [--relationships=[<type>=]<files>...]... [--schema=<path>] <database>
+                                 [--read-buffer-size=<size>] [--report-file=<path>] [--schema=<path>] [--threads=<num>]
+                                 --nodes=[<label>[:<label>]...=]<files>... [--nodes=[<label>[:<label>]...=]
+                                 <files>...]... [--relationships=[<type>=]<files>...]... <database>
 ----
 
 === Description
@@ -293,8 +293,6 @@ This is done by using the `--verbose` option.
 
 |--schema=<path> label:new[Introduced in 5.24] label:enterprise[Enterprise edition]
 |File in which to store the Cypher schema commands to run as part of the data import.
-
-For an example, see <<indexes-constraints-import, Provide indexes and constraints during import>>
 |
 
 |--skip-bad-entries-logging[=true\|false]