RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 13:57:35 +00:00
Code Issues Activity Actions

Everywhere: Rename to_{string => deprecated_string}() where applicable

Browse source 
This will make it easier to support both string types at the same time
while we convert code, and tracking down remaining uses.

One big exception is Value::to_string() in LibJS, where the name is
dictated by the ToString AO.
This commit is contained in:
Linus Groh 2022-12-06 01:12:49 +00:00 • committed by Andreas Kling
parent 6e19ab2bbc
commit 57dc179b1f
597 changed files with 1973 additions and 1972 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Tests/LibSQL/TestSqlDatabase.cpp
View file

@ -69,7 +69,7 @@ void verify_table_contents(SQL::Database& db, int expected_count)
for (auto& row : rows_or_error.value()) {
StringBuilder builder;
builder.appendff("Test{}", row["IntColumn"].to_int().value());
EXPECT_EQ(row["TextColumn"].to_string(), builder.build());
EXPECT_EQ(row["TextColumn"].to_deprecated_string(), builder.build());
count++;
sum += row["IntColumn"].to_int().value();
}

2
Tests/LibSQL/TestSqlExpressionParser.cpp
View file

@ -39,7 +39,7 @@ ParseResult parse(StringView sql)
auto expression = parser.parse();
if (parser.has_errors()) {
return parser.errors()[0].to_string();
return parser.errors()[0].to_deprecated_string();
}
return expression;

46
Tests/LibSQL/TestSqlStatementExecution.cpp
View file

@ -27,7 +27,7 @@ SQL::ResultOr<SQL::ResultSet> try_execute(NonnullRefPtr<SQL::Database> database,
auto statement = parser.next_statement();
EXPECT(!parser.has_errors());
if (parser.has_errors())
outln("{}", parser.errors()[0].to_string());
outln("{}", parser.errors()[0].to_deprecated_string());
return statement->execute(move(database));
}
@ -98,7 +98,7 @@ TEST_CASE(insert_into_table)
auto rows_or_error = database->select_all(*table);
EXPECT(!rows_or_error.is_error());
for (auto& row : rows_or_error.value()) {
EXPECT_EQ(row["TEXTCOLUMN"].to_string(), "Test");
EXPECT_EQ(row["TEXTCOLUMN"].to_deprecated_string(), "Test");
EXPECT_EQ(row["INTCOLUMN"].to_int().value(), 42);
count++;
}
@ -325,8 +325,8 @@ TEST_CASE(select_inner_join)
EXPECT_EQ(result.size(), 1u);
EXPECT_EQ(result[0].row.size(), 3u);
EXPECT_EQ(result[0].row[0].to_int().value(), 42);
EXPECT_EQ(result[0].row[1].to_string(), "Test_1");
EXPECT_EQ(result[0].row[2].to_string(), "Test_12");
EXPECT_EQ(result[0].row[1].to_deprecated_string(), "Test_1");
EXPECT_EQ(result[0].row[2].to_deprecated_string(), "Test_12");
}
TEST_CASE(select_with_like)
@ -412,11 +412,11 @@ TEST_CASE(select_with_order)
result = execute(database, "SELECT TextColumn, IntColumn FROM TestSchema.TestTable ORDER BY TextColumn;");
EXPECT_EQ(result.size(), 5u);
EXPECT_EQ(result[0].row[0].to_string(), "Test_1");
EXPECT_EQ(result[1].row[0].to_string(), "Test_2");
EXPECT_EQ(result[2].row[0].to_string(), "Test_3");
EXPECT_EQ(result[3].row[0].to_string(), "Test_4");
EXPECT_EQ(result[4].row[0].to_string(), "Test_5");
EXPECT_EQ(result[0].row[0].to_deprecated_string(), "Test_1");
EXPECT_EQ(result[1].row[0].to_deprecated_string(), "Test_2");
EXPECT_EQ(result[2].row[0].to_deprecated_string(), "Test_3");
EXPECT_EQ(result[3].row[0].to_deprecated_string(), "Test_4");
EXPECT_EQ(result[4].row[0].to_deprecated_string(), "Test_5");
}
TEST_CASE(select_with_regexp)
@ -487,15 +487,15 @@ TEST_CASE(select_with_order_two_columns)
result = execute(database, "SELECT TextColumn, IntColumn FROM TestSchema.TestTable ORDER BY TextColumn, IntColumn;");
EXPECT_EQ(result.size(), 5u);
EXPECT_EQ(result[0].row[0].to_string(), "Test_1");
EXPECT_EQ(result[0].row[0].to_deprecated_string(), "Test_1");
EXPECT_EQ(result[0].row[1].to_int().value(), 47);
EXPECT_EQ(result[1].row[0].to_string(), "Test_2");
EXPECT_EQ(result[1].row[0].to_deprecated_string(), "Test_2");
EXPECT_EQ(result[1].row[1].to_int().value(), 40);
EXPECT_EQ(result[2].row[0].to_string(), "Test_2");
EXPECT_EQ(result[2].row[0].to_deprecated_string(), "Test_2");
EXPECT_EQ(result[2].row[1].to_int().value(), 42);
EXPECT_EQ(result[3].row[0].to_string(), "Test_4");
EXPECT_EQ(result[3].row[0].to_deprecated_string(), "Test_4");
EXPECT_EQ(result[3].row[1].to_int().value(), 41);
EXPECT_EQ(result[4].row[0].to_string(), "Test_5");
EXPECT_EQ(result[4].row[0].to_deprecated_string(), "Test_5");
EXPECT_EQ(result[4].row[1].to_int().value(), 44);
}
@ -516,11 +516,11 @@ TEST_CASE(select_with_order_by_column_not_in_result)
result = execute(database, "SELECT TextColumn FROM TestSchema.TestTable ORDER BY IntColumn;");
EXPECT_EQ(result.size(), 5u);
EXPECT_EQ(result[0].row[0].to_string(), "Test_3");
EXPECT_EQ(result[1].row[0].to_string(), "Test_4");
EXPECT_EQ(result[2].row[0].to_string(), "Test_2");
EXPECT_EQ(result[3].row[0].to_string(), "Test_5");
EXPECT_EQ(result[4].row[0].to_string(), "Test_1");
EXPECT_EQ(result[0].row[0].to_deprecated_string(), "Test_3");
EXPECT_EQ(result[1].row[0].to_deprecated_string(), "Test_4");
EXPECT_EQ(result[2].row[0].to_deprecated_string(), "Test_2");
EXPECT_EQ(result[3].row[0].to_deprecated_string(), "Test_5");
EXPECT_EQ(result[4].row[0].to_deprecated_string(), "Test_1");
}
TEST_CASE(select_with_limit)
@ -618,11 +618,11 @@ TEST_CASE(describe_table)
auto result = execute(database, "DESCRIBE TABLE TestSchema.TestTable;");
EXPECT_EQ(result.size(), 2u);
EXPECT_EQ(result[0].row[0].to_string(), "TEXTCOLUMN");
EXPECT_EQ(result[0].row[1].to_string(), "text");
EXPECT_EQ(result[0].row[0].to_deprecated_string(), "TEXTCOLUMN");
EXPECT_EQ(result[0].row[1].to_deprecated_string(), "text");
EXPECT_EQ(result[1].row[0].to_string(), "INTCOLUMN");
EXPECT_EQ(result[1].row[1].to_string(), "int");
EXPECT_EQ(result[1].row[0].to_deprecated_string(), "INTCOLUMN");
EXPECT_EQ(result[1].row[1].to_deprecated_string(), "int");
}
TEST_CASE(binary_operator_execution)

2
Tests/LibSQL/TestSqlStatementParser.cpp
View file

@ -27,7 +27,7 @@ ParseResult parse(StringView sql)
auto statement = parser.next_statement();
if (parser.has_errors()) {
return parser.errors()[0].to_string();
return parser.errors()[0].to_deprecated_string();
}
return statement;

24
Tests/LibSQL/TestSqlValueAndTuple.cpp
View file

@ -17,7 +17,7 @@ TEST_CASE(null_value)
{
SQL::Value v(SQL::SQLType::Null);
EXPECT_EQ(v.type(), SQL::SQLType::Null);
EXPECT_EQ(v.to_string(), "(null)"sv);
EXPECT_EQ(v.to_deprecated_string(), "(null)"sv);
EXPECT(!v.to_bool().has_value());
EXPECT(!v.to_int().has_value());
EXPECT(!v.to_u32().has_value());
@ -44,25 +44,25 @@ TEST_CASE(text_value)
v = "Test"sv;
EXPECT_EQ(v.type(), SQL::SQLType::Text);
EXPECT_EQ(v.to_string(), "Test"sv);
EXPECT_EQ(v.to_deprecated_string(), "Test"sv);
}
{
SQL::Value v(DeprecatedString("String Test"sv));
EXPECT_EQ(v.type(), SQL::SQLType::Text);
EXPECT_EQ(v.to_string(), "String Test"sv);
EXPECT_EQ(v.to_deprecated_string(), "String Test"sv);
v = DeprecatedString("String Test 2"sv);
EXPECT_EQ(v.type(), SQL::SQLType::Text);
EXPECT_EQ(v.to_string(), "String Test 2"sv);
EXPECT_EQ(v.to_deprecated_string(), "String Test 2"sv);
}
{
SQL::Value v("const char * Test");
EXPECT_EQ(v.type(), SQL::SQLType::Text);
EXPECT_EQ(v.to_string(), "const char * Test"sv);
EXPECT_EQ(v.to_deprecated_string(), "const char * Test"sv);
v = "const char * Test 2";
EXPECT_EQ(v.type(), SQL::SQLType::Text);
EXPECT_EQ(v.to_string(), "const char * Test 2"sv);
EXPECT_EQ(v.to_deprecated_string(), "const char * Test 2"sv);
}
}
@ -149,7 +149,7 @@ TEST_CASE(integer_value)
EXPECT(v.to_int().has_value());
EXPECT_EQ(v.to_int().value(), 42);
EXPECT_EQ(v.to_string(), "42"sv);
EXPECT_EQ(v.to_deprecated_string(), "42"sv);
EXPECT(v.to_double().has_value());
EXPECT((v.to_double().value() - 42.0) < NumericLimits<double>().epsilon());
@ -215,7 +215,7 @@ TEST_CASE(float_value)
EXPECT(v.to_int().has_value());
EXPECT_EQ(v.to_int().value(), 3);
EXPECT_EQ(v.to_string(), "3.14");
EXPECT_EQ(v.to_deprecated_string(), "3.14");
EXPECT(v.to_bool().has_value());
EXPECT(v.to_bool().value());
@ -228,7 +228,7 @@ TEST_CASE(float_value)
EXPECT(v.to_int().has_value());
EXPECT_EQ(v.to_int().value(), 0);
EXPECT_EQ(v.to_string(), "0"sv);
EXPECT_EQ(v.to_deprecated_string(), "0"sv);
EXPECT(v.to_bool().has_value());
EXPECT(!v.to_bool().value());
@ -307,7 +307,7 @@ TEST_CASE(bool_value)
EXPECT(v.to_int().has_value());
EXPECT_EQ(v.to_int().value(), 1);
EXPECT_EQ(v.to_string(), "true"sv);
EXPECT_EQ(v.to_deprecated_string(), "true"sv);
EXPECT(v.to_double().has_value());
EXPECT((v.to_double().value() - 1.0) < NumericLimits<double>().epsilon());
@ -321,7 +321,7 @@ TEST_CASE(bool_value)
EXPECT(v.to_int().has_value());
EXPECT_EQ(v.to_int().value(), 0);
EXPECT_EQ(v.to_string(), "false"sv);
EXPECT_EQ(v.to_deprecated_string(), "false"sv);
EXPECT(v.to_double().has_value());
EXPECT(v.to_double().value() < NumericLimits<double>().epsilon());
@ -335,7 +335,7 @@ TEST_CASE(bool_value)
EXPECT(v.to_int().has_value());
EXPECT_EQ(v.to_int().value(), 1);
EXPECT_EQ(v.to_string(), "true"sv);
EXPECT_EQ(v.to_deprecated_string(), "true"sv);
EXPECT(v.to_double().has_value());
EXPECT((v.to_double().value() - 1.0) < NumericLimits<double>().epsilon());