Fix creating the PGUSER at pg_autoctl create postgres time. (#950)

Author: DimCitus

src/bin/pg_autoctl/keeper_pg_init.c

@@ -1011,6 +1011,16 @@ create_database_and_extension(Keeper *keeper)
 		return false;
 	}
 
+	/*
+	 * ensure_postgres_service_is_running reset our connection string to update
+	 * pgSetup cache with new Postgres pid and other information, but we really
+	 * want to make sure we connect with no username still (bootstrap user) and
+	 * to the template1 database.
+	 */
+	strlcpy(initPgSetup.username, "", NAMEDATALEN);
+	strlcpy(initPgSetup.dbname, "template1", NAMEDATALEN);
+	local_postgres_init(&initPostgres, &initPgSetup);
+
 	/*
 	 * If username was set in the setup and doesn't exist we need to create it.
 	 */
@@ -1028,7 +1038,7 @@ create_database_and_extension(Keeper *keeper)
 			return false;
 		}
 
-		if (strcmp(pguser, pgSetup->username) == 0)
+		if (!IS_EMPTY_STRING_BUFFER(pguser))
 		{
 			unsetenv("PGUSER");
 		}
@@ -1048,10 +1058,12 @@ create_database_and_extension(Keeper *keeper)
 		}
 
 		/* reinstall the PGUSER value now that the user has been created. */
-		if (strcmp(pguser, pgSetup->username) == 0)
+		if (!IS_EMPTY_STRING_BUFFER(pguser))
 		{
 			setenv("PGUSER", pguser, 1);
 		}
+
+		log_info("CREATE USER %s", pgSetup->username);
 	}
 
 	/*

src/bin/pg_autoctl/pgsql.c

@@ -2249,7 +2249,7 @@ pgsql_create_user(PGSQL *pgsql, const char *userName, const char *password,
 	if (password)
 	{
 		/* show the statement before we append the password */
-		log_debug("Running command on Postgres: %s PASSWORD '*****';", query->data);
+		log_debug("%s PASSWORD '*****';", query->data);
 
 		escapedIdentifier = PQescapeLiteral(connection, password, strlen(password));
 		if (escapedIdentifier == NULL)
@@ -2267,7 +2267,7 @@ pgsql_create_user(PGSQL *pgsql, const char *userName, const char *password,
 	}
 	else
 	{
-		log_debug("Running command on Postgres: %s;", query->data);
+		log_debug("%s;", query->data);
 	}
 
 	/* memory allocation could have failed while building string */