feat: add support for mysql2 and pg-pool nodejs db clients

core/internal/psql/insert.go

@@ -40,9 +40,6 @@ func (c *compilerContext) renderInsertStmt(m qcode.Mutate, embedded bool) {
 	c.renderValues(m, false)
 
 	if !embedded {
-		c.w.WriteString(` RETURNING `)
-		c.table(m.Ti.Schema, m.Ti.Name, false)
-		c.w.WriteString(`.*)`)
-
+		c.renderReturning(m)
 	}
 }

core/internal/psql/mutate.go

@@ -318,11 +318,12 @@ func (c *compilerContext) renderUpsert() {
 
 	c.w.WriteString(` WHERE `)
 	c.renderExp(m.Ti, sel.Where.Exp, false)
-	c.w.WriteString(` RETURNING *) `)
+	c.renderReturning(m)
 }
 
 func (c *compilerContext) renderDelete() {
 	sel := c.qc.Selects[0]
+	m := c.qc.Mutates[0]
 
 	c.w.WriteString(`WITH `)
 	c.quoted(sel.Table)
@@ -332,9 +333,7 @@ func (c *compilerContext) renderDelete() {
 	c.w.WriteString(` WHERE `)
 	c.renderExp(sel.Ti, sel.Where.Exp, false)
 
-	c.w.WriteString(` RETURNING `)
-	c.table(sel.Ti.Schema, sel.Ti.Name, false)
-	c.w.WriteString(`.*) `)
+	c.renderReturning(m)
 }
 
 func (c *compilerContext) renderOneToManyConnectStmt(m qcode.Mutate) {
@@ -387,10 +386,7 @@ func (c *compilerContext) renderOneToOneConnectStmt(m qcode.Mutate) {
 
 	c.w.WriteString(` WHERE `)
 	c.renderExpPath(m.Ti, m.Where.Exp, false, m.Path)
-
-	c.w.WriteString(` RETURNING `)
-	c.table(m.Ti.Schema, m.Ti.Name, false)
-	c.w.WriteString(`.*)`)
+	c.renderReturning(m)
 }
 
 func (c *compilerContext) renderOneToManyDisconnectStmt(m qcode.Mutate) {
@@ -461,10 +457,7 @@ func (c *compilerContext) renderOneToOneDisconnectStmt(m qcode.Mutate) {
 		c.renderExpPath(m.Ti, m.Where.Exp, false, m.Path)
 	}
 	c.w.WriteString(`)`)
-
-	c.w.WriteString(` RETURNING `)
-	c.table(m.Ti.Schema, m.Ti.Name, false)
-	c.w.WriteString(`.*)`)
+	c.renderReturning(m)
 }
 
 func (c *compilerContext) renderOneToManyModifiers(m qcode.Mutate) {
@@ -553,6 +546,12 @@ func (c *compilerContext) renderMutateToRecordSet(m qcode.Mutate, n int) {
 	c.w.WriteString(`)`)
 }
 
+func (c *compilerContext) renderReturning(m qcode.Mutate) {
+	c.w.WriteString(` RETURNING `)
+	c.table(m.Ti.Schema, m.Ti.Name, false)
+	c.w.WriteString(`.*)`)
+}
+
 func (c *compilerContext) renderComma(i int) int {
 	if i != 0 {
 		c.w.WriteString(`, `)

core/internal/psql/update.go

@@ -73,8 +73,5 @@ func (c *compilerContext) renderUpdateStmt(m qcode.Mutate) {
 		}
 		c.w.WriteString(`)`)
 	}
-
-	c.w.WriteString(` RETURNING `)
-	c.table(m.Ti.Schema, m.Ti.Name, false)
-	c.w.WriteString(`.*)`)
+	c.renderReturning(m)
 }

core/internal/sdata/sql/mysql_functions.sql

@@ -6,7 +6,7 @@ SELECT
 	p.ordinal_position	as param_id,
 	COALESCE(p.parameter_name, '') as param_name,
 	p.data_type 		as param_type,
-	p.parameter_mode 	as param_kind
+	COALESCE(p.parameter_mode, '') 	as param_kind
 FROM
 	information_schema.routines r
 RIGHT JOIN 

core/internal/sdata/sql/postgres_functions.sql

@@ -6,7 +6,7 @@ SELECT
 	p.ordinal_position	as param_id,
 	COALESCE(p.parameter_name, '') as param_name,
 	p.data_type 		as param_type,
-	p.parameter_mode 	as param_kind
+	COALESCE(p.parameter_mode, '') 	as param_kind
 FROM
 	information_schema.routines r
 RIGHT JOIN 

examples/nodejs/mysql.js

@@ -0,0 +1,49 @@
+import graphjin from "graphjin";
+import express from "express";
+import http from "http";
+import mysql from "mysql2"
+
+const pool = mysql.createPool({
+    host: 'localhost',
+    port: '/tmp/mysql.sock',
+    user: 'root',
+    database: 'db',
+    waitForConnections: true,
+    connectionLimit: 10,
+    queueLimit: 0
+});
+
+const db = pool.promise();
+const app = express();
+const server = http.createServer(app);
+
+// config can either be a filename (eg. `dev.yml`) or an object
+const config = { 
+    production: false,
+    db_type: "mysql",
+    disable_allow_list: true
+};
+
+const gj = await graphjin("./config", config, db);
+
+
+const res1 = await gj.subscribe(
+    "subscription getUpdatedUser { users(id: $userID) { id email } }", 
+    null,
+    { userID: 2 })
+
+res1.data(function(res) {
+    console.log(">", res.data())
+})
+
+app.get('/', async function(req, resp) {
+    const res2 = await gj.query(
+        "query getUser { users(id: $id) { id email } }", 
+        { id: 1 },
+        { userID: 1 })
+
+    resp.send(res2.data());
+});
+
+server.listen(3000);
+console.log('Express server started on port %s', server.address().port);