Skip to content

Commit 9aa0741

Browse files
mikeferomikefero
committed
Simplifying column scenario and updating filter tags for documentation
1 parent a1f8187 commit 9aa0741

File tree

5 files changed

+50
-57
lines changed

5 files changed

+50
-57
lines changed

‎behat.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ default:
44
suites:
55
default:
66
filters:
7-
tags: "~@cassandra-version-1.2&&[email protected]&&~@cassandra-version-less-2.1"
7+
tags: "~@cassandra-version-less-2.1&&~@cassandra-version-only-2.0"
88
contexts:
99
- FeatureContext:
1010
cluster_name: php-driver-2.1-cluster
@@ -16,7 +16,7 @@ cassandra-version-2.0:
1616
suites:
1717
default:
1818
filters:
19-
tags: "~@cassandra-version-1.2&&[email protected]&&[email protected]"
19+
tags: "~@cassandra-version-2.1"
2020
contexts:
2121
- FeatureContext:
2222
cluster_name: php-driver-2.0-cluster
@@ -28,7 +28,7 @@ cassandra-version-1.2:
2828
suites:
2929
default:
3030
filters:
31-
tags: "[email protected]&&[email protected]&&~@cassandra-version-greater-1.2&&~@cassandra-version-greater-2.0"
31+
tags: "[email protected]&&[email protected]&&~@cassandra-version-only-2.0"
3232
contexts:
3333
- FeatureContext:
3434
cluster_name: php-driver-1.2-cluster

‎features/batch_statements.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@cassandra-version-greater-1.2
1+
@cassandra-version-2.0
22
Feature: Batch statements
33

44
PHP Driver supports batch statements. There are three types of batch statements:

‎features/result_paging.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@cassandra-version-greater-1.2
1+
@cassandra-version-2.0
22
Feature: Result paging
33

44
Starting with Cassandra native protocol v2 (used by Apache Cassandra 2.0),

‎features/schema_metadata.feature

Lines changed: 44 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ Feature: Schema Metadata
144144
Replicate on Write: False
145145
"""
146146

147-
@cassandra-version-2.0
147+
@cassandra-version-only-2.0
148148
Scenario: Additional table metadata will only exist for Cassandra versions
149149
2.0
150150
Given the following example:
@@ -167,7 +167,7 @@ Feature: Schema Metadata
167167
Index Interval: 512
168168
"""
169169

170-
@cassandra-version-greater-1.2
170+
@cassandra-version-2.0
171171
Scenario: Additional table metadata will only exist for Cassandra versions
172172
2.0+
173173
Given the following example:
@@ -196,7 +196,7 @@ Feature: Schema Metadata
196196
Speculative Retry: 10
197197
"""
198198

199-
@cassandra-version-greater-2.0
199+
@cassandra-version-2.1
200200
Scenario: Additional table metadata will only exist for Cassandra versions
201201
2.1+
202202
Given the following example:
@@ -222,7 +222,7 @@ Feature: Schema Metadata
222222
Minimum Index Interval: 4
223223
"""
224224

225-
@cassandra-version-greater-1.2
225+
@cassandra-version-2.0
226226
Scenario: Data types can be determined by the column metadata for Cassandra
227227
versions 2.0+
228228
Given the following example:
@@ -233,47 +233,44 @@ Feature: Schema Metadata
233233
->build();
234234
$session = $cluster->connect("simplex");
235235
$schema = $session->schema();
236-
$id = $schema->keyspace("simplex")->table("values")->column("id");
237-
$bigint = $schema->keyspace("simplex")->table("values")->column("bigint_value");
238-
$decimal = $schema->keyspace("simplex")->table("values")->column("decimal_value");
239-
$double = $schema->keyspace("simplex")->table("values")->column("double_value");
240-
$float = $schema->keyspace("simplex")->table("values")->column("float_value");
241-
$int = $schema->keyspace("simplex")->table("values")->column("int_value");
242-
$varint = $schema->keyspace("simplex")->table("values")->column("varint_value");
243-
$ascii = $schema->keyspace("simplex")->table("values")->column("ascii_value");
244-
$text = $schema->keyspace("simplex")->table("values")->column("text_value");
245-
$varchar = $schema->keyspace("simplex")->table("values")->column("varchar_value");
246-
$timestamp = $schema->keyspace("simplex")->table("values")->column("timestamp_value");
247-
$blob = $schema->keyspace("simplex")->table("values")->column("blob_value");
248-
$uuid = $schema->keyspace("simplex")->table("values")->column("uuid_value");
249-
$timeuuid = $schema->keyspace("simplex")->table("values")->column("timeuuid_value");
250-
$inet = $schema->keyspace("simplex")->table("values")->column("inet_value");
251-
$list = $schema->keyspace("simplex")->table("values")->column("list_value");
252-
$map = $schema->keyspace("simplex")->table("values")->column("map_value");
253-
$set = $schema->keyspace("simplex")->table("values")->column("set_value");
236+
$table = $schema->keyspace("simplex")->table("values");
237+
$id = $table->column("id")->type();
238+
$bigint = $table->column("bigint_value")->type();
239+
$decimal = $table->column("decimal_value")->type();
240+
$double = $table->column("double_value")->type();
241+
$float = $table->column("float_value")->type();
242+
$int = $table->column("int_value")->type();
243+
$varint = $table->column("varint_value")->type();
244+
$ascii = $table->column("ascii_value")->type();
245+
$text = $table->column("text_value")->type();
246+
$varchar = $table->column("varchar_value")->type();
247+
$timestamp = $table->column("timestamp_value")->type();
248+
$blob = $table->column("blob_value")->type();
249+
$uuid = $table->column("uuid_value")->type();
250+
$timeuuid = $table->column("timeuuid_value")->type();
251+
$inet = $table->column("inet_value")->type();
252+
$list = $table->column("list_value")->type();
253+
$map = $table->column("map_value")->type();
254+
$set = $table->column("set_value")->type();
254255
255-
echo $id->type()->name() . "\n";
256-
echo $bigint->type()->name() . "\n";
257-
echo $decimal->type()->name() . "\n";
258-
echo $double->type()->name() . "\n";
259-
echo $float->type()->name() . "\n";
260-
echo $int->type()->name() . "\n";
261-
echo $varint->type()->name() . "\n";
262-
echo $ascii->type()->name() . "\n";
263-
echo $text->type()->name() . "\n";
264-
echo $varchar->type()->name() . "\n";
265-
echo $timestamp->type()->name() . "\n";
266-
echo $blob->type()->name() . "\n";
267-
echo $uuid->type()->name() . "\n";
268-
echo $timeuuid->type()->name() . "\n";
269-
echo $inet->type()->name() . "\n";
270-
echo $list->type()->name() . "\n";
271-
echo $list->type()->type()->name() . "\n";
272-
echo $map->type()->name() . "\n";
273-
echo $map->type()->keyType()->name() . "\n";
274-
echo $map->type()->valueType()->name() . "\n";
275-
echo $set->type()->name() . "\n";
276-
echo $set->type()->type()->name() . "\n";
256+
echo $id . "\n";
257+
echo $bigint . "\n";
258+
echo $decimal . "\n";
259+
echo $double . "\n";
260+
echo $float . "\n";
261+
echo $int . "\n";
262+
echo $varint . "\n";
263+
echo $ascii . "\n";
264+
echo $text . "\n";
265+
echo $varchar . "\n";
266+
echo $timestamp . "\n";
267+
echo $blob . "\n";
268+
echo $uuid . "\n";
269+
echo $timeuuid . "\n";
270+
echo $inet . "\n";
271+
echo $list . "\n";
272+
echo $map . "\n";
273+
echo $set . "\n";
277274
"""
278275
When it is executed
279276
Then its output should contain:
@@ -293,11 +290,7 @@ Feature: Schema Metadata
293290
uuid
294291
timeuuid
295292
inet
296-
list
297-
varchar
298-
map
299-
timestamp
300-
double
301-
set
302-
float
293+
list<varchar>
294+
map<timestamp, double>
295+
set<float>
303296
"""

‎features/simple_statements.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Feature: Simple Statements
3939
Result contains 0 rows
4040
"""
4141

42-
@cassandra-version-greater-1.2
42+
@cassandra-version-2.0
4343
Scenario: Simple statements only support positional arguments
4444
Given the following example:
4545
"""php

0 commit comments

Comments
 (0)