Skip to content

Commit 0de836b

Browse files
authored
Merge pull request #34 from baaraban/33-fix-regex-parsing-issue
Fix regex parsing
2 parents b61672e + 3fa0d20 commit 0de836b

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

DbUp.Support.SqlServer.Scripting/DbObjectScripter.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ namespace DbUp.Support.SqlServer.Scripting
1919
{
2020
public class DbObjectScripter
2121
{
22-
private const string SCRIPTING_OBJECT_REGEX = @"((CREATE|ALTER|DROP|CREATE\s*OR\s*ALTER)\s*(TABLE|VIEW|PROCEDURE|PROC|FUNCTION|SYNONYM|TYPE)\s*I?F?\s*E?X?I?S?T?S?\s*([\w\[\]\-]+)?\.?([\w\[\]\-]*))|(sp_rename{1,1}\s*'([\w\[\]\-]+)?\.?([\w\[\]\-]*)'\s*,\s*'([\w\[\]\-]*)')";
22+
private const string SCRIPTING_OBJECT_REGEX = @"((CREATE|ALTER|DROP|CREATE\s*OR\s*ALTER)\s*(TABLE|VIEW|PROCEDURE|PROC|FUNCTION|SYNONYM|TYPE|TRIGGER|)\s*(IF?\s*EXISTS? | \s*)\s*([\w\[\]\-]+)?\.?([\w\[\]\-]*))|(sp_rename{1,1}\s*'([\w\[\]\-]+)?\.?([\w\[\]\-]*)'\s*,\s*'([\w\[\]\-]*)')";
2323
private const int REGEX_INDEX_ACTION_TYPE = 2;
2424
private const int REGEX_INDEX_OBJECT_TYPE = 3;
25-
private const int REGEX_INDEX_SCHEMA_NAME = 4;
26-
private const int REGEX_INDEX_OBJECT_NAME = 5;
27-
private const int REGEX_INDEX_OBJECT_RENAME_SCHEMA = 7;
28-
private const int REGEX_INDEX_OBJECT_RENAME_OLD_NAME = 8;
29-
private const int REGEX_INDEX_OBJECT_RENAME_NEW_NAME = 9;
25+
private const int REGEX_INDEX_SCHEMA_NAME = 5;
26+
private const int REGEX_INDEX_OBJECT_NAME = 6;
27+
private const int REGEX_INDEX_OBJECT_RENAME_SCHEMA = 8;
28+
private const int REGEX_INDEX_OBJECT_RENAME_OLD_NAME = 9;
29+
private const int REGEX_INDEX_OBJECT_RENAME_NEW_NAME = 10;
3030
private readonly Regex m_targetDbObjectRegex = new Regex(SCRIPTING_OBJECT_REGEX, RegexOptions.IgnoreCase | RegexOptions.Multiline | RegexOptions.Compiled);
3131

3232
private Options m_options;

0 commit comments

Comments
 (0)