minor changes

Author: mayurkale22

third_party/datastax/proxy/proxy.go

@@ -1514,10 +1514,10 @@ func (c *client) handleQuery(raw *frame.RawFrame, msg *partialQuery) {
 		}
 	} else {
 		var result *message.RowsResult
-
+		var isQuery = true
 		switch queryType {
 		case selectType:
-			queryMetadata, err := c.proxy.translator.ToSpannerSelect(c.keyspace, msg.query, true)
+			queryMetadata, err := c.proxy.translator.ToSpannerSelect(c.keyspace, msg.query, isQuery)
 			if err != nil {
 				c.proxy.logger.Error(translatorErrorMessage, zap.String(Query, msg.query), zap.Error(err))
 				c.sender.Send(raw.Header, &message.Invalid{ErrorMessage: err.Error()})
@@ -1594,7 +1594,7 @@ func (c *client) handleQuery(raw *frame.RawFrame, msg *partialQuery) {
 
 			c.sender.Send(raw.Header, result)
 		case deleteType:
-			queryMetadata, err := c.proxy.translator.ToSpannerDelete(c.keyspace, msg.query, true)
+			queryMetadata, err := c.proxy.translator.ToSpannerDelete(c.keyspace, msg.query, isQuery)
 			if err != nil {
 				c.proxy.logger.Error(translatorErrorMessage, zap.String(Query, msg.query), zap.Error(err))
 				c.sender.Send(raw.Header, &message.Invalid{ErrorMessage: err.Error()})
@@ -1633,7 +1633,7 @@ func (c *client) handleQuery(raw *frame.RawFrame, msg *partialQuery) {
 			result.Metadata.ColumnCount = int32(len(VariableMetadata))
 			c.sender.Send(raw.Header, result)
 		case updateType:
-			queryMetadata, err := c.proxy.translator.ToSpannerUpdate(c.keyspace, msg.query, true)
+			queryMetadata, err := c.proxy.translator.ToSpannerUpdate(c.keyspace, msg.query, isQuery)
 			if err != nil {
 				c.proxy.logger.Error(translatorErrorMessage, zap.String(Query, msg.query), zap.Error(err))
 				c.sender.Send(raw.Header, &message.Invalid{ErrorMessage: err.Error()})

translator/utils.go

@@ -490,7 +490,7 @@ func parseWhereByClause(input cql.IWhereSpecContext, tableName string, tableConf
 				}
 
 				if isQuery && value == "'?'" {
-					params[placeholder] = "?"
+					params[placeholder] = questionMark
 				} else {
 					value = strings.ReplaceAll(value, "'", "")
 					if value != questionMark {

translator/utils_test.go

@@ -907,7 +907,7 @@ func TestParseWhereByClause(t *testing.T) {
 			expectedErr: nil,
 		},
 		{
-			name:      "Valid input with question mark",
+			name:      "Valid input with question mark in quotes",
 			input:     "WHERE column1 = '?'",
 			tableName: "test_table",
 			keyspace:  "key_space",
@@ -927,6 +927,25 @@ func TestParseWhereByClause(t *testing.T) {
 			},
 			expectedErr: nil,
 		},
+		{
+			name:      "Valid input with question mark",
+			input:     "WHERE column1 = ?",
+			tableName: "test_table",
+			keyspace:  "key_space",
+			expectedResult: &ClauseResponse{
+				Clauses: []Clause{
+					{
+						Column:       "column1",
+						Operator:     "=",
+						Value:        "@value1",
+						IsPrimaryKey: true,
+					},
+				},
+				Params:    map[string]interface{}{},
+				ParamKeys: []string{"value1"},
+			},
+			expectedErr: nil,
+		},
 		{
 			name:      "Valid input with multiple clauses",
 			input:     "WHERE column1 = 'test' AND column2 < '0x0000000000000003'",