external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes review notes

pull/7253/head
gindibay 2023-11-27 22:23:38 +03:00
parent 455620cead
commit 0c25b72a17
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/distributed/commands/database.c
View File

@ -45,7 +45,7 @@
/* /*
* DatabaseCollationInfo is used to store collation related information of a database * DatabaseCollationInfo is used to store collation related information of a database.
*/ */
typedef struct DatabaseCollationInfo typedef struct DatabaseCollationInfo
{ {
@ -205,7 +205,7 @@ PreprocessGrantOnDatabaseStmt(Node *node, const char *queryString,
* true if the statement is a SET TABLESPACE statement, false otherwise. * true if the statement is a SET TABLESPACE statement, false otherwise.
*/ */
static bool static bool
isSetTablespaceStatement(AlterDatabaseStmt *stmt) IsSetTablespaceStatement(AlterDatabaseStmt *stmt)
{ {
DefElem *def = NULL; DefElem *def = NULL;
foreach_ptr(def, stmt->options) foreach_ptr(def, stmt->options)
@ -245,7 +245,7 @@ PreprocessAlterDatabaseStmt(Node *node, const char *queryString,
sql, sql,
ENABLE_DDL_PROPAGATION); ENABLE_DDL_PROPAGATION);
if (isSetTablespaceStatement(stmt)) if (IsSetTablespaceStatement(stmt))
{ {
/* /*
* Set tablespace does not work inside a transaction.Therefore, we need to use * Set tablespace does not work inside a transaction.Therefore, we need to use

9
src/backend/distributed/deparser/deparse_database_stmts.c
View File

@ -38,7 +38,7 @@ static void AppendBasicAlterDatabaseOptions(StringInfo buf, DefElem *def, bool *
static void AppendGrantDatabases(StringInfo buf, GrantStmt *stmt); static void AppendGrantDatabases(StringInfo buf, GrantStmt *stmt);
static void AppendAlterDatabaseSetTablespace(StringInfo buf, DefElem *def, char *dbname); static void AppendAlterDatabaseSetTablespace(StringInfo buf, DefElem *def, char *dbname);
const DefElemOptionFormat create_database_option_formats[] = { const DefElemOptionFormat createDatabaseOptionFormats[] = {
{ "owner", " OWNER %s", OPTION_FORMAT_STRING }, { "owner", " OWNER %s", OPTION_FORMAT_STRING },
{ "template", " TEMPLATE %s", OPTION_FORMAT_STRING }, { "template", " TEMPLATE %s", OPTION_FORMAT_STRING },
{ "encoding", " ENCODING %s", OPTION_FORMAT_LITERAL_CSTR }, { "encoding", " ENCODING %s", OPTION_FORMAT_LITERAL_CSTR },
@ -53,8 +53,7 @@ const DefElemOptionFormat create_database_option_formats[] = {
{ "tablespace", " TABLESPACE %s", OPTION_FORMAT_STRING }, { "tablespace", " TABLESPACE %s", OPTION_FORMAT_STRING },
{ "allow_connections", " ALLOW_CONNECTIONS %s", OPTION_FORMAT_BOOLEAN }, { "allow_connections", " ALLOW_CONNECTIONS %s", OPTION_FORMAT_BOOLEAN },
{ "connection_limit", " CONNECTION LIMIT %d", OPTION_FORMAT_INTEGER }, { "connection_limit", " CONNECTION LIMIT %d", OPTION_FORMAT_INTEGER },
{ "is_template", " IS_TEMPLATE %s", OPTION_FORMAT_BOOLEAN }, { "is_template", " IS_TEMPLATE %s", OPTION_FORMAT_BOOLEAN }
{ "oid", " OID %d", OPTION_FORMAT_OBJECT_ID }
}; };
@ -333,8 +332,8 @@ AppendCreateDatabaseStmt(StringInfo buf, CreatedbStmt *stmt)
DefElem *option = NULL; DefElem *option = NULL;
foreach_ptr(option, stmt->options) foreach_ptr(option, stmt->options)
{ {
DefElemOptionToStatement(buf, option, create_database_option_formats, DefElemOptionToStatement(buf, option, createDatabaseOptionFormats,
lengthof(create_database_option_formats)); lengthof(createDatabaseOptionFormats));
} }
} }