codeimmortal
diff --git a/‎lib/client.js
+10-14 b/‎lib/client.js
+10-14
@@ -354,29 +354,25 @@ Client.prototype._pulseQueryQueue = function () {
   }
 };
 
-Client.prototype.copyFrom = function (text) {
-  throw new Error("For PostgreSQL COPY TO/COPY FROM support npm install pg-copy-streams");
-};
-
-Client.prototype.copyTo = function (text) {
-  throw new Error("For PostgreSQL COPY TO/COPY FROM support npm install pg-copy-streams");
-};
-
-const DeprecatedQuery = require('./utils').deprecateEventEmitter(Query)
-
 Client.prototype.query = function (config, values, callback) {
   //can take in strings, config object or query object
   var query;
   var result;
   if (typeof config.submit == 'function') {
-    query = config
-    result = query
+    result = query = config
     if (typeof values == 'function') {
       query.callback = query.callback || values
     }
   } else {
-    query = new DeprecatedQuery(config, values, callback)
-    result = query
+    query = new Query(config, values, callback)
+    if (!query.callback) {
+      let resolve, reject;
+      result = new Promise((res, rej) => {
+        resolve = res
+        reject = rej
+      })
+      query.callback = (err, res) => err ? reject(err) : resolve(res)
+    }
   }
 
   if (this.binary && !query.binary) {