PHP-118 - Unable to bind list values using global type constants

Author: mpenick

ext/src/Collection.c

@@ -97,7 +97,7 @@ PHP_METHOD(Collection, __construct)
     CassValueType value_type;
     if (!php_driver_value_type(Z_STRVAL_P(type), &value_type TSRMLS_CC))
       return;
-    self->type = php_driver_type_set_from_value_type(value_type TSRMLS_CC);
+    self->type = php_driver_type_collection_from_value_type(value_type TSRMLS_CC);
   } else if (Z_TYPE_P(type) == IS_OBJECT &&
              instanceof_function(Z_OBJCE_P(type), php_driver_type_ce TSRMLS_CC)) {
     if (!php_driver_type_validate(type, "type" TSRMLS_CC)) {

tests/integration/Cassandra/CollectionIntegrationTest.php

@@ -38,14 +38,23 @@ public function testScalarTypes($type, $value) {
      * Data provider for lists with scalar types
      */
     public function collectionWithScalarTypes() {
-        return array_map(function ($cassandraType) {
-            $listType = Type::collection($cassandraType[0]);
-            $list = $listType->create();
-            foreach ($cassandraType[1] as $value) {
-                $list->add($value);
-            }
-            return array($listType, $list);
-        }, $this->scalarCassandraTypes());
+        return array_merge(
+            array_map(function ($cassandraType) {
+                $listType = Type::collection($cassandraType[0]);
+                $list = $listType->create();
+                foreach ($cassandraType[1] as $value) {
+                    $list->add($value);
+                }
+                return array($listType, $list);
+            }, $this->scalarCassandraTypes()),
+            array_map(function ($cassandraType) {
+                $list = new Collection($cassandraType[0]);
+                foreach ($cassandraType[1] as $value) {
+                    $list->add($value);
+                }
+                return array($list->type(), $list);
+            }, $this->constantScalarCassandraTypes())
+        );
     }
 
     /**

tests/integration/Cassandra/DatatypeIntegrationTests.php

@@ -40,6 +40,7 @@ public function scalarCassandraTypes() {
                                           new Duration(-1, 0, -(2 ** 31)),
                                           new Duration((2 ** 31) - 1, 1, 0),
                                           new Duration(-(2 ** 31), -1, 0))),
+            array(Type::int(), array(1, 2, 99)),
             array(Type::float(), array(new Float(1.0), new Float(2.2), new Float(2.2))),
             array(Type::inet(), array(new Inet("127.0.0.1"), new Inet("127.0.0.2"), new Inet("127.0.0.3"))),
             array(Type::smallint(), array(Smallint::min(), Smallint::max(), new Smallint(0), new Smallint(74))),
@@ -56,6 +57,40 @@ public function scalarCassandraTypes() {
         );
     }
 
+    /**
+     * Global constant scalar Cassandra types to be used by data providers
+     */
+    public function constantScalarCassandraTypes() {
+        $constants = array(
+            \Cassandra::TYPE_TEXT,
+            \Cassandra::TYPE_ASCII,
+            \Cassandra::TYPE_VARCHAR,
+            \Cassandra::TYPE_BIGINT,
+            \Cassandra::TYPE_SMALLINT,
+            \Cassandra::TYPE_TINYINT,
+            \Cassandra::TYPE_BLOB,
+            \Cassandra::TYPE_BOOLEAN,
+            \Cassandra::TYPE_DECIMAL,
+            \Cassandra::TYPE_DOUBLE,
+            \Cassandra::TYPE_FLOAT,
+            \Cassandra::TYPE_INT,
+            \Cassandra::TYPE_TIMESTAMP,
+            \Cassandra::TYPE_UUID,
+            \Cassandra::TYPE_VARINT,
+            \Cassandra::TYPE_TIMEUUID,
+            \Cassandra::TYPE_INET
+        );
+        $scalarCassandraTypes = $this->scalarCassandraTypes();
+
+        return array_map(function($type) use ($scalarCassandraTypes) {
+            $match = array_filter($scalarCassandraTypes, function($item) use ($type) {
+                return (string)$item[0] === $type;
+            });
+            assert(isset($match) && count($match) > 0);
+            return array($type, current($match)[1]);
+        }, $constants);
+    }
+
     /**
      * Create a table using $type for the value's type and insert $value using
      * positional parameters.

tests/integration/Cassandra/MapIntegrationTest.php

@@ -67,7 +67,16 @@ function($cassandraType) {
             return array($mapType, $map);
         }, $this->scalarCassandraTypes());
 
-        return array_merge($mapKeyTypes, $mapValueTypes);
+        $mapConstantScalarTypes = array_map(function ($cassandraType) {
+            $map = new Map($cassandraType[0], $cassandraType[0]);
+            $values = $cassandraType[1];
+            for ($i = 0; $i < count($cassandraType[1]); $i++) {
+                $map->set($values[$i], $values[$i]);
+            }
+            return array($map->type(), $map);
+        }, $this->constantScalarCassandraTypes());
+
+        return array_merge($mapKeyTypes, $mapValueTypes, $mapConstantScalarTypes);
     }
 
     /**

tests/integration/Cassandra/SetIntegrationTest.php

@@ -47,14 +47,23 @@ function($cassandraType) {
             }
         );
 
-        return array_map(function ($cassandraType) {
-            $setType = Type::set($cassandraType[0]);
-            $set = $setType->create();
-            foreach ($cassandraType[1] as $value) {
-                $set->add($value);
-            }
-            return array($setType, $set);
-        }, $scalarCassandraTypes);
+        return array_merge(
+            array_map(function ($cassandraType) {
+                $setType = Type::set($cassandraType[0]);
+                $set = $setType->create();
+                foreach ($cassandraType[1] as $value) {
+                    $set->add($value);
+                }
+                return array($setType, $set);
+            }, $scalarCassandraTypes),
+            array_map(function ($cassandraType) {
+                $set = new Set($cassandraType[0]);
+                foreach ($cassandraType[1] as $value) {
+                    $set->add($value);
+                }
+                return array($set->type(), $set);
+            }, $this->constantScalarCassandraTypes())
+        );
     }
 
     /**