Skip to content

Commit

Permalink
temp change
Browse files Browse the repository at this point in the history
  • Loading branch information
@lohia-shalini
lohia-shalini committed Sep 23, 2024
1 parent f039e22 commit 1c6763e
Show file tree
Hide file tree
Showing 4 changed files with 59 additions and 61 deletions.
90 changes: 45 additions & 45 deletions contrib/babelfishpg_tsql/src/dbcmds.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,11 @@ gen_createdb_subcmds(const char *dbname, const char *owner,
Node *stmt;
int i = 0;
int expected_stmt_num;
const char *schema;
const char *dbo;
const char *db_owner;
const char *guest;
const char *guest_schema;
char *schema;
char *dbo;
char *db_owner;
char *guest;
char *guest_schema;

schema = get_dbo_schema_name(dbname);
dbo = get_dbo_role_name(dbname);
Expand Down Expand Up @@ -198,11 +198,11 @@ gen_createdb_subcmds(const char *dbname, const char *owner,
static void
add_fixed_user_roles_to_bbf_authid_user_ext(const char *dbname)
{
const char *dbo;
const char *db_owner;
const char *guest;
const char *db_datareader;
const char *db_datawriter;
char *dbo;
char *db_owner;
char *guest;
const char *db_datareader;
const char *db_datawriter;

dbo = get_dbo_role_name(dbname);
db_owner = get_db_owner_name(dbname);
Expand Down Expand Up @@ -231,18 +231,18 @@ add_fixed_user_roles_to_bbf_authid_user_ext(const char *dbname)
static List *
gen_dropdb_subcmds(const char *dbname, List *db_users)
{
StringInfoData query;
List *stmt_list;
ListCell *elem;
Node *stmt;
int expected_stmts = 8;
int i = 0;
const char *dbo;
const char *db_owner;
const char *db_datareader;
const char *db_datawriter;
const char *schema;
const char *guest_schema;
StringInfoData query;
List *stmt_list;
ListCell *elem;
Node *stmt;
int expected_stmts = 8;
int i = 0;
char *dbo;
char *db_owner;
const char *db_datareader;
const char *db_datawriter;
char *schema;
char *guest_schema;

dbo = get_dbo_role_name(dbname);
db_owner = get_db_owner_name(dbname);
Expand Down Expand Up @@ -461,28 +461,28 @@ check_database_collation_name(const char *database_collation_name)

static void
create_bbf_db_internal(ParseState *pstate, const char *dbname, List *options, const char *owner, int16 dbid)
{
int16 old_dbid;
char *old_dbname;
Oid datdba;
Datum *new_record;
bool *new_record_nulls;
Relation sysdatabase_rel;
HeapTuple tuple;
List *parsetree_list;
ListCell *parsetree_item;
const char *dbo_role;
const char *db_datareader;
const char *db_datawriter;
NameData default_collation;
NameData owner_namedata;
int stmt_number = 0;
int save_sec_context;
bool is_set_userid = false;
Oid save_userid;
const char *old_createrole_self_grant;
ListCell *option;
const char *database_collation_name = NULL;
{
int16 old_dbid;
char *old_dbname;
Oid datdba;
Datum *new_record;
bool *new_record_nulls;
Relation sysdatabase_rel;
HeapTuple tuple;
List *parsetree_list;
ListCell *parsetree_item;
char *dbo_role = NULL;
const char *db_datareader;
const char *db_datawriter;
NameData default_collation;
NameData owner_namedata;
int stmt_number = 0;
int save_sec_context;
bool is_set_userid = false;
Oid save_userid;
const char *old_createrole_self_grant;
ListCell *option;
const char *database_collation_name = NULL;

/* Check options */
foreach(option, options)
Expand Down Expand Up @@ -1286,7 +1286,7 @@ grant_permissions_to_datareader_datawriter(const uint16 dbid,
ListCell *parsetree_item;
//int schema_owner_id;
//char *schema_owner;
const char *dbo_role;
char *dbo_role;
//bool more_alter_query = false;

datum = heap_getattr(tuple, Anum_namespace_ext_namespace, namespace_rel_descr, &isNull);
Expand Down
6 changes: 4 additions & 2 deletions contrib/babelfishpg_tsql/src/multidb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1215,7 +1215,9 @@ get_physical_user_name_by_mode(char *db_name, char *user_name, bool suppress_err
(strlen(db_name) != 4 || (strncmp(db_name, "msdb", 4) != 0)))
{
if ((strlen(user_name) == 3 && strncmp(user_name, "dbo", 3) == 0) ||
(strlen(user_name) == 8 && strncmp(user_name, "db_owner", 8) == 0))
(strlen(user_name) == 8 && strncmp(user_name, "db_owner", 8) == 0) ||
(strlen(user_name) == 13 && strncmp(user_name, "db_datareader", 13) == 0) ||
(strlen(user_name) == 13 && strncmp(user_name, "db_datawriter", 13) == 0))
{
return new_user_name;
}
Expand Down Expand Up @@ -1368,7 +1370,7 @@ get_physical_user_name(char *db_name, char *user_name, bool suppress_db_error, b
{
if (((strlen(user_name) == 3 && strncmp(user_name, "dbo", 3) == 0) ||
(strlen(user_name) == 8 && strncmp(user_name, "db_owner", 8) == 0) ||
(strlen(user_name) == 13 && strncmp(user_name, "db_datareader", 13) == 0) ||
(strlen(user_name) == 13 && strncmp(user_name, "db_datareader", 13) == 0) ||
(strlen(user_name) == 13 && strncmp(user_name, "db_datawriter", 13) == 0))
&& (suppress_role_error || user_exists_for_db(db_name, new_user_name)))
{
Expand Down
2 changes: 1 addition & 1 deletion contrib/babelfishpg_tsql/src/pl_handler.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4025,7 +4025,7 @@ bbf_ProcessUtility(PlannedStmt *pstmt,
Assert(list_length(grant->objects) == 1);
if (grant->objtype == OBJECT_SCHEMA)
break;
else if (grant->objtype == OBJECT_TABLE && strcmp("(CREATE LOGICAL DATABASE )", queryString) != 0)
else if (grant->objtype == OBJECT_TABLE && strcmp("(CREATE LOGICAL DATABASE )", queryString) != 0 && strcmp(queryString, "(CREATE DATABASE ROLES) ") != 0)
{
/*
* Ignore GRANT statements that are executed implicitly as a part of
Expand Down
22 changes: 9 additions & 13 deletions contrib/babelfishpg_tsql/src/pltsql_utils.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,14 +185,10 @@ pltsql_createFunction(ParseState *pstate, PlannedStmt *pstmt, const char *queryS
if (strcmp(defel->defname, "language") == 0)
{
if (language_item)
{
ereport(WARNING,
(errmsg("error in pltsql_createFunction")));
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
errmsg("conflicting or redundant options"),
parser_errposition(pstate, defel->location)));
}
language_item = defel;
}
}
Expand Down Expand Up @@ -2422,15 +2418,15 @@ void
exec_database_roles_subcmds(const char *schema)
{
StringInfoData query;
const char *db_datareader;
const char *db_datawriter;
const char *dbo_role;
const char *dbname = get_cur_db_name();
List *stmt_list;
int expected_stmts = 4;
ListCell *parsetree_item;
Node *stmts;
int i=0;
const char *db_datareader;
const char *db_datawriter;
char *dbo_role;
const char *dbname = get_cur_db_name();
List *stmt_list;
int expected_stmts = 4;
ListCell *parsetree_item;
Node *stmts;
int i=0;


db_datareader = get_db_datareader_name(dbname);
Expand Down

0 comments on commit 1c6763e

Please sign in to comment.