Fix file stream

porsager · porsager · commit de0070a67fcd · 2019-11-28T11:25:31.000+01:00
diff --git a/cjs/package.json b/cjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "peegee",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "Fastest full featured PostgreSQL client for Node.js",
   "main": "lib/index.js",
   "type": "commonjs",
diff --git a/lib/index.js b/lib/index.js
@@ -135,12 +135,10 @@ export default function Postgres(url, options) {
     }
   }
 
-  function query({ raw, simple }, connection, xs, args) {
-    if (!raw && (!Array.isArray(xs) || !Array.isArray(xs.raw)))
+  function query(query, connection, xs, args) {
+    if (!query.raw && (!Array.isArray(xs) || !Array.isArray(xs.raw)))
       throw errors.generic({ message: 'Query not called as a tagged template literal', code: 'NOT_TAGGED_CALL' })
 
-    const query = { raw, simple }
-
     const promise = new Promise((resolve, reject) => {
       query.resolve = resolve
       query.reject = reject
@@ -291,15 +289,18 @@ export default function Postgres(url, options) {
       if (typeof file === 'string')
         return query({ raw: true, simple: true }, connection || getConnection(), files[path])
 
-      const promise = (file || new Promise((resolve, reject) => fs.readFile(path, 'utf8', (err, str) => {
-        if (err)
-          return reject(err)
+      const q = { raw: true, simple: true }
+      const promise = (file || (files[path] = new Promise((resolve, reject) => {
+        fs.readFile(path, 'utf8', (err, str) => {
+          if (err)
+            return reject(err)
+
+          files[path] = str
+          resolve(str)
+        })
+      }))).then((str) => query(q, connection || getConnection(), str))
 
-        files[path] = str
-        const q = query({ raw: true, simple: true }, connection || getConnection(), files[path])
-        promise.stream = q.stream
-        resolve(q)
-      })))
+      promise.stream = fn => (q.stream = fn, promise)
 
       return promise
     }
diff --git a/tests/index.js b/tests/index.js
@@ -238,6 +238,14 @@ t('sql file', async() =>
   [1, (await sql.file('./select.sql'))[0].x]
 )
 
+t('sql file can stream', async() => {
+  let result
+  await sql.file('./select.sql')
+    .stream(({ x }) => result = x)
+
+  return [1, result]
+})
+
 t('sql file throws', async() =>
   ['ENOENT', (await sql.file('./selectomondo.sql').catch(x => x.code))]
 )
diff --git a/tests/test.js b/tests/test.js
@@ -25,7 +25,6 @@ async function test(o, name, fn, after) {
       process.stdout.write('✅')
     })
     .catch(err => {
-      p('errorrrr')
       tests[line].failed = true
       tests[line].error = err instanceof Error ? err : new Error(util.inspect(err))
     })

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "peegee",`
`3`		`- "version": "0.0.7",`
	`3`	`+ "version": "0.0.8",`
`4`	`4`	`"description": "Fastest full featured PostgreSQL client for Node.js",`
`5`	`5`	`"main": "lib/index.js",`
`6`	`6`	`"type": "commonjs",`
Original file line number	Diff line number	Diff line change
`@@ -238,6 +238,14 @@ t('sql file', async() =>`
`238`	`238`	`[1, (await sql.file('./select.sql'))[0].x]`
`239`	`239`	`)`
`240`	`240`
	`241`	`+t('sql file can stream', async() => {`
	`242`	`+ let result`
	`243`	`+ await sql.file('./select.sql')`
	`244`	`+ .stream(({ x }) => result = x)`
	`245`	`+`
	`246`	`+ return [1, result]`
	`247`	`+})`
	`248`	`+`
`241`	`249`	`t('sql file throws', async() =>`
`242`	`250`	`['ENOENT', (await sql.file('./selectomondo.sql').catch(x => x.code))]`
`243`	`251`	`)`