diff --git a/grate.unittests/Generic/GenericDatabase.cs b/grate.unittests/Generic/GenericDatabase.cs index aa6586b9..c999571f 100644 --- a/grate.unittests/Generic/GenericDatabase.cs +++ b/grate.unittests/Generic/GenericDatabase.cs @@ -47,15 +47,16 @@ public virtual async Task Is_created_with_custom_script_if_custom_create_databas var customScript = Context.Syntax.CreateDatabase(scriptedDatabase, password); TestConfig.WriteContent(Wrap(config.SqlFilesDirectory, config.Folders?.CreateDatabase?.Path), "createDatabase.sql", customScript); - try - { + //try + //{ await using var migrator = GetMigrator(config); await migrator.Migrate(); - } - catch (DbException) - { + //} + //catch (DbException e) + //{ + //var s = e.Message; //Do nothing because database name is wrong due to custom script - } + //} File.Delete(Path.Join(Wrap(config.SqlFilesDirectory, config.Folders?.CreateDatabase?.Path).ToString(), "createDatabase.sql")); diff --git a/grate/Infrastructure/OracleSyntax.cs b/grate/Infrastructure/OracleSyntax.cs index d6472c84..5ede35b4 100644 --- a/grate/Infrastructure/OracleSyntax.cs +++ b/grate/Infrastructure/OracleSyntax.cs @@ -12,7 +12,8 @@ public string StatementSeparatorRegex const string dashComments = @"(?--.*$)"; const string starComments = @"(?/\*[\S\s]*?\*/)"; const string batchSeparator = @"(?.*)(?;)(?\s|$)"; - const string sqlPlusExecuteCommand = @"(?^|\s)(?\/|;)(?\s*|$|\n)"; + //const string sqlPlusExecuteCommand = @"(?^|\s)(?\/|;)(?\s*|$|\n)"; + const string sqlPlusExecuteCommand = @"(?^|\s)(?\/)(?\s|$)"; return strings + "|" + dashComments + "|" + starComments + "|" + batchSeparator + "|" + sqlPlusExecuteCommand; } }