Skip to content

Commit

Permalink
Merge branch 'release/v1.5.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
AntonZiminSaritasa committed Dec 24, 2015
2 parents 2bf22cf + 33a816d commit 8b39311
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
1 change: 1 addition & 0 deletions src/DBVer/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

<!--<group type="Table">
<add pattern="^Test\d+$" replacement="Test%" />
<add pattern="SkipThisTable" replacement="" />
</group>
<group type="View">
<add pattern="^(.*)_view$" replacement="View$1" />
Expand Down
8 changes: 7 additions & 1 deletion src/DBVer/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ private void ProcessDatabase(string dbName, string outputDir, string serverHost,

var filteredView = new DataView(objectsTable);
filteredView.RowFilter = "[Schema] <> 'INFORMATION_SCHEMA' AND [Schema] NOT IN ('sys', 'guest', 'INFORMATION_SCHEMA') " +
" AND [Schema] NOT LIKE 'db_%' and name = 'AppointmentChart'";
" AND [Schema] NOT LIKE 'db_%'";

currentIndex = 1;
totalRows = filteredView.Count;
Expand Down Expand Up @@ -159,6 +159,9 @@ private void ProcessDatabase(string dbName, string outputDir, string serverHost,
private void ProcessObject(ServerInfo info, string urn, string schema, string objectName, ObjectType objectType, string dbName, string outputDir)
{
var newName = nameReplacer.ReplaceName(objectName, objectType);
if (string.IsNullOrEmpty(newName))
return;

WriteLog(schema, string.CompareOrdinal(objectName, newName) != 0 ? $"{objectName} -> {newName}" : objectName, objectType);

if (processedMap.Contains(schema, newName, objectType))
Expand Down Expand Up @@ -198,6 +201,9 @@ private void ExportTriggers(Database db, string schema, string tableName, string
foreach (Trigger trigger in table.Triggers)
{
var newName = nameReplacer.ReplaceName(trigger.Name, objectType);
if (string.IsNullOrEmpty(newName))
continue;

var changedName = string.CompareOrdinal(trigger.Name, newName) != 0 ? $"{trigger.Name} -> {newName}" : newName;
Console.WriteLine($" [{schema}].[{changedName}] {objectType}");

Expand Down
2 changes: 1 addition & 1 deletion src/DBVer/Properties/HeavysoftVersion.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

$major = 1
$minor = 5
$revision = 4
$revision = 5

trap
{
Expand Down

0 comments on commit 8b39311

Please sign in to comment.