Shorten column names that are longer than 30 characters
Some databases can't deal with column names that are longer than 30 characters. Examples are MaxDB and Oracle [1]. Gerrit has two column names in the accounts table that exceed the 30 characters: displayPatchSetsInReverseOrder, displayPersonNameInReviewCategory This change renames these 2 columns so that their names fit within the 30 character range. [1] http://groups.google.com/group/repo-discuss/browse_thread/thread/ecb713d42c04ae8a/cc963525d8247a17?lnk=gst#cc963525d8247a17 Change-Id: Ie58fb57bea5d5ec3634ad2a73241120a0e50a466 Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
This commit is contained in:
		| @@ -30,8 +30,8 @@ public interface AccountConstants extends Constants { | ||||
|   String showSiteHeader(); | ||||
|   String useFlashClipboard(); | ||||
|   String copySelfOnEmails(); | ||||
|   String displayPatchSetsInReverseOrder(); | ||||
|   String displayPersonNameInReviewCategory(); | ||||
|   String reversePatchSetOrder(); | ||||
|   String showUsernameInReviewCategory(); | ||||
|   String buttonSaveChanges(); | ||||
|  | ||||
|   String tabAccountSummary(); | ||||
|   | ||||
| @@ -7,8 +7,8 @@ accountId = Account ID | ||||
| showSiteHeader = Show Site Header | ||||
| useFlashClipboard = Use Flash Clipboard Widget | ||||
| copySelfOnEmails = CC Me On Comments I Write | ||||
| displayPatchSetsInReverseOrder = Display Patch Sets In Reverse Order | ||||
| displayPersonNameInReviewCategory = Display Person Name In Review Category | ||||
| reversePatchSetOrder = Display Patch Sets In Reverse Order | ||||
| showUsernameInReviewCategory = Display Person Name In Review Category | ||||
| defaultContextFieldLabel = Default Context: | ||||
| maximumPageSizeFieldLabel = Maximum Page Size: | ||||
| dateFormatLabel = Date/Time Format: | ||||
|   | ||||
| @@ -41,8 +41,8 @@ public class MyPreferencesScreen extends SettingsScreen { | ||||
|   private CheckBox showSiteHeader; | ||||
|   private CheckBox useFlashClipboard; | ||||
|   private CheckBox copySelfOnEmails; | ||||
|   private CheckBox displayPatchSetsInReverseOrder; | ||||
|   private CheckBox displayPersonNameInReviewCategory; | ||||
|   private CheckBox reversePatchSetOrder; | ||||
|   private CheckBox showUsernameInReviewCategory; | ||||
|   private ListBox maximumPageSize; | ||||
|   private ListBox dateFormat; | ||||
|   private ListBox timeFormat; | ||||
| @@ -74,11 +74,11 @@ public class MyPreferencesScreen extends SettingsScreen { | ||||
|     copySelfOnEmails = new CheckBox(Util.C.copySelfOnEmails()); | ||||
|     copySelfOnEmails.addClickHandler(onClickSave); | ||||
|  | ||||
|     displayPatchSetsInReverseOrder = new CheckBox(Util.C.displayPatchSetsInReverseOrder()); | ||||
|     displayPatchSetsInReverseOrder.addClickHandler(onClickSave); | ||||
|     reversePatchSetOrder = new CheckBox(Util.C.reversePatchSetOrder()); | ||||
|     reversePatchSetOrder.addClickHandler(onClickSave); | ||||
|  | ||||
|     displayPersonNameInReviewCategory = new CheckBox(Util.C.displayPersonNameInReviewCategory()); | ||||
|     displayPersonNameInReviewCategory.addClickHandler(onClickSave); | ||||
|     showUsernameInReviewCategory = new CheckBox(Util.C.showUsernameInReviewCategory()); | ||||
|     showUsernameInReviewCategory.addClickHandler(onClickSave); | ||||
|  | ||||
|     maximumPageSize = new ListBox(); | ||||
|     for (final short v : PAGESIZE_CHOICES) { | ||||
| @@ -137,11 +137,11 @@ public class MyPreferencesScreen extends SettingsScreen { | ||||
|     row++; | ||||
|  | ||||
|     formGrid.setText(row, labelIdx, ""); | ||||
|     formGrid.setWidget(row, fieldIdx, displayPatchSetsInReverseOrder); | ||||
|     formGrid.setWidget(row, fieldIdx, reversePatchSetOrder); | ||||
|     row++; | ||||
|  | ||||
|     formGrid.setText(row, labelIdx, ""); | ||||
|     formGrid.setWidget(row, fieldIdx, displayPersonNameInReviewCategory); | ||||
|     formGrid.setWidget(row, fieldIdx, showUsernameInReviewCategory); | ||||
|     row++; | ||||
|  | ||||
|     formGrid.setText(row, labelIdx, Util.C.maximumPageSizeFieldLabel()); | ||||
| @@ -179,8 +179,8 @@ public class MyPreferencesScreen extends SettingsScreen { | ||||
|     showSiteHeader.setEnabled(on); | ||||
|     useFlashClipboard.setEnabled(on); | ||||
|     copySelfOnEmails.setEnabled(on); | ||||
|     displayPatchSetsInReverseOrder.setEnabled(on); | ||||
|     displayPersonNameInReviewCategory.setEnabled(on); | ||||
|     reversePatchSetOrder.setEnabled(on); | ||||
|     showUsernameInReviewCategory.setEnabled(on); | ||||
|     maximumPageSize.setEnabled(on); | ||||
|     dateFormat.setEnabled(on); | ||||
|     timeFormat.setEnabled(on); | ||||
| @@ -190,8 +190,8 @@ public class MyPreferencesScreen extends SettingsScreen { | ||||
|     showSiteHeader.setValue(p.isShowSiteHeader()); | ||||
|     useFlashClipboard.setValue(p.isUseFlashClipboard()); | ||||
|     copySelfOnEmails.setValue(p.isCopySelfOnEmails()); | ||||
|     displayPatchSetsInReverseOrder.setValue(p.isDisplayPatchSetsInReverseOrder()); | ||||
|     displayPersonNameInReviewCategory.setValue(p.isDisplayPersonNameInReviewCategory()); | ||||
|     reversePatchSetOrder.setValue(p.isReversePatchSetOrder()); | ||||
|     showUsernameInReviewCategory.setValue(p.isShowUsernameInReviewCategory()); | ||||
|     setListBox(maximumPageSize, DEFAULT_PAGESIZE, p.getMaximumPageSize()); | ||||
|     setListBox(dateFormat, AccountGeneralPreferences.DateFormat.STD, // | ||||
|         p.getDateFormat()); | ||||
| @@ -251,8 +251,8 @@ public class MyPreferencesScreen extends SettingsScreen { | ||||
|     p.setShowSiteHeader(showSiteHeader.getValue()); | ||||
|     p.setUseFlashClipboard(useFlashClipboard.getValue()); | ||||
|     p.setCopySelfOnEmails(copySelfOnEmails.getValue()); | ||||
|     p.setDisplayPatchSetsInReverseOrder(displayPatchSetsInReverseOrder.getValue()); | ||||
|     p.setDisplayPersonNameInReviewCategory(displayPersonNameInReviewCategory.getValue()); | ||||
|     p.setReversePatchSetOrder(reversePatchSetOrder.getValue()); | ||||
|     p.setShowUsernameInReviewCategory(showUsernameInReviewCategory.getValue()); | ||||
|     p.setMaximumPageSize(getListBox(maximumPageSize, DEFAULT_PAGESIZE)); | ||||
|     p.setDateFormat(getListBox(dateFormat, | ||||
|         AccountGeneralPreferences.DateFormat.STD, | ||||
|   | ||||
| @@ -286,13 +286,13 @@ public class ChangeTable extends NavigationTable<ChangeInfo> { | ||||
|     int col = BASE_COLUMNS; | ||||
|     boolean haveReview = false; | ||||
|  | ||||
|     boolean displayPersonNameInReviewCategory = false; | ||||
|     boolean showUsernameInReviewCategory = false; | ||||
|  | ||||
|     if (Gerrit.isSignedIn()) { | ||||
|       AccountGeneralPreferences prefs = Gerrit.getUserAccount().getGeneralPreferences(); | ||||
|  | ||||
|       if (prefs.isDisplayPersonNameInReviewCategory()) { | ||||
|         displayPersonNameInReviewCategory = true; | ||||
|       if (prefs.isShowUsernameInReviewCategory()) { | ||||
|         showUsernameInReviewCategory = true; | ||||
|       } | ||||
|     } | ||||
|  | ||||
| @@ -314,7 +314,7 @@ public class ChangeTable extends NavigationTable<ChangeInfo> { | ||||
|  | ||||
|         if (type.isMaxNegative(ca)) { | ||||
|  | ||||
|           if (displayPersonNameInReviewCategory) { | ||||
|           if (showUsernameInReviewCategory) { | ||||
|             FlowPanel fp = new FlowPanel(); | ||||
|             fp.add(new Image(Gerrit.RESOURCES.redNot())); | ||||
|             fp.add(new InlineLabel(FormatUtil.name(ai))); | ||||
| @@ -325,7 +325,7 @@ public class ChangeTable extends NavigationTable<ChangeInfo> { | ||||
|  | ||||
|         } else if (type.isMaxPositive(ca)) { | ||||
|  | ||||
|           if (displayPersonNameInReviewCategory) { | ||||
|           if (showUsernameInReviewCategory) { | ||||
|             FlowPanel fp = new FlowPanel(); | ||||
|             fp.add(new Image(Gerrit.RESOURCES.greenCheck())); | ||||
|             fp.add(new InlineLabel(FormatUtil.name(ai))); | ||||
| @@ -337,7 +337,7 @@ public class ChangeTable extends NavigationTable<ChangeInfo> { | ||||
|         } else { | ||||
|           String vstr = String.valueOf(ca.getValue()); | ||||
|  | ||||
|           if (displayPersonNameInReviewCategory) { | ||||
|           if (showUsernameInReviewCategory) { | ||||
|             vstr = vstr + " " + FormatUtil.name(ai); | ||||
|           } | ||||
|  | ||||
|   | ||||
| @@ -79,7 +79,7 @@ public class PatchSetsBlock extends Composite { | ||||
|     if (Gerrit.isSignedIn()) { | ||||
|       final AccountGeneralPreferences p = | ||||
|           Gerrit.getUserAccount().getGeneralPreferences(); | ||||
|       if (p.isDisplayPatchSetsInReverseOrder()) { | ||||
|       if (p.isReversePatchSetOrder()) { | ||||
|         Collections.reverse(patchSets); | ||||
|       } | ||||
|     } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Edwin Kempin
					Edwin Kempin