From 6a0aadc5687414673ec54e2a1a40ee913051622a Mon Sep 17 00:00:00 2001 From: Junwang Zhao Date: Sat, 21 Dec 2024 12:41:31 +0000 Subject: [PATCH v1 3/3] some typos Since property name and label name are unique in property graph scope, some of the wording are not accurate. Signed-off-by: Junwang Zhao --- doc/src/sgml/information_schema.sgml | 18 +++++++++--------- doc/src/sgml/ref/alter_property_graph.sgml | 2 +- doc/src/sgml/ref/create_property_graph.sgml | 6 +++--- doc/src/sgml/ref/drop_property_graph.sgml | 2 +- src/backend/commands/propgraphcmds.c | 4 ++-- .../regress/expected/create_property_graph.out | 8 ++++---- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/doc/src/sgml/information_schema.sgml b/doc/src/sgml/information_schema.sgml index c92b65b03a..dc0257902b 100644 --- a/doc/src/sgml/information_schema.sgml +++ b/doc/src/sgml/information_schema.sgml @@ -4227,7 +4227,7 @@ ORDER BY c.ordinal_position; property_graph_name sql_identifier - Name of the property_graph + Name of the property graph @@ -4346,7 +4346,7 @@ ORDER BY c.ordinal_position; property_graph_name sql_identifier - Name of the property_graph + Name of the property graph @@ -4430,7 +4430,7 @@ ORDER BY c.ordinal_position; property_graph_name sql_identifier - Name of the property_graph + Name of the property graph @@ -4505,7 +4505,7 @@ ORDER BY c.ordinal_position; property_graph_name sql_identifier - Name of the property_graph + Name of the property graph @@ -4589,7 +4589,7 @@ ORDER BY c.ordinal_position; property_graph_name sql_identifier - Name of the property_graph + Name of the property graph @@ -4700,7 +4700,7 @@ ORDER BY c.ordinal_position; property_graph_name sql_identifier - Name of the property_graph + Name of the property graph @@ -4774,7 +4774,7 @@ ORDER BY c.ordinal_position; property_graph_name sql_identifier - Name of the property_graph + Name of the property graph @@ -4839,7 +4839,7 @@ ORDER BY c.ordinal_position; property_graph_name sql_identifier - Name of the property_graph + Name of the property graph @@ -5255,7 +5255,7 @@ ORDER BY c.ordinal_position; property_graph_name sql_identifier - Name of the property_graph + Name of the property graph diff --git a/doc/src/sgml/ref/alter_property_graph.sgml b/doc/src/sgml/ref/alter_property_graph.sgml index 604c518011..4ae53deb09 100644 --- a/doc/src/sgml/ref/alter_property_graph.sgml +++ b/doc/src/sgml/ref/alter_property_graph.sgml @@ -99,7 +99,7 @@ ALTER PROPERTY GRAPH [ IF EXISTS ] nameALTER {VERTEX|NODE|EDGE|RELATIONSHIP} TABLE ... DROP LABEL - This form removes a new label from an existing vertex or edge table. + This form removes a label from an existing vertex or edge table. diff --git a/doc/src/sgml/ref/create_property_graph.sgml b/doc/src/sgml/ref/create_property_graph.sgml index f88d1194cb..e953725847 100644 --- a/doc/src/sgml/ref/create_property_graph.sgml +++ b/doc/src/sgml/ref/create_property_graph.sgml @@ -151,7 +151,7 @@ CREATE [ TEMP | TEMPORARY ] PROPERTY GRAPH name The vertex tables that the edge table is linked to. These refer to the - aliases of a the vertex table. + aliases of the vertex tables. @@ -251,8 +251,8 @@ CREATE PROPERTY GRAPH g1 - For each property graph element, all properties with the same name must - have the same expression for each label. For example, this would be + For each property graph, all properties with the same name must + have the same expression. For example, this would be allowed: CREATE PROPERTY GRAPH g1 diff --git a/doc/src/sgml/ref/drop_property_graph.sgml b/doc/src/sgml/ref/drop_property_graph.sgml index 31cb77a2af..e16de5507b 100644 --- a/doc/src/sgml/ref/drop_property_graph.sgml +++ b/doc/src/sgml/ref/drop_property_graph.sgml @@ -96,7 +96,7 @@ DROP PROPERTY GRAPH g1; DROP PROPERTY GRAPH conforms to ISO/IEC 9075-16 (SQL/PGQ), except that the standard only allows one property graph to be dropped per command, and apart from the IF EXISTS - option, which is a PostgreSQL extension.. + option, which is a PostgreSQL extension. diff --git a/src/backend/commands/propgraphcmds.c b/src/backend/commands/propgraphcmds.c index b9afb3a413..93d3bc1bf1 100644 --- a/src/backend/commands/propgraphcmds.c +++ b/src/backend/commands/propgraphcmds.c @@ -848,7 +848,7 @@ insert_property_record(Oid graphid, Oid ellabeloid, Oid pgerelid, const char *pr errcode(ERRCODE_SYNTAX_ERROR), errmsg("property \"%s\" data type mismatch: %s vs. %s", propname, format_type_be(proptypid), format_type_be(exprtypid)), - errdetail("In a property graph, a property of the same name has to have the same data type in each label.")); + errdetail("In a property graph, a property of the same name has to have the same data type.")); } /* @@ -995,7 +995,7 @@ check_element_properties(Oid peoid) errcode(ERRCODE_SYNTAX_ERROR), errmsg("element \"%s\" property \"%s\" expression mismatch: %s vs. %s", NameStr(elform->pgealias), get_propgraph_property_name(propoid), dpa, dpb), - errdetail("In a property graph element, a property of the same name has to have the same expression in each label.")); + errdetail("In a property graph, a property of the same name has to have the same expression.")); ReleaseSysCache(tuple3); } diff --git a/src/test/regress/expected/create_property_graph.out b/src/test/regress/expected/create_property_graph.out index 70c4afda52..475f2b7943 100644 --- a/src/test/regress/expected/create_property_graph.out +++ b/src/test/regress/expected/create_property_graph.out @@ -139,24 +139,24 @@ CREATE PROPERTY GRAPH gx LABEL bar PROPERTIES (1 + a AS aa) -- expression mismatch ); ERROR: element "t1" property "aa" expression mismatch: (1 + a) vs. (a + 1) -DETAIL: In a property graph element, a property of the same name has to have the same expression in each label. +DETAIL: In a property graph, a property of the same name has to have the same expression. ALTER PROPERTY GRAPH g2 ADD VERTEX TABLES ( t1 AS t1x KEY (a) LABEL foo PROPERTIES (a + 1 AS aa) LABEL bar PROPERTIES (1 + a AS aa) -- expression mismatch ); ERROR: element "t1x" property "aa" expression mismatch: (1 + a) vs. (a + 1) -DETAIL: In a property graph element, a property of the same name has to have the same expression in each label. +DETAIL: In a property graph, a property of the same name has to have the same expression. CREATE PROPERTY GRAPH gx VERTEX TABLES ( t1 KEY (a) PROPERTIES (b AS p1), t2 PROPERTIES (k AS p1) -- type mismatch ); ERROR: property "p1" data type mismatch: text vs. integer -DETAIL: In a property graph, a property of the same name has to have the same data type in each label. +DETAIL: In a property graph, a property of the same name has to have the same data type. ALTER PROPERTY GRAPH g2 ALTER VERTEX TABLE t1 ADD LABEL foo PROPERTIES (b AS k); -- type mismatch ERROR: property "k" data type mismatch: integer vs. text -DETAIL: In a property graph, a property of the same name has to have the same data type in each label. +DETAIL: In a property graph, a property of the same name has to have the same data type. CREATE PROPERTY GRAPH gx VERTEX TABLES ( t1 KEY (a) LABEL l1 PROPERTIES (a, a AS aa), -- 2.39.5