Skip to content

Commit fde9518

Browse files
authored
Fixing prop name and first column specs (#2404)
* Fixing prop name and first column specs * Adding a null check
1 parent 74624aa commit fde9518

File tree

5 files changed

+22
-12
lines changed

5 files changed

+22
-12
lines changed

src/Microsoft.SqlTools.SqlCore/Localization/sr.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -2415,11 +2415,11 @@ public static string GeneratedAlwaysColumnType_SequenceNumberEnd
24152415
}
24162416
}
24172417

2418-
public static string TableDesignerIsSystemVersioningEnabledTitle
2418+
public static string TableDesignerIsSystemVersioningTitle
24192419
{
24202420
get
24212421
{
2422-
return Keys.GetString(Keys.TableDesignerIsSystemVersioningEnabledTitle);
2422+
return Keys.GetString(Keys.TableDesignerIsSystemVersioningTitle);
24232423
}
24242424
}
24252425

@@ -3814,7 +3814,7 @@ public class Keys
38143814
public const string GeneratedAlwaysColumnType_SequenceNumberEnd = "GeneratedAlwaysColumnType_SequenceNumberEnd";
38153815

38163816

3817-
public const string TableDesignerIsSystemVersioningEnabledTitle = "TableDesignerIsSystemVersioningEnabledTitle";
3817+
public const string TableDesignerIsSystemVersioningTitle = "TableDesignerIsSystemVersioningTitle";
38183818

38193819

38203820
public const string TableDesignerIsSystemVersioningEnabledDescription = "TableDesignerIsSystemVersioningEnabledDescription";

src/Microsoft.SqlTools.SqlCore/Localization/sr.resx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1324,8 +1324,8 @@
13241324
<value>Sequence Number End</value>
13251325
<comment></comment>
13261326
</data>
1327-
<data name="TableDesignerIsSystemVersioningEnabledTitle" xml:space="preserve">
1328-
<value>System Versioning Enabled</value>
1327+
<data name="TableDesignerIsSystemVersioningTitle" xml:space="preserve">
1328+
<value>System Versioning</value>
13291329
<comment></comment>
13301330
</data>
13311331
<data name="TableDesignerIsSystemVersioningEnabledDescription" xml:space="preserve">

src/Microsoft.SqlTools.SqlCore/Localization/sr.strings

+1-1
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ GeneratedAlwaysColumnType_TransactionIdStart = Transaction Id Start
532532
GeneratedAlwaysColumnType_TransactionIdEnd = Transaction Id End
533533
GeneratedAlwaysColumnType_SequenceNumberStart = Sequence Number Start
534534
GeneratedAlwaysColumnType_SequenceNumberEnd = Sequence Number End
535-
TableDesignerIsSystemVersioningEnabledTitle = System Versioning Enabled
535+
TableDesignerIsSystemVersioningTitle = System Versioning
536536
TableDesignerIsSystemVersioningEnabledDescription = Specifies whether the table is system versioning enabled.
537537
TableDesignerSystemVersioningGroupTitle = System Versioning
538538
TableDesignerHistoryTableDescription = History table of the current table.

src/Microsoft.SqlTools.SqlCore/Localization/sr.xlf

+5-5
Original file line numberDiff line numberDiff line change
@@ -1505,11 +1505,6 @@
15051505
<target state="new">Sequence Number End</target>
15061506
<note></note>
15071507
</trans-unit>
1508-
<trans-unit id="TableDesignerIsSystemVersioningEnabledTitle">
1509-
<source>System Versioning Enabled</source>
1510-
<target state="new">System Versioning Enabled</target>
1511-
<note></note>
1512-
</trans-unit>
15131508
<trans-unit id="TableDesignerIsSystemVersioningEnabledDescription">
15141509
<source>Specifies whether the table is system versioning enabled.</source>
15151510
<target state="new">Specifies whether the table is system versioning enabled.</target>
@@ -1866,6 +1861,11 @@
18661861
<target state="new">Shortcuts</target>
18671862
<note></note>
18681863
</trans-unit>
1864+
<trans-unit id="TableDesignerIsSystemVersioningTitle">
1865+
<source>System Versioning</source>
1866+
<target state="new">System Versioning</target>
1867+
<note></note>
1868+
</trans-unit>
18691869
</body>
18701870
</file>
18711871
</xliff>

src/Microsoft.SqlTools.SqlCore/TableDesigner/TableDesignerManager.cs

+11-1
Original file line numberDiff line numberDiff line change
@@ -1577,7 +1577,7 @@ private void SetTemporalTableViewInfo(TableDesignerView view, Dac.TableDesigner
15771577
Group = SR.TableDesignerSystemVersioningGroupTitle,
15781578
ComponentProperties = new CheckBoxProperties()
15791579
{
1580-
Title = SR.TableDesignerIsSystemVersioningEnabledTitle
1580+
Title = SR.TableDesignerIsSystemVersioningTitle
15811581
}
15821582
});
15831583

@@ -1718,6 +1718,16 @@ private Dac.TableDesigner CreateTableDesigner(TableInfo tableInfo)
17181718
tableDesigner = new Dac.TableDesigner(tableInfo.ProjectFilePath, tableInfo.TableScriptPath, tableInfo.AllScripts, tableInfo.TargetVersion);
17191719
}
17201720
this.idTableMap[tableInfo.Id] = tableDesigner;
1721+
if (tableInfo.IsNewTable)
1722+
{
1723+
var firstColumn = tableDesigner.TableViewModel.Columns.Items[0];
1724+
if (firstColumn != null)
1725+
{
1726+
firstColumn.Name = "Id";
1727+
firstColumn.IsIdentity = true;
1728+
firstColumn.IsPrimaryKey = true;
1729+
}
1730+
}
17211731
return tableDesigner;
17221732
}
17231733

0 commit comments

Comments
 (0)