Skip to content

CASSJAVA-103: Quoting column identifiers in DefaultCreateIndex #2056

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 4.x
Choose a base branch
from
+34 −2
Open

CASSJAVA-103: Quoting column identifiers in DefaultCreateIndex #2056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...rc/main/java/com/datastax/oss/driver/internal/querybuilder/schema/DefaultCreateIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,9 @@ public String asCql() {
builder.append(",");
}
if (entry.getValue().equals(NO_INDEX_TYPE)) {
builder.append(entry.getKey());
builder.append(entry.getKey().asCql(true));
} else {
builder.append(entry.getValue()).append("(").append(entry.getKey()).append(")");
builder.append(entry.getValue()).append("(").append(entry.getKey().asCql(true)).append(")");
}
}
builder.append(")");
Expand Down
12 changes: 12 additions & 0 deletions ...uilder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/CreateIndexTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.createIndex;

import com.datastax.oss.driver.api.core.CqlIdentifier;
import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap;
import org.junit.Test;

Expand Down Expand Up @@ -82,6 +83,17 @@ public void should_generate_create_index_with_name_if_not_exists() {
.hasCql("CREATE INDEX IF NOT EXISTS bar ON x (y)");
}

@Test
public void should_generate_create_index_with_correct_quoting() {
assertThat(createIndex("bAr").onTable("xY").andColumn("aB"))
.hasCql("CREATE INDEX bar ON xy (ab)");
assertThat(
createIndex(CqlIdentifier.fromInternal("bAr"))
.onTable(CqlIdentifier.fromInternal("xY"))
.andColumn(CqlIdentifier.fromInternal("aB")))
.hasCql("CREATE INDEX \"bAr\" ON \"xY\" (\"aB\")");
}

@Test
public void should_generate_create_index_values() {
assertThat(createIndex().onTable("x").andColumnValues("m"))
Expand Down
20 changes: 20 additions & 0 deletions ...uilder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/CreateTableTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.createTable;
import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.udt;

import com.datastax.oss.driver.api.core.CqlIdentifier;
import com.datastax.oss.driver.api.core.metadata.schema.ClusteringOrder;
import com.datastax.oss.driver.api.core.type.DataTypes;
import com.datastax.oss.driver.api.querybuilder.SchemaBuilder;
Expand All @@ -44,6 +45,25 @@ public void should_generate_create_table_if_not_exists() {
.hasCql("CREATE TABLE IF NOT EXISTS bar (k int PRIMARY KEY)");
}

@Test
public void should_generate_create_table_with_correct_quoting() {
assertThat(
createTable("bAr")
.withPartitionKey("kY", DataTypes.INT)
.withClusteringColumn("xZ", DataTypes.INT)
.withStaticColumn("sT", DataTypes.TEXT)
.withColumn("cL", DataTypes.BLOB))
.hasCql("CREATE TABLE bar (ky int,xz int,st text STATIC,cl blob,PRIMARY KEY(ky,xz))");
assertThat(
createTable(CqlIdentifier.fromInternal("bAr"))
.withPartitionKey(CqlIdentifier.fromInternal("kY"), DataTypes.INT)
.withClusteringColumn(CqlIdentifier.fromInternal("xZ"), DataTypes.INT)
.withStaticColumn(CqlIdentifier.fromInternal("sT"), DataTypes.TEXT)
.withColumn(CqlIdentifier.fromInternal("cL"), DataTypes.BLOB))
.hasCql(
"CREATE TABLE \"bAr\" (\"kY\" int,\"xZ\" int,\"sT\" text STATIC,\"cL\" blob,PRIMARY KEY(\"kY\",\"xZ\"))");
}

@Test
public void should_generate_create_table_with_single_partition_key() {
assertThat(
Expand Down