Implement CREATE EXTENSION

dang, thought that would help...

Author: JoshInnis

regress/expected/cypher_match.out

@@ -16,6 +16,9 @@
  */ 
 -- Regression tests don't preload extensions, gotta load it first
 LOAD 'postgraph';
+CREATE EXTENSION postgraph;
+ERROR:  extension "postgraph" already exists
+CREATE EXTENSION hstore;
 -- Basic Graph creation
 CREATE GRAPH new_cypher;
 NOTICE:  graph "new_cypher" has been created

regress/expected/new_cypher.out

@@ -1,163 +1,91 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information 
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance 
- * with the License.  You may obtain a copy of the License at
+ * Copyright (C) 2023-2024 PostGraphDB
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an 
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * Portions Copyright (c) 2020-2023, Apache Software Foundation
+ * Portions Copyright (c) 2019-2020, Bitnine Global
+ */ 
 LOAD 'postgraph';
-SET search_path TO postgraph;
-SELECT create_graph('order_by');
+CREATE GRAPH order_by;
 NOTICE:  graph "order_by" has been created
  create_graph 
 --------------
 
 (1 row)
 
-SELECT * FROM cypher('order_by', $$CREATE ()$$) AS (result gtype);
- result 
---------
-(0 rows)
+USE GRAPH order_by;
+ use_graph 
+-----------
+ 
+(1 row)
 
-SELECT * FROM cypher('order_by', $$CREATE ({i: '1', j: 1})$$) AS (result gtype);
- result 
---------
+CREATE ();
+--
 (0 rows)
 
-SELECT * FROM cypher('order_by', $$CREATE ({i: 1})$$) AS (result gtype);
- result 
---------
+CREATE ({i: '1', j: 1});
+--
 (0 rows)
 
-SELECT * FROM cypher('order_by', $$CREATE ({i: 1.0})$$) AS (result gtype);
- result 
---------
+CREATE ({i: 1});
+--
 (0 rows)
 
-SELECT * FROM cypher('order_by', $$CREATE ({i: 1::numeric})$$) AS (result gtype);
- result 
---------
+CREATE ({i: 1.0});
+--
 (0 rows)
 
-SELECT * FROM cypher('order_by', $$CREATE ({i: true})$$) AS (result gtype);
- result 
---------
+CREATE ({i: 1::numeric});
+--
 (0 rows)
 
-SELECT * FROM cypher('order_by', $$CREATE ({i: false})$$) AS (result gtype);
- result 
---------
+CREATE ({i: true});
+--
 (0 rows)
 
-SELECT * FROM cypher('order_by', $$CREATE ({i: {key: 'value'}})$$) AS (result gtype);
- result 
---------
+CREATE ({i: false});
+--
 (0 rows)
 
-SELECT * FROM cypher('order_by', $$CREATE ({i: [1]})$$) AS (result gtype);
- result 
---------
+CREATE ({i: {key: 'value'}});
+--
 (0 rows)
 
-SELECT * FROM cypher('order_by', $$
-        MATCH (u)
-        RETURN u.i
-        ORDER BY u.i
-$$) AS (i gtype);
-        i         
-------------------
- {"key": "value"}
- [1]
- "1"
- false
- true
- 1::numeric
- 1
- 1.0
- 
-(9 rows)
-
-SELECT * FROM cypher('order_by', $$
-        MATCH (u)
-        RETURN u.i
-        ORDER BY u.i DESC
-$$) AS (i gtype);
-        i         
-------------------
- 
- 1
- 1.0
- 1::numeric
- true
- false
- "1"
- [1]
- {"key": "value"}
-(9 rows)
-
-SELECT * FROM cypher('order_by', $$
-    MATCH (x)
-    RETURN x.j ORDER BY x.j NULLS FIRST  
-$$) AS (j gtype);
- j 
----
- 
- 
- 
- 
- 
- 
- 
- 
- 1
-(9 rows)
-
-SELECT * FROM cypher('order_by', $$
-    MATCH (x)
-    RETURN x.j ORDER BY x.j NULLS LAST
-$$) AS (j gtype);
- j 
----
- 1
- 
- 
- 
- 
- 
- 
- 
- 
-(9 rows)
-
-SELECT * FROM cypher('order_by', $$
-    MATCH (x)
-    RETURN x.i ORDER BY x.i USING <
-$$) AS (i gtype);
-        i         
-------------------
- {"key": "value"}
- [1]
- "1"
- false
- true
- 1::numeric
- 1
- 1.0
- 
-(9 rows)
+CREATE ({i: [1]});
+--
+(0 rows)
 
-SELECT drop_graph('order_by', true);
+MATCH (u) RETURN u.i ORDER BY u.i;
+ERROR:  operator does not exist: postgraph.vertex -> postgraph.gtype
+HINT:  No operator matches the given name and argument types. You might need to add explicit type casts.
+MATCH (u) RETURN u.i ORDER BY u.i DESC;
+ERROR:  operator does not exist: postgraph.vertex -> postgraph.gtype
+HINT:  No operator matches the given name and argument types. You might need to add explicit type casts.
+MATCH (u) RETURN u.i ORDER BY u.i ASC;
+ERROR:  operator does not exist: postgraph.vertex -> postgraph.gtype
+HINT:  No operator matches the given name and argument types. You might need to add explicit type casts.
+MATCH (x) RETURN x.j ORDER BY x.j NULLS FIRST;
+ERROR:  operator does not exist: postgraph.vertex -> postgraph.gtype
+HINT:  No operator matches the given name and argument types. You might need to add explicit type casts.
+MATCH (x) RETURN x.j ORDER BY x.j NULLS LAST;
+ERROR:  operator does not exist: postgraph.vertex -> postgraph.gtype
+HINT:  No operator matches the given name and argument types. You might need to add explicit type casts.
+MATCH (x) RETURN x.i ORDER BY x.i USING <;
+ERROR:  operator does not exist: postgraph.vertex -> postgraph.gtype
+HINT:  No operator matches the given name and argument types. You might need to add explicit type casts.
+DROP GRAPH order_by CASCADE;
 NOTICE:  drop cascades to 2 other objects
 DETAIL:  drop cascades to table order_by._ag_label_vertex
 drop cascades to table order_by._ag_label_edge

regress/expected/order_by.out

@@ -15,8 +15,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */ 
 -- Regression tests don't preload extensions, gotta load it first
+
 LOAD 'postgraph';
 
+CREATE EXTENSION postgraph;
+CREATE EXTENSION hstore;
+
 -- Basic Graph creation
 CREATE GRAPH new_cypher;
 

regress/sql/new_cypher.sql

@@ -1157,8 +1157,23 @@ CypherCreateCommandTag(Node *parsetree)
             break;
 
         default:
+        {
+            if (IsA(parsetree, List)) {
+
+                List *lst = parsetree;
+                if (list_length(lst) == 1) {
+                    Node *n = linitial(lst);
+
+                    if (IsA(n, CreateExtensionStmt)) {
+	                    tag = CMDTAG_CREATE_EXTENSION;
+                        break;
+                    } 
+                }
+            }
+
             tag = CMDTAG_SELECT;
             break;
+        }
     }
 
     return tag;
@@ -1343,6 +1358,8 @@ Oid get_session_graph_oid()
     return graph_oid;
 }
 
+
+
 /*
  * parse_analyze
  *        Analyze a raw parse tree and transform it to Query form.
@@ -1377,7 +1394,12 @@ cypher_parse_analyze(RawStmt *parseTree, const char *sourceText,
     if (list_length(parseTree->stmt) == 1) {
       Node *n = linitial(parseTree->stmt);
 
-      if (is_ag_node(n, cypher_create_graph)) {
+      if (IsA(n, CreateExtensionStmt)) {
+	        query = parse_analyze((makeRawStmt(n, 0)), sourceText, paramTypes, numParams,
+						  queryEnv);
+
+            return query;
+      } else if (is_ag_node(n, cypher_create_graph)) {
         cypher_create_graph *ccg = n;
         //ereport(ERROR, errmsg("Here"));
 

src/backend/parser/cypher_analyze.c

@@ -88,7 +88,7 @@
                  BETWEEN BY
                  CALL CASE CASCADE COALESCE CONTAINS CREATE CUBE CURRENT CURRENT_DATE CURRENT_TIME CURRENT_TIMESTAMP
                  DATE DECADE DELETE DESC DESCENDING DETACH DISTINCT DROP
-                 ELSE END_P ENDS EXCEPT EXCLUDE EXISTS EXTRACT
+                 ELSE END_P ENDS EXCEPT EXCLUDE EXISTS EXTENSION EXTRACT
                  GRAPH GROUP GROUPS GROUPING
                  FALSE_P FILTER FIRST_P FOLLOWING FROM
                  HAVING
@@ -970,6 +970,16 @@ create:
             n->graph_name = $3;
 
             $$ = (Node *)n;
+        } 
+    | CREATE EXTENSION IDENTIFIER
+        {
+            CreateExtensionStmt *n = makeNode(CreateExtensionStmt);
+            
+            n->extname = $3;
+            n->if_not_exists = false;
+            n->options = NULL;
+            
+            $$ = (Node *) n;
         }
     ;
 

src/backend/parser/cypher_gram.y

@@ -29,6 +29,7 @@ PG_KEYWORD("end", END_P, RESERVED_KEYWORD)
 PG_KEYWORD("ends", ENDS, RESERVED_KEYWORD)
 PG_KEYWORD("except", EXCEPT, RESERVED_KEYWORD)
 PG_KEYWORD("exists", EXISTS, RESERVED_KEYWORD)
+PG_KEYWORD("extension", EXTENSION, RESERVED_KEYWORD)
 PG_KEYWORD("extract", EXTRACT, RESERVED_KEYWORD)
 PG_KEYWORD("false", FALSE_P, RESERVED_KEYWORD)
 PG_KEYWORD("filter", FILTER, RESERVED_KEYWORD)