System.Data.SQLite: Check-in [1e8b52743b]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

Comment:	Add user-interface integration for the per-solution provider name configuration option.
Downloads:	Tarball \| ZIP archive
Timelines:	family \| ancestors \| descendants \| both \| designOptions
Files:	files \| file ages \| folders
SHA1:	1e8b52743b4247001de5aad99f411524aeff5442
User & Date:	mistachkin 2014-08-01 04:24:19.557

Context

2014-08-01
04:32		Make sure the EF6 provider name is only available for .NET 4.0 and later. check-in: 1e2ed0931a user: mistachkin tags: designOptions
04:24		Add user-interface integration for the per-solution provider name configuration option. check-in: 1e8b52743b user: mistachkin tags: designOptions
03:30		Revise method names introduced in the previous check-in. Call the SQLiteOptions class from all the appropriate places. check-in: 015eca543d user: mistachkin tags: designOptions

Changes

Changes to SQLite.Designer/SQLiteConnectionUIControl.Designer.cs.

Changes to SQLite.Designer/SQLiteConnectionUIControl.cs.

Changes to SQLite.Designer/SQLiteConnectionUIControl.resx.

Changes to SQLite.Designer/SQLiteOptions.cs.

︙			︙
23 24 25 26 27 28 29 30 31 32 33 34 35 36	/// </summary> [ToolboxItem(false)] public partial class SQLiteConnectionUIControl : DataConnectionUIControl { public SQLiteConnectionUIControl() { InitializeComponent(); } private void browseButton_Click(object sender, EventArgs e) { OpenFileDialog dlg = new OpenFileDialog(); dlg.FileName = fileTextBox.Text; dlg.Title = "Select SQLite Database File";	> >	23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38	/// </summary> [ToolboxItem(false)] public partial class SQLiteConnectionUIControl : DataConnectionUIControl { public SQLiteConnectionUIControl() { InitializeComponent(); SQLiteOptions.AddProviderNames(providerComboBox.Items); SQLiteOptions.SelectProviderName(providerComboBox); } private void browseButton_Click(object sender, EventArgs e) { OpenFileDialog dlg = new OpenFileDialog(); dlg.FileName = fileTextBox.Text; dlg.Title = "Select SQLite Database File";
︙			︙
91 92 93 94 95 96 97 98 99 100 101 102 103 104	if (iso8601RadioButton.Checked == true) ConnectionProperties.Remove("datetimeformat"); else if (ticksRadioButton.Checked == true) ConnectionProperties["datetimeformat"] = "Ticks"; else ConnectionProperties["datetimeformat"] = "JulianDay"; } private void sync_Changed(object sender, EventArgs e) { string sync = "Normal"; if (fullRadioButton.Checked == true) sync = "Full"; else if (offRadioButton.Checked == true) sync = "Off";	> > > > > > > > > > >	93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117	if (iso8601RadioButton.Checked == true) ConnectionProperties.Remove("datetimeformat"); else if (ticksRadioButton.Checked == true) ConnectionProperties["datetimeformat"] = "Ticks"; else ConnectionProperties["datetimeformat"] = "JulianDay"; } private void provider_Changed(object sender, EventArgs e) { object item = providerComboBox.SelectedItem; if (item != null) { SQLiteOptions.SetProviderName(item.ToString()); LoadProperties(); } } private void sync_Changed(object sender, EventArgs e) { string sync = "Normal"; if (fullRadioButton.Checked == true) sync = "Full"; else if (offRadioButton.Checked == true) sync = "Off";
︙			︙

1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18	/******************************************************** * ADO.NET 2.0 Data Provider for SQLite Version 3.X * Written by Joe Mistachkin (joe@mistachkin.com) * * Released to the public domain, use at your own risk! ********************************************************/ using System; using System.Collections.Generic; using System.IO; using System.Runtime.InteropServices; using Microsoft.VisualStudio.Shell; namespace SQLite.Designer { /// <summary> /// This class keeps track of the options configured on a per-solution file /// basis pertaining to the System.Data.SQLite design-time components.	>	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19	/******************************************************** * ADO.NET 2.0 Data Provider for SQLite Version 3.X * Written by Joe Mistachkin (joe@mistachkin.com) * * Released to the public domain, use at your own risk! ********************************************************/ using System; using System.Collections.Generic; using System.IO; using System.Runtime.InteropServices; using System.Windows.Forms; using Microsoft.VisualStudio.Shell; namespace SQLite.Designer { /// <summary> /// This class keeps track of the options configured on a per-solution file /// basis pertaining to the System.Data.SQLite design-time components.
︙			︙
28 29 30 31 32 33 34 35 36 37 38 39 40 41 42	private static readonly string ProviderNameKey = "ProviderName"; /////////////////////////////////////////////////////////////////////// /// <summary> /// This is the legacy provider name used by the System.Data.SQLite /// design-time components. It is also the default value for the ~~/// associated option.~~ /// </summary> private static readonly string DefaultProviderName = "System.Data.SQLite"; /// <summary> /// This is the provider name used when Entity Framework 6.x support is /// required for use with the System.Data.SQLite design-time components. /// </summary>	\|	29 30 31 32 33 34 35 36 37 38 39 40 41 42 43	private static readonly string ProviderNameKey = "ProviderName"; /////////////////////////////////////////////////////////////////////// /// <summary> /// This is the legacy provider name used by the System.Data.SQLite /// design-time components. It is also the default value for the /// associated option key. /// </summary> private static readonly string DefaultProviderName = "System.Data.SQLite"; /// <summary> /// This is the provider name used when Entity Framework 6.x support is /// required for use with the System.Data.SQLite design-time components. /// </summary>
︙			︙
50 51 52 53 54 55 56 57 58 59 60 61 62 63 64	/// This is used to synchronize access to the static dictionary of /// options (just below). /// </summary> private static readonly object syncRoot = new object(); /// <summary> /// This dictionary contains the key/value pairs representing the ~~/// per-solution options configured for the current solution.~~ /// </summary> private static Dictionary<string, string> options; #endregion /////////////////////////////////////////////////////////////////////// #region Private Static Methods	\| > >	51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67	/// This is used to synchronize access to the static dictionary of /// options (just below). /// </summary> private static readonly object syncRoot = new object(); /// <summary> /// This dictionary contains the key/value pairs representing the /// per-solution options configured for the current solution. When /// a new solution is loaded by Visual Studio, this dictionary must /// be reset. /// </summary> private static Dictionary<string, string> options; #endregion /////////////////////////////////////////////////////////////////////// #region Private Static Methods
︙			︙
106 107 108 109 110 111 112 113 114 115 116 117 118 119	string value; if (GetValue(key, out value) && IsValidValue(key, value)) return value; return DefaultProviderName; } #endregion /////////////////////////////////////////////////////////////////////// #region Hard-Coded Default Value Handling /// <summary> /// This method determines if the specified key/value pair represents	> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > >	109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227	string value; if (GetValue(key, out value) && IsValidValue(key, value)) return value; return DefaultProviderName; } /////////////////////////////////////////////////////////////////////// /// <summary> /// This method attempts to set the name of the ADO.NET provider for /// the System.Data.SQLite design-time components to use. /// </summary> /// <param name="value"> /// The ADO.NET provider name to use. /// </param> /// <returns> /// Non-zero upon success; otherwise, zero. All ADO.NET provider names /// unknown to this class are rejected. /// </returns> public static bool SetProviderName( string value ) { string key = ProviderNameKey; if (IsValidValue(key, value)) return SetValue(key, value); return false; } /////////////////////////////////////////////////////////////////////// #region User-Interface Handling /// <summary> /// This method attempts to select the configured ADO.NET provider name /// in the specified <see cref="ComboBox" />. This method will only /// work correctly when called from the user-interface thread. /// </summary> /// <param name="comboBox"> /// The <see cref="ComboBox" /> object where the selection is to be /// modified. /// </param> /// <returns> /// Non-zero upon success; otherwise, zero. /// </returns> public static bool SelectProviderName( ComboBox comboBox ) { if (comboBox == null) return false; string value = GetProviderName(); if (value == null) return false; for (int index = 0; index < comboBox.Items.Count; index++) { object item = comboBox.Items[index]; if (item == null) continue; if (String.Equals( item.ToString(), value, StringComparison.Ordinal)) { comboBox.SelectedIndex = index; return true; } } return false; } /////////////////////////////////////////////////////////////////////// /// <summary> /// This method populates the specified <see cref="ComboBox" /> item /// list with the recognized ADO.NET provider names. This method will /// only work correctly when called from the user-interface thread. /// </summary> /// <param name="items"> /// The <see cref="ComboBox.Items" /> property value containing the /// list of items to be modified. This value cannot be null. /// </param> /// <returns> /// The number of items actually added to the list, which may be zero. /// </returns> public static int AddProviderNames( ComboBox.ObjectCollection items ) { int result = 0; if (items == null) return result; items.Add(DefaultProviderName); result++; #if NET_40 \|\| NET_45 \|\| NET_451 items.Add(Ef6ProviderName); result++; #endif return result; } #endregion #endregion /////////////////////////////////////////////////////////////////////// #region Hard-Coded Default Value Handling /// <summary> /// This method determines if the specified key/value pair represents
︙			︙