Merge pull request #11 from xp-framework/bugfix/sp-return-status

Add support for 0x79 tokens - stored procedure return status

Author: thekid

src/main/php/rdbms/tds/TdsV5Protocol.class.php

@@ -269,6 +269,9 @@ public function query($sql) {
       } else if ("\xE3" === $token) {   // ENVCHANGE, e.g. from "use [db]" queries
         $this->envchange();
         return null;
+      } else if ("\x79" === $token) {   // RETURN_STATUS (eg. from stored procedures), ignore for the moment
+        $this->stream->getLong();
+        $token= $this->stream->getToken();
       } else {
         throw new TdsProtocolException(
           sprintf('Unexpected token 0x%02X', ord($token)),

src/main/php/rdbms/tds/TdsV7Protocol.class.php

@@ -252,6 +252,9 @@ public function query($sql) {
       } else if ("\xE3" === $token) {   // ENVCHANGE, e.g. from "use [db]" queries
         $this->envchange();
         return null;
+      } else if ("\x79" === $token) {   // RETURN_STATUS (eg. from stored procedures), ignore for the moment
+        $this->stream->getLong();
+        $token= $this->stream->getToken();
       } else {
         throw new TdsProtocolException(
           sprintf('Unexpected token 0x%02X', ord($token)),

src/test/php/rdbms/unittest/integration/SybaseIntegrationTest.class.php

@@ -203,4 +203,19 @@ public function repeated_extend_errors() {
     }
     $this->assertEquals([0 => ['working' => 1]], $conn->select('1 as working'));
   }
+
+  #[@test]
+  public function sp_helpconstraint() {
+    $this->assertTrue($this->db()->query('sp_helpconstraint %c', $this->tableName()));
+  }
+
+  #[@test]
+  public function sp_helpconstraint_and_query() {
+    $q= $this->db()->query('
+      sp_helpconstraint %c
+      select 1 as "result"',
+      $this->tableName()
+    );
+    $this->assertEquals(1, $q->next('result'));
+  }
 }