From 0dca3e6aaa9f011eaddf7a1701e4d3e63a7179ae Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@vmware.com>
Date: Mon, 4 Jul 2022 08:59:50 +0200
Subject: [PATCH] Properly render table name as CQL during index creation.

We now use the proper CQL representation applying quoting if necessary when creating indexes. Previously, we just used the plain toString format of the CQL identifier that didn't quote the table name.

Closes #1281.
---
 .../core/cql/generator/CreateIndexCqlGenerator.java |  2 +-
 .../generator/CreateIndexCqlGeneratorUnitTests.java | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/CreateIndexCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/CreateIndexCqlGenerator.java
index be3ce1e0a..2d8643333 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/CreateIndexCqlGenerator.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/CreateIndexCqlGenerator.java
@@ -51,7 +51,7 @@ public class CreateIndexCqlGenerator extends IndexNameCqlGenerator<CreateIndexSp
 			cql.append(" ").append(spec().getName().asCql(true));
 		}
 
-		cql.append(" ON ").append(spec().getTableName()).append(" (");
+		cql.append(" ON ").append(spec().getTableName().asCql(true)).append(" (");
 
 		if (spec().getColumnFunction() != ColumnFunction.NONE) {
 			cql.append(spec().getColumnFunction().name()).append("(").append(spec().getColumnName().asCql(true)).append(")");
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/CreateIndexCqlGeneratorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/CreateIndexCqlGeneratorUnitTests.java
index a9ea1e3b5..69cd188eb 100755
--- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/CreateIndexCqlGeneratorUnitTests.java
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/CreateIndexCqlGeneratorUnitTests.java
@@ -18,8 +18,11 @@ package org.springframework.data.cassandra.core.cql.generator;
 import static org.assertj.core.api.Assertions.*;
 
 import org.junit.jupiter.api.Test;
+
 import org.springframework.data.cassandra.core.cql.keyspace.CreateIndexSpecification;
 
+import com.datastax.oss.driver.api.core.CqlIdentifier;
+
 /**
  * Unit tests for {@link CreateIndexCqlGenerator}.
  *
@@ -75,4 +78,14 @@ class CreateIndexCqlGeneratorUnitTests {
 		assertThat(CreateIndexCqlGenerator.toCql(spec))
 				.isEqualTo("CREATE INDEX ON mytable (column) WITH OPTIONS = {'foo': 'b''a''r', 'type': 'PREFIX'};");
 	}
+
+	@Test // GH-1281
+	void createIndexWithQuotation() {
+
+		CreateIndexSpecification spec = CreateIndexSpecification.createIndex("order_dob").columnName("\"order\"")
+				.tableName(CqlIdentifier.fromInternal("order"));
+
+		assertThat(CreateIndexCqlGenerator.toCql(spec)).isEqualTo("CREATE INDEX order_dob ON \"order\" (\"order\");");
+
+	}
 }