Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add leading and trailing quotation marks in DataDir and filename to allow spaces in DbDir #31

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add leading and trailing quotation marks in DataDir and filename to allow spaces in DbDir #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
101 changes: 94 additions & 7 deletions src/MysticMind.PostgresEmbed.Tests/PgServer_Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ public class PgServerTests
public void create_server_and_table_test()
{
using var server = new PgServer(

"15.3.0",
addLocalUserAccessPermission: AddLocalUserAccessPermission,
clearInstanceDirOnStop:true);
clearInstanceDirOnStop: true);
server.Start();

// Note: set pooling to false to prevent connecting issues
// https://github.com/npgsql/npgsql/issues/939
var connStr = string.Format(ConnStr, server.PgPort, PgUser);
Expand Down Expand Up @@ -61,7 +61,7 @@ public void create_server_and_pass_server_params()

using var server = new PgServer(
"15.3.0",
pgServerParams: serverParams,
pgServerParams: serverParams,
addLocalUserAccessPermission: AddLocalUserAccessPermission,
clearInstanceDirOnStop: true);
server.Start();
Expand Down Expand Up @@ -89,7 +89,7 @@ public void create_server_without_using_block()
clearInstanceDirOnStop: true);

try
{
{
server.Start();
var connStr = string.Format(ConnStr, server.PgPort, PgUser);
var conn = new Npgsql.NpgsqlConnection(connStr);
Expand Down Expand Up @@ -118,7 +118,7 @@ public void create_server_with_postgis_extension_test()
"https://download.osgeo.org/postgis/windows/pg15/archive/postgis-bundle-pg15-3.3.3x64.zip"
)
};

using var server = new PgServer(
"15.3.0",
pgExtensions: extensions,
Expand Down Expand Up @@ -198,7 +198,7 @@ public void create_server_with_existing_instance_id_and_table_test()
"15.3.0",
addLocalUserAccessPermission: AddLocalUserAccessPermission,
instanceId: instanceId,
clearInstanceDirOnStop:true
clearInstanceDirOnStop: true
)
)
{
Expand Down Expand Up @@ -231,4 +231,91 @@ public void create_server_without_version_suffix()
cmd.ExecuteNonQuery();
conn.Close();
}

[SkippableFact]
public void create_server_with_spaces_in_db_dir()
{
Skip.IfNot(RuntimeInformation.IsOSPlatform(OSPlatform.Windows), "Test supported only on Windows");

var pathWithSpaces = Path.Combine(Directory.GetCurrentDirectory(), "folder with spaces");
if (!Directory.Exists(pathWithSpaces)) Directory.CreateDirectory(pathWithSpaces);

using var server = new PgServer(
"15.3.0",
dbDir: pathWithSpaces,
addLocalUserAccessPermission: AddLocalUserAccessPermission,
clearInstanceDirOnStop: true);
server.Start();

// Note: set pooling to false to prevent connecting issues
// https://github.com/npgsql/npgsql/issues/939
var connStr = string.Format(ConnStr, server.PgPort, PgUser);
var conn = new Npgsql.NpgsqlConnection(connStr);
var cmd =
new Npgsql.NpgsqlCommand(
"CREATE TABLE table1(ID CHAR(256) CONSTRAINT id PRIMARY KEY, Title CHAR)",
conn);

conn.Open();
cmd.ExecuteNonQuery();
conn.Close();
}

[SkippableFact]
public void create_server_with_spaces_in_db_dir_with_local_user_perm()
{
Skip.IfNot(RuntimeInformation.IsOSPlatform(OSPlatform.Windows), "Test supported only on Windows");

var pathWithSpaces = Path.Combine(Directory.GetCurrentDirectory(), "folder with spaces");
if (!Directory.Exists(pathWithSpaces)) Directory.CreateDirectory(pathWithSpaces);

using var server = new PgServer(
"15.3.0",
dbDir: pathWithSpaces,
addLocalUserAccessPermission: true,
clearInstanceDirOnStop: true);
server.Start();

// Note: set pooling to false to prevent connecting issues
// https://github.com/npgsql/npgsql/issues/939
var connStr = string.Format(ConnStr, server.PgPort, PgUser);
var conn = new Npgsql.NpgsqlConnection(connStr);
var cmd =
new Npgsql.NpgsqlCommand(
"CREATE TABLE table1(ID CHAR(256) CONSTRAINT id PRIMARY KEY, Title CHAR)",
conn);

conn.Open();
cmd.ExecuteNonQuery();
conn.Close();
}

[SkippableFact]
public void create_server_with_spaces_in_db_dir_parent_dir()
{
Skip.IfNot(RuntimeInformation.IsOSPlatform(OSPlatform.Windows), "Test supported only on Windows");

var pathWithSpaces = Path.Combine(Directory.GetCurrentDirectory(), "folder with spaces", "folder");
if (!Directory.Exists(pathWithSpaces)) Directory.CreateDirectory(pathWithSpaces);

using var server = new PgServer(
"15.3.0",
dbDir: pathWithSpaces,
addLocalUserAccessPermission: true,
clearInstanceDirOnStop: true);
server.Start();

// Note: set pooling to false to prevent connecting issues
// https://github.com/npgsql/npgsql/issues/939
var connStr = string.Format(ConnStr, server.PgPort, PgUser);
var conn = new Npgsql.NpgsqlConnection(connStr);
var cmd =
new Npgsql.NpgsqlCommand(
"CREATE TABLE table1(ID CHAR(256) CONSTRAINT id PRIMARY KEY, Title CHAR)",
conn);

conn.Open();
cmd.ExecuteNonQuery();
conn.Close();
}
}
87 changes: 87 additions & 0 deletions src/MysticMind.PostgresEmbed.Tests/Pgserver_Async_Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,4 +257,91 @@ public async Task Bug_19_authors_md_file_already_exists()
await cmd.ExecuteNonQueryAsync();
await conn.CloseAsync();
}

[SkippableFact]
public async Task create_server_with_spaces_in_db_dir()
{
Skip.IfNot(RuntimeInformation.IsOSPlatform(OSPlatform.Windows), "Test supported only on Windows");

var pathWithSpaces = Path.Combine(Directory.GetCurrentDirectory(), "folder with spaces");
if (!Directory.Exists(pathWithSpaces)) Directory.CreateDirectory(pathWithSpaces);

await using var server = new PgServer(
"15.3.0",
dbDir: pathWithSpaces,
addLocalUserAccessPermission: AddLocalUserAccessPermission,
clearInstanceDirOnStop: true);
await server.StartAsync();

// Note: set pooling to false to prevent connecting issues
// https://github.com/npgsql/npgsql/issues/939
var connStr = string.Format(ConnStr, server.PgPort, PgUser);
var conn = new Npgsql.NpgsqlConnection(connStr);
var cmd =
new Npgsql.NpgsqlCommand(
"CREATE TABLE table1(ID CHAR(256) CONSTRAINT id PRIMARY KEY, Title CHAR)",
conn);

await conn.OpenAsync();
await cmd.ExecuteNonQueryAsync();
await conn.CloseAsync();
}

[SkippableFact]
public async Task create_server_with_spaces_in_db_dir_with_local_user_perm()
{
Skip.IfNot(RuntimeInformation.IsOSPlatform(OSPlatform.Windows), "Test supported only on Windows");

var pathWithSpaces = Path.Combine(Directory.GetCurrentDirectory(), "folder with spaces");
if (!Directory.Exists(pathWithSpaces)) Directory.CreateDirectory(pathWithSpaces);

await using var server = new PgServer(
"15.3.0",
dbDir: pathWithSpaces,
addLocalUserAccessPermission: true,
clearInstanceDirOnStop: true);
await server.StartAsync();

// Note: set pooling to false to prevent connecting issues
// https://github.com/npgsql/npgsql/issues/939
var connStr = string.Format(ConnStr, server.PgPort, PgUser);
var conn = new Npgsql.NpgsqlConnection(connStr);
var cmd =
new Npgsql.NpgsqlCommand(
"CREATE TABLE table1(ID CHAR(256) CONSTRAINT id PRIMARY KEY, Title CHAR)",
conn);

await conn.OpenAsync();
await cmd.ExecuteNonQueryAsync();
await conn.CloseAsync();
}

[SkippableFact]
public async Task create_server_with_spaces_in_db_dir_parent_dir()
{
Skip.IfNot(RuntimeInformation.IsOSPlatform(OSPlatform.Windows), "Test supported only on Windows");

var pathWithSpaces = Path.Combine(Directory.GetCurrentDirectory(), "folder with spaces", "folder");
if (!Directory.Exists(pathWithSpaces)) Directory.CreateDirectory(pathWithSpaces);

await using var server = new PgServer(
"15.3.0",
dbDir: pathWithSpaces,
addLocalUserAccessPermission: true,
clearInstanceDirOnStop: true);
await server.StartAsync();

// Note: set pooling to false to prevent connecting issues
// https://github.com/npgsql/npgsql/issues/939
var connStr = string.Format(ConnStr, server.PgPort, PgUser);
var conn = new Npgsql.NpgsqlConnection(connStr);
var cmd =
new Npgsql.NpgsqlCommand(
"CREATE TABLE table1(ID CHAR(256) CONSTRAINT id PRIMARY KEY, Title CHAR)",
conn);

await conn.OpenAsync();
await cmd.ExecuteNonQueryAsync();
await conn.CloseAsync();
}
}
8 changes: 4 additions & 4 deletions src/MysticMind.PostgresEmbed/PgServer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ private void AddLocalUserAccessPermission()
// get the local user under which the program runs
var currentLocalUser = Environment.GetEnvironmentVariable("Username");

args.Add(InstanceDir);
args.Add($"\"{InstanceDir}\"");
args.Add("/t");
args.Add("/grant:r");
args.Add($"{currentLocalUser}:(OI)(CI)F");
Expand Down Expand Up @@ -327,7 +327,7 @@ private void InitDb()
var args = new List<string>
{
// add data dir
$"-D {DataDir}",
$"-D \"{DataDir}\"",
// add super user
$"-U {PgUser}",
// add encoding
Expand Down Expand Up @@ -397,7 +397,7 @@ private void StartServer()
var args = new List<string>
{
// add the data dir arg
$"-D {DataDir}",
$"-D \"{DataDir}\"",
// add user
$"-U {PgUser}"
};
Expand Down Expand Up @@ -473,7 +473,7 @@ private void StopServer()
var args = new List<string>
{
// add data dir
$"-D {DataDir}",
$"-D \"{DataDir}\"",
// add user
$"-U {PgUser}",
// add stop mode
Expand Down
Loading