tests: fix SQL and case sensitive cases

The feature will be introduced in Tarantool 3.0 [1]. 1. tarantool/tarantool#9249
tarantool · Oct 25, 2023 · ffd518d · ffd518d
1 parent b6e8aba
commit ffd518d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -68,6 +68,7 @@ Versioning](http://semver.org/spec/v2.0.0.html) except to the first release.
 - Incorrect options (`vshard_router`, `fields`, `bucket_id`, `mode`,
   `prefer_replica`, `balance`) setup for crud.GetRequest (#335)
 - Tests with crud 1.4.0 (#336)
+- Tests with case sensitive SQL (#341)
 
 ## [1.12.0] - 2023-06-07
 

diff --git a/settings/tarantool_test.go b/settings/tarantool_test.go
@@ -117,7 +117,7 @@ func TestSQLDefaultEngineSetting(t *testing.T) {
 	require.Equal(t, []interface{}{[]interface{}{"sql_default_engine", "vinyl"}}, resp.Data)
 
 	// Create a space with "CREATE TABLE".
-	exec := tarantool.NewExecuteRequest("CREATE TABLE t1_vinyl(a INT PRIMARY KEY, b INT, c INT);")
+	exec := tarantool.NewExecuteRequest("CREATE TABLE T1_VINYL(a INT PRIMARY KEY, b INT, c INT);")
 	resp, err = conn.Do(exec).Get()
 	require.Nil(t, err)
 	require.NotNil(t, resp)
@@ -143,7 +143,7 @@ func TestSQLDefaultEngineSetting(t *testing.T) {
 	require.Equal(t, []interface{}{[]interface{}{"sql_default_engine", "memtx"}}, resp.Data)
 
 	// Create a space with "CREATE TABLE".
-	exec = tarantool.NewExecuteRequest("CREATE TABLE t2_memtx(a INT PRIMARY KEY, b INT, c INT);")
+	exec = tarantool.NewExecuteRequest("CREATE TABLE T2_MEMTX(a INT PRIMARY KEY, b INT, c INT);")
 	resp, err = conn.Do(exec).Get()
 	require.Nil(t, err)
 	require.NotNil(t, resp)
@@ -241,14 +241,14 @@ func TestSQLFullColumnNamesSetting(t *testing.T) {
 	defer conn.Close()
 
 	// Create a space.
-	exec := tarantool.NewExecuteRequest("CREATE TABLE fkname(id INT PRIMARY KEY, x INT);")
+	exec := tarantool.NewExecuteRequest("CREATE TABLE FKNAME(ID INT PRIMARY KEY, X INT);")
 	resp, err = conn.Do(exec).Get()
 	require.Nil(t, err)
 	require.NotNil(t, resp)
 	require.Equal(t, uint64(1), resp.SQLInfo.AffectedCount)
 
 	// Fill it with some data.
-	exec = tarantool.NewExecuteRequest("INSERT INTO fkname VALUES (1, 1);")
+	exec = tarantool.NewExecuteRequest("INSERT INTO FKNAME VALUES (1, 1);")
 	resp, err = conn.Do(exec).Get()
 	require.Nil(t, err)
 	require.NotNil(t, resp)
@@ -267,7 +267,7 @@ func TestSQLFullColumnNamesSetting(t *testing.T) {
 	require.Equal(t, []interface{}{[]interface{}{"sql_full_column_names", false}}, resp.Data)
 
 	// Get a data with short column names in metadata.
-	exec = tarantool.NewExecuteRequest("SELECT x FROM fkname WHERE id = 1;")
+	exec = tarantool.NewExecuteRequest("SELECT X FROM FKNAME WHERE ID = 1;")
 	resp, err = conn.Do(exec).Get()
 	require.Nil(t, err)
 	require.NotNil(t, resp)
@@ -286,7 +286,7 @@ func TestSQLFullColumnNamesSetting(t *testing.T) {
 	require.Equal(t, []interface{}{[]interface{}{"sql_full_column_names", true}}, resp.Data)
 
 	// Get a data with full column names in metadata.
-	exec = tarantool.NewExecuteRequest("SELECT x FROM fkname WHERE id = 1;")
+	exec = tarantool.NewExecuteRequest("SELECT X FROM FKNAME WHERE ID = 1;")
 	resp, err = conn.Do(exec).Get()
 	require.Nil(t, err)
 	require.NotNil(t, resp)

diff --git a/tarantool_test.go b/tarantool_test.go
@@ -1336,18 +1336,18 @@ func TestClientSessionPush(t *testing.T) {
 }
 
 const (
-	createTableQuery = "CREATE TABLE SQL_SPACE (id STRING PRIMARY KEY, name " +
+	createTableQuery = "CREATE TABLE SQL_SPACE (ID STRING PRIMARY KEY, NAME " +
 		"STRING COLLATE \"unicode\" DEFAULT NULL);"
 	insertQuery              = "INSERT INTO SQL_SPACE VALUES (?, ?);"
-	selectNamedQuery         = "SELECT id, name FROM SQL_SPACE WHERE id=:id AND name=:name;"
-	selectPosQuery           = "SELECT id, name FROM SQL_SPACE WHERE id=? AND name=?;"
-	updateQuery              = "UPDATE SQL_SPACE SET name=? WHERE id=?;"
+	selectNamedQuery         = "SELECT ID, NAME FROM SQL_SPACE WHERE ID=:ID AND NAME=:NAME;"
+	selectPosQuery           = "SELECT ID, NAME FROM SQL_SPACE WHERE ID=? AND NAME=?;"
+	updateQuery              = "UPDATE SQL_SPACE SET NAME=? WHERE ID=?;"
 	enableFullMetaDataQuery  = "SET SESSION \"sql_full_metadata\" = true;"
-	selectSpanDifQueryNew    = "SELECT id||id, name, id FROM seqscan SQL_SPACE WHERE name=?;"
-	selectSpanDifQueryOld    = "SELECT id||id, name, id FROM SQL_SPACE WHERE name=?;"
+	selectSpanDifQueryNew    = "SELECT ID||ID, NAME, ID FROM seqscan SQL_SPACE WHERE NAME=?;"
+	selectSpanDifQueryOld    = "SELECT ID||ID, NAME, ID FROM SQL_SPACE WHERE NAME=?;"
 	alterTableQuery          = "ALTER TABLE SQL_SPACE RENAME TO SQL_SPACE2;"
 	insertIncrQuery          = "INSERT INTO SQL_SPACE2 VALUES (?, ?);"
-	deleteQuery              = "DELETE FROM SQL_SPACE2 WHERE name=?;"
+	deleteQuery              = "DELETE FROM SQL_SPACE2 WHERE NAME=?;"
 	dropQuery                = "DROP TABLE SQL_SPACE2;"
 	dropQuery2               = "DROP TABLE SQL_SPACE;"
 	disableFullMetaDataQuery = "SET SESSION \"sql_full_metadata\" = false;"
@@ -1396,8 +1396,8 @@ func TestSQL(t *testing.T) {
 		{
 			selectNamedQuery,
 			map[string]interface{}{
-				"id":   "1",
-				"name": "test",
+				"ID":   "1",
+				"NAME": "test",
 			},
 			Response{
 				SQLInfo: SQLInfo{AffectedCount: 0},
@@ -1448,22 +1448,22 @@ func TestSQL(t *testing.T) {
 						FieldName:            "COLUMN_1",
 						FieldIsNullable:      false,
 						FieldIsAutoincrement: false,
-						FieldSpan:            "id||id",
+						FieldSpan:            "ID||ID",
 					},
 					{
 						FieldType:            "string",
 						FieldName:            "NAME",
 						FieldIsNullable:      true,
 						FieldIsAutoincrement: false,
-						FieldSpan:            "name",
+						FieldSpan:            "NAME",
 						FieldCollation:       "unicode",
 					},
 					{
 						FieldType:            "string",
 						FieldName:            "ID",
 						FieldIsNullable:      false,
 						FieldIsAutoincrement: false,
-						FieldSpan:            "id",
+						FieldSpan:            "ID",
 						FieldCollation:       "",
 					},
 				}},