pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 05:21:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Repository Generator] Add int64/bigint support, add support for reserved words (#1439)

Browse Source
This commit is contained in:
Chris Miles 2021-07-08 11:43:35 -05:00 committed by GitHub
parent ab89fe13b4
commit b68607a6ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 76 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
utils/scripts/generators/repository-generator.pl
View File

@ -188,10 +188,11 @@ foreach my $table_to_generate (@tables) {
my $longest_data_type_length = 0; my $longest_data_type_length = 0;
while (my @row = $ex->fetchrow_array()) { while (my @row = $ex->fetchrow_array()) {
my $column_name = $row[0]; my $column_name = $row[0];
my $column_name_formatted = format_column_name_for_cpp_var($column_name);
my $data_type = $row[2]; my $data_type = $row[2];
if ($longest_column_length < length($column_name)) { if ($longest_column_length < length($column_name_formatted)) {
$longest_column_length = length($column_name); $longest_column_length = length($column_name_formatted);
} }
my $struct_data_type = translate_mysql_data_type_to_c($data_type); my $struct_data_type = translate_mysql_data_type_to_c($data_type);
@ -217,6 +218,7 @@ foreach my $table_to_generate (@tables) {
while (my @row = $ex->fetchrow_array()) { while (my @row = $ex->fetchrow_array()) {
my $column_name = $row[0]; my $column_name = $row[0];
my $column_name_formatted = format_column_name_for_cpp_var($column_name);
my $table_name = $row[1]; my $table_name = $row[1];
my $data_type = $row[2]; my $data_type = $row[2];
my $column_type = $row[3]; my $column_type = $row[3];
@ -226,13 +228,18 @@ foreach my $table_to_generate (@tables) {
my $extra = ($row[7] ? $row[7] : ""); my $extra = ($row[7] ? $row[7] : "");
if (!$table_primary_key{$table_name}) { if (!$table_primary_key{$table_name}) {
if (($column_key eq "PRI" && $data_type =~/int/) || ($ordinal_position == 0 && $column_name =~ /id/i)) { if (($column_key eq "PRI" && $data_type =~ /int/) || ($ordinal_position == 0 && $column_name =~ /id/i)) {
$table_primary_key{$table_name} = $column_name; $table_primary_key{$table_name} = $column_name;
} }
} }
print $column_default . "\n";
my $default_value = 0; my $default_value = 0;
if ($column_default ne "NULL" && $column_default ne "") { if ($column_default eq "current_timestamp()") {
$default_value = '""';
}
elsif ($column_default ne "NULL" && $column_default ne "") {
$column_default =~ s/'/"/g; $column_default =~ s/'/"/g;
$default_value = $column_default; $default_value = $column_default;
} }
@ -246,19 +253,19 @@ foreach my $table_to_generate (@tables) {
my $struct_data_type = translate_mysql_data_type_to_c($data_type); my $struct_data_type = translate_mysql_data_type_to_c($data_type);
# struct # struct
$table_struct_columns .= sprintf("\t\t\%-${longest_data_type_length}s %s;\n", $struct_data_type, $column_name); $table_struct_columns .= sprintf("\t\t\%-${longest_data_type_length}s %s;\n", $struct_data_type, $column_name_formatted);
# new entity # new entity
$default_entries .= sprintf("\t\tentry.%-${longest_column_length}s = %s;\n", $column_name, $default_value); $default_entries .= sprintf("\t\tentry.%-${longest_column_length}s = %s;\n", $column_name_formatted, $default_value);
# column names (string) # column names (string)
$column_names_quoted .= sprintf("\t\t\t\"%s\",\n", $column_name); $column_names_quoted .= sprintf("\t\t\t\"%s\",\n", format_column_name_for_mysql($column_name));
# update one # update one
if ($extra ne "auto_increment") { if ($extra ne "auto_increment") {
my $query_value = sprintf('\'" + EscapeString(%s_entry.%s) + "\'");', $table_name, $column_name); my $query_value = sprintf('\'" + EscapeString(%s_entry.%s) + "\'");', $table_name, $column_name_formatted);
if ($data_type =~ /int|float|double|decimal/) { if ($data_type =~ /int|float|double|decimal/) {
$query_value = sprintf('" + std::to_string(%s_entry.%s));', $table_name, $column_name); $query_value = sprintf('" + std::to_string(%s_entry.%s));', $table_name, $column_name_formatted);
} }
$update_one_entries .= sprintf( $update_one_entries .= sprintf(
@ -269,26 +276,30 @@ foreach my $table_to_generate (@tables) {
} }
# insert # insert
my $value = sprintf("\"'\" + EscapeString(%s_entry.%s) + \"'\"", $table_name, $column_name); my $value = sprintf("\"'\" + EscapeString(%s_entry.%s) + \"'\"", $table_name, $column_name_formatted);
if ($data_type =~ /int|float|double|decimal/) { if ($data_type =~ /int|float|double|decimal/) {
$value = sprintf('std::to_string(%s_entry.%s)', $table_name, $column_name); $value = sprintf('std::to_string(%s_entry.%s)', $table_name, $column_name_formatted);
} }
$insert_one_entries .= sprintf("\t\tinsert_values.push_back(%s);\n", $value); $insert_one_entries .= sprintf("\t\tinsert_values.push_back(%s);\n", $value);
$insert_many_entries .= sprintf("\t\t\tinsert_values.push_back(%s);\n", $value); $insert_many_entries .= sprintf("\t\t\tinsert_values.push_back(%s);\n", $value);
# find one / all (select) # find one / all (select)
if ($data_type =~ /int/) { if ($data_type =~ /bigint/) {
$all_entries .= sprintf("\t\t\tentry.%-${longest_column_length}s = atoi(row[%s]);\n", $column_name, $index); $all_entries .= sprintf("\t\t\tentry.%-${longest_column_length}s = strtoll(row[%s], NULL, 10);\n", $column_name_formatted, $index);
$find_one_entries .= sprintf("\t\t\tentry.%-${longest_column_length}s = atoi(row[%s]);\n", $column_name, $index); $find_one_entries .= sprintf("\t\t\tentry.%-${longest_column_length}s = strtoll(row[%s], NULL, 10);\n", $column_name_formatted, $index);
}
elsif ($data_type =~ /int/) {
$all_entries .= sprintf("\t\t\tentry.%-${longest_column_length}s = atoi(row[%s]);\n", $column_name_formatted, $index);
$find_one_entries .= sprintf("\t\t\tentry.%-${longest_column_length}s = atoi(row[%s]);\n", $column_name_formatted, $index);
} }
elsif ($data_type =~ /float|double|decimal/) { elsif ($data_type =~ /float|double|decimal/) {
$all_entries .= sprintf("\t\t\tentry.%-${longest_column_length}s = static_cast<float>(atof(row[%s]));\n", $column_name, $index); $all_entries .= sprintf("\t\t\tentry.%-${longest_column_length}s = static_cast<float>(atof(row[%s]));\n", $column_name_formatted, $index);
$find_one_entries .= sprintf("\t\t\tentry.%-${longest_column_length}s = static_cast<float>(atof(row[%s]));\n", $column_name, $index); $find_one_entries .= sprintf("\t\t\tentry.%-${longest_column_length}s = static_cast<float>(atof(row[%s]));\n", $column_name_formatted, $index);
} }
else { else {
$all_entries .= sprintf("\t\t\tentry.%-${longest_column_length}s = row[%s] ? row[%s] : \"\";\n", $column_name, $index, $index); $all_entries .= sprintf("\t\t\tentry.%-${longest_column_length}s = row[%s] ? row[%s] : \"\";\n", $column_name_formatted, $index, $index);
$find_one_entries .= sprintf("\t\t\tentry.%-${longest_column_length}s = row[%s] ? row[%s] : \"\";\n", $column_name, $index, $index); $find_one_entries .= sprintf("\t\t\tentry.%-${longest_column_length}s = row[%s] ? row[%s] : \"\";\n", $column_name_formatted, $index, $index);
} }
# print $column_name . "\n"; # print $column_name . "\n";
@ -468,8 +479,7 @@ sub translate_mysql_data_type_to_c {
$struct_data_type = 'int'; $struct_data_type = 'int';
} }
elsif ($mysql_data_type =~ /bigint/) { elsif ($mysql_data_type =~ /bigint/) {
$struct_data_type = 'int'; $struct_data_type = 'int64';
# Use regular int for now until we have 64 support
} }
elsif ($mysql_data_type =~ /int/) { elsif ($mysql_data_type =~ /int/) {
$struct_data_type = 'int'; $struct_data_type = 'int';
@ -480,3 +490,34 @@ sub translate_mysql_data_type_to_c {
return $struct_data_type; return $struct_data_type;
} }
# This is so we can change reserved words on the cpp side to something that will continue be functional in the compilers
sub get_reserved_cpp_variable_names {
return (
"class",
"int"
);
}
sub format_column_name_for_cpp_var {
my $column_name = $_[0];
for my $word (get_reserved_cpp_variable_names()) {
if ($word eq $column_name) {
return $column_name . "_";
}
}
return $column_name;
}
sub format_column_name_for_mysql {
my $column_name = $_[0];
for my $word (get_reserved_cpp_variable_names()) {
if ($word eq $column_name) {
return "`" . $column_name . "`";
}
}
return $column_name;
}