Move types to won namespace

porsager · porsager · commit b29863441cec · 2019-12-09T15:35:51.000+01:00
diff --git a/lib/index.js b/lib/index.js
@@ -268,6 +268,7 @@ export default function Postgres(url, options) {
 
   function addTypes(sql, connection) {
     Object.assign(sql, {
+      types: {},
       notify,
       unsafe,
       array,
@@ -313,7 +314,7 @@ export default function Postgres(url, options) {
       if (name in sql)
         throw errors.generic({ message: name + ' is a reserved method name', code: 'RESERVED_METHOD_NAME' })
 
-      sql[name] = (x) => ({ type: type.to, value: x })
+      sql.types[name] = (x) => ({ type: type.to, value: x })
     })
   }
 
diff --git a/tests/index.js b/tests/index.js
@@ -228,7 +228,7 @@ t('Point type', async() => {
   })
 
   await sql`create table test (x point)`
-  await sql`insert into test (x) values (${ sql.point([10, 20]) })`
+  await sql`insert into test (x) values (${ sql.types.point([10, 20]) })`
   return [20, (await sql`select x from test`)[0].x[1]]
 }, () => sql`drop table test`)
 
@@ -246,7 +246,7 @@ t('Point type array', async() => {
   })
 
   await sql`create table test (x point[])`
-  await sql`insert into test (x) values (${ sql.array([sql.point([10, 20]), sql.point([20, 30])]) })`
+  await sql`insert into test (x) values (${ sql.array([sql.types.point([10, 20]), sql.types.point([20, 30])]) })`
   return [30, (await sql`select x from test`)[0].x[1][1]]
 }, () => sql`drop table test`)
 
