add identity and lock

[m6w6/pq-gateway] / lib / pq / Query / Writer.php

diff --git a/lib/pq/Query/Writer.php b/lib/pq/Query/Writer.php
index fd5e51aab692e42ec3995869b9321e863a645053..b5f3ab2176d8d9fe4d0999060fc01ee206bc30d2 100644 (file)
--- a/lib/pq/Query/Writer.php
+++ b/lib/pq/Query/Writer.php
@@ -48,7 +48,13 @@ class Writer implements WriterInterface
         * @return string
         */
        protected function reduce($q, $v) {
-               return $q . " " . (is_array($v) ? implode(", ", $v) : $v);
+               if (is_array($v)) {
+                       $v = implode(", ", $v);
+               }
+               if (strlen($q)) {
+                       $q .= " ";
+               }
+               return $q . $v;
        }
 
        /**
@@ -83,6 +89,9 @@ class Writer implements WriterInterface
         * @return \pq\Query\Writer
         */
        function write() {
+               if (strlen($this->query)) {
+                       $this->query .= " ";
+               }
                $this->query .= array_reduce(func_get_args(), array($this, "reduce"));
                return $this;
        }
@@ -94,7 +103,7 @@ class Writer implements WriterInterface
         * @return string
         */
        function param($param, $type = null) {
-               if ($param instanceof \pq\Gateway\Cell) {
+               if ($param instanceof ExpressibleInterface) {
                        $param = $param->get();
                }
                if ($param instanceof Expr) {
@@ -132,13 +141,4 @@ class Writer implements WriterInterface
                }
                return $this;
        }
-
-       /**
-        * Execute the query through \pq\Connection::execParams($this, $this->params, $this->types)
-        * @param \pq\Connection $c
-        * @return \pq\Result
-        */
-       function exec(\pq\Connection $c) {
-               return $c->execParams($this, $this->getParams(), $this->getTypes());
-       }
 }