Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Various designer fixes |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | sourceforge |
Files: | files | file ages | folders |
SHA1: |
eaebdca96e26894d6a657ff4e3d962df |
User & Date: | rmsimpson 2010-08-11 16:12:35.000 |
Context
2010-08-11
| ||
16:13 | Prep for 67 check-in: e842408df1 user: rmsimpson tags: sourceforge | |
16:12 | Various designer fixes check-in: eaebdca96e user: rmsimpson tags: sourceforge | |
16:11 | Fixing VS2005 support and adding VS2010 support check-in: 835bf14e60 user: rmsimpson tags: sourceforge | |
Changes
Changes to SQLite.Designer/Design/Check.cs.
︙ | ︙ | |||
66 67 68 69 70 71 72 | } protected override object SetItems(object editValue, object[] value) { bool dirty = false; if (editValue != null) { | < < | 66 67 68 69 70 71 72 73 74 75 76 77 78 79 | } protected override object SetItems(object editValue, object[] value) { bool dirty = false; if (editValue != null) { if (!(editValue is IList)) { return editValue; } IList list = (IList)editValue; list.Clear(); for (int i = 0; i < value.Length; i++) |
︙ | ︙ |
Changes to SQLite.Designer/Design/Column.cs.
︙ | ︙ | |||
12 13 14 15 16 17 18 19 20 21 | using System.Text; using System.ComponentModel; using System.ComponentModel.Design; using System.Windows.Forms; using System.Drawing.Design; using System.Data; using System.Data.Common; internal class Column : IHaveConnection { | > | | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | using System.Text; using System.ComponentModel; using System.ComponentModel.Design; using System.Windows.Forms; using System.Drawing.Design; using System.Data; using System.Data.Common; using System.Globalization; internal class Column : IHaveConnection { private bool _allowNulls; private string _dataType = ""; private string _defaultValue = ""; private string _columnName = ""; private string _origName = ""; private string _collate; private DataGridViewRow _parent; private Unique _unique; |
︙ | ︙ | |||
50 51 52 53 54 55 56 | _allowNulls = (bool)row["IS_NULLABLE"]; _defaultValue = (row.IsNull("COLUMN_DEFAULT") == false) ? row["COLUMN_DEFAULT"].ToString() : String.Empty; _collate = (row.IsNull("COLLATION_NAME") == false) ? row["COLLATION_NAME"].ToString() : String.Empty; string edmtype = (row.IsNull("EDM_TYPE") == false) ? row["EDM_TYPE"].ToString() : String.Empty; if (edmtype == "nvarchar" || edmtype == "varchar" || edmtype == "blob" || edmtype == "nchar" || edmtype == "char") { | | | | | | | | 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | _allowNulls = (bool)row["IS_NULLABLE"]; _defaultValue = (row.IsNull("COLUMN_DEFAULT") == false) ? row["COLUMN_DEFAULT"].ToString() : String.Empty; _collate = (row.IsNull("COLLATION_NAME") == false) ? row["COLLATION_NAME"].ToString() : String.Empty; string edmtype = (row.IsNull("EDM_TYPE") == false) ? row["EDM_TYPE"].ToString() : String.Empty; if (edmtype == "nvarchar" || edmtype == "varchar" || edmtype == "blob" || edmtype == "nchar" || edmtype == "char") { int size = (row.IsNull("CHARACTER_MAXIMUM_LENGTH") == false) ? Convert.ToInt32(row["CHARACTER_MAXIMUM_LENGTH"], CultureInfo.InvariantCulture) : int.MaxValue; if (size != int.MaxValue) _dataType = string.Format(CultureInfo.InvariantCulture, "{0}({1})", _dataType, size); } else if (edmtype == "decimal") { int size = (row.IsNull("NUMERIC_PRECISION") == false) ? Convert.ToInt32(row["NUMERIC_PRECISION"], CultureInfo.InvariantCulture) : 53; int scale = (row.IsNull("NUMERIC_SCALE") == false) ? Convert.ToInt32(row["NUMERIC_SCALE"], CultureInfo.InvariantCulture) : int.MaxValue; if (size != 53) { string scalestr = (scale == int.MaxValue) ? "" : String.Format(CultureInfo.InvariantCulture, ",{0}", scale); _dataType = string.Format(CultureInfo.InvariantCulture, "{0}({1}{2})", _dataType, size, scalestr); } } } #region IHaveConnection Members [Browsable(false)] |
︙ | ︙ | |||
140 141 142 143 144 145 146 | break; case 1: DataType = value.ToString(); break; case 2: try { | | | 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 | break; case 1: DataType = value.ToString(); break; case 2: try { AllowNulls = Convert.ToBoolean(value, CultureInfo.InvariantCulture); } catch { } break; } } |
︙ | ︙ |
Changes to SQLite.Designer/Design/ForeignKey.cs.
︙ | ︙ | |||
13 14 15 16 17 18 19 20 21 22 23 24 25 26 | using System.Text; using System.ComponentModel; using System.Data; using System.Data.Common; using System.ComponentModel.Design; using System.Drawing.Design; using System.Windows.Forms; internal class ForeignKeyEditor : CollectionEditor { Table _table; CollectionEditor.CollectionForm _form; object[] _items; object[] _orig; | > | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | using System.Text; using System.ComponentModel; using System.Data; using System.Data.Common; using System.ComponentModel.Design; using System.Drawing.Design; using System.Windows.Forms; using System.Globalization; internal class ForeignKeyEditor : CollectionEditor { Table _table; CollectionEditor.CollectionForm _form; object[] _items; object[] _orig; |
︙ | ︙ | |||
80 81 82 83 84 85 86 | protected override object SetItems(object editValue, object[] value) { bool dirty = false; if (_form.DialogResult == DialogResult.Cancel) value = _orig; if (editValue != null) { | < < | 81 82 83 84 85 86 87 88 89 90 91 92 93 94 | protected override object SetItems(object editValue, object[] value) { bool dirty = false; if (_form.DialogResult == DialogResult.Cancel) value = _orig; if (editValue != null) { if (!(editValue is IList)) { return editValue; } IList list = (IList)editValue; list.Clear(); for (int i = 0; i < value.Length; i++) |
︙ | ︙ | |||
124 125 126 127 128 129 130 | _table = table; _column = column; _fkey = fkey; } public override string ToString() { | | | 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 | _table = table; _column = column; _fkey = fkey; } public override string ToString() { return String.Format(CultureInfo.InvariantCulture, "[{0}].[{1}].[{2}]", _catalog, _table, _column); } #region IHaveConnection Members [Browsable(false)] public ViewTableBase DesignTable { |
︙ | ︙ | |||
284 285 286 287 288 289 290 | [DefaultProperty("From")] internal class ForeignKey : IHaveConnection, ICloneable { internal Table _table; internal ForeignKeyFromItem _from; internal ForeignKeyToItem _to; internal string _name; | | | 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 | [DefaultProperty("From")] internal class ForeignKey : IHaveConnection, ICloneable { internal Table _table; internal ForeignKeyFromItem _from; internal ForeignKeyToItem _to; internal string _name; private bool _dirty; private ForeignKey(ForeignKey source) { _table = source._table; _from = new ForeignKeyFromItem(this, source._from.Column); _to = new ForeignKeyToItem(this, source._to.Catalog, source._to.Table, source._to.Column); _name = source._name; |
︙ | ︙ | |||
322 323 324 325 326 327 328 | { _from = new ForeignKeyFromItem(this, row["FKEY_FROM_COLUMN"].ToString()); _to = new ForeignKeyToItem(this, row["FKEY_TO_CATALOG"].ToString(), row["FKEY_TO_TABLE"].ToString(), row["FKEY_TO_COLUMN"].ToString()); _name = row["CONSTRAINT_NAME"].ToString(); } else { | < | 321 322 323 324 325 326 327 328 329 330 331 332 333 334 | { _from = new ForeignKeyFromItem(this, row["FKEY_FROM_COLUMN"].ToString()); _to = new ForeignKeyToItem(this, row["FKEY_TO_CATALOG"].ToString(), row["FKEY_TO_TABLE"].ToString(), row["FKEY_TO_COLUMN"].ToString()); _name = row["CONSTRAINT_NAME"].ToString(); } else { _from = new ForeignKeyFromItem(this, ""); _to = new ForeignKeyToItem(this, _table.Catalog, "", ""); } } //internal void WriteSql(StringBuilder builder) //{ |
︙ | ︙ | |||
346 347 348 349 350 351 352 | [Description("The name of the foreign key.")] public string Name { get { if (String.IsNullOrEmpty(_name) == false) return _name; | | | 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 | [Description("The name of the foreign key.")] public string Name { get { if (String.IsNullOrEmpty(_name) == false) return _name; return String.Format(CultureInfo.InvariantCulture, "FK_{0}_{1}_{2}_{3}", _from.Table, _from.Column, _to.Table, _to.Column); } set { if (_name != value) { _name = value; MakeDirty(); |
︙ | ︙ |
Changes to SQLite.Designer/Design/Index.cs.
︙ | ︙ | |||
13 14 15 16 17 18 19 20 21 22 23 24 | using System.Text; using System.ComponentModel; using System.Data; using System.Data.Common; using System.ComponentModel.Design; using System.Drawing.Design; using System.Windows.Forms; internal class IndexEditor : CollectionEditor { Table _table; CollectionEditor.CollectionForm _form; | > > | | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | using System.Text; using System.ComponentModel; using System.Data; using System.Data.Common; using System.ComponentModel.Design; using System.Drawing.Design; using System.Windows.Forms; using System.Security.Permissions; using System.Globalization; internal class IndexEditor : CollectionEditor { Table _table; CollectionEditor.CollectionForm _form; object[] _items; object[] _orig; int _count; internal IndexEditor(Table parent) : base(typeof(List<Index>)) { _table = parent; |
︙ | ︙ | |||
110 111 112 113 114 115 116 | int count = 0; if (_form.DialogResult == DialogResult.Cancel) value = _orig; if (editValue != null) { | < < | 112 113 114 115 116 117 118 119 120 121 122 123 124 125 | int count = 0; if (_form.DialogResult == DialogResult.Cancel) value = _orig; if (editValue != null) { if (!(editValue is IList)) { return editValue; } IList list = (IList)editValue; list.Clear(); for (int i = 0; i < value.Length; i++) |
︙ | ︙ | |||
220 221 222 223 224 225 226 | protected override object SetItems(object editValue, object[] value) { if (_form.DialogResult == DialogResult.Cancel) value = _orig; if (editValue != null) { | < < | 220 221 222 223 224 225 226 227 228 229 230 231 232 233 | protected override object SetItems(object editValue, object[] value) { if (_form.DialogResult == DialogResult.Cancel) value = _orig; if (editValue != null) { if (!(editValue is IList)) { return editValue; } IList list = (IList)editValue; list.Clear(); for (int i = 0; i < value.Length; i++) |
︙ | ︙ | |||
447 448 449 450 451 452 453 | PrimaryKey = 1, } [DefaultProperty("Columns")] internal class Index : IHaveConnection, ICloneable { private Table _table; | | | | 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 | PrimaryKey = 1, } [DefaultProperty("Columns")] internal class Index : IHaveConnection, ICloneable { private Table _table; internal string _name; private bool _unique; private List<IndexColumn> _columns = new List<IndexColumn>(); private string _definition; private bool _calcname; internal ConflictEnum _conflict = ConflictEnum.Abort; bool _dirty; protected Index(Index source) { _table = source._table; _name = source._name; _unique = source._unique; _definition = source._definition; |
︙ | ︙ | |||
517 518 519 520 521 522 523 | } #endregion internal virtual void WriteSql(StringBuilder builder) { string separator = ""; | | | | | 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 | } #endregion internal virtual void WriteSql(StringBuilder builder) { string separator = ""; builder.AppendFormat(CultureInfo.InvariantCulture, "CREATE {0}INDEX [{1}].[{2}] ON [{3}] (", (_unique == true) ? "UNIQUE " : "", _table.Catalog, Name, _table.Name); foreach (IndexColumn c in Columns) { builder.AppendFormat(CultureInfo.InvariantCulture, "{0}[{1}]", separator, c.Column); if (c.SortMode != ColumnSortMode.Ascending) builder.Append(" DESC"); if (String.IsNullOrEmpty(c.Collate) && String.Compare(c.Collate,"BINARY", StringComparison.OrdinalIgnoreCase) != 0) builder.AppendFormat(CultureInfo.InvariantCulture, " COLLATE {0}", c.Collate.ToUpperInvariant()); separator = ", "; } builder.AppendFormat(");"); } [Browsable(false)] |
︙ | ︙ | |||
600 601 602 603 604 605 606 | { get { if (String.IsNullOrEmpty(_name)) { if (_calcname == true) return GetHashCode().ToString(); | | | | | 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 | { get { if (String.IsNullOrEmpty(_name)) { if (_calcname == true) return GetHashCode().ToString(); string name = String.Format(CultureInfo.InvariantCulture, "{0}_{1}", NamePrefix, NewName); if (Columns.Count > 0 && NewName != Table.Name) { name = String.Format(CultureInfo.InvariantCulture, "{0}_", NamePrefix); for (int n = 0; n < Columns.Count; n++) { if (n > 0) name += "_"; name += Columns[n].Column; } } int count = 0; string proposed = name; _calcname = true; for (int n = 0; n < _table.Indexes.Count; n++) { Index idx = _table.Indexes[n]; proposed = String.Format(CultureInfo.InvariantCulture, "{0}{1}", name, (count > 0) ? count.ToString() : ""); if (idx.Name == proposed) { count++; n = -1; } } _calcname = false; |
︙ | ︙ | |||
676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 | _list = new CheckedListBox(); _list.BorderStyle = BorderStyle.FixedSingle; _list.CheckOnClick = true; _list.ThreeDCheckBoxes = false; _list.KeyPress += new KeyPressEventHandler(_list_KeyPress); } override public UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext ctx) { return UITypeEditorEditStyle.DropDown; } override public object EditValue(ITypeDescriptorContext ctx, IServiceProvider provider, object value) { Index idx = ctx.Instance as Index; Trigger trig = ctx.Instance as Trigger; ViewTableBase parent = null; if (idx != null) parent = idx.Table; | > > | 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 | _list = new CheckedListBox(); _list.BorderStyle = BorderStyle.FixedSingle; _list.CheckOnClick = true; _list.ThreeDCheckBoxes = false; _list.KeyPress += new KeyPressEventHandler(_list_KeyPress); } [PermissionSet(SecurityAction.LinkDemand, Name = "FullTrust")] override public UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext ctx) { return UITypeEditorEditStyle.DropDown; } [PermissionSet(SecurityAction.LinkDemand, Name = "FullTrust")] override public object EditValue(ITypeDescriptorContext ctx, IServiceProvider provider, object value) { Index idx = ctx.Instance as Index; Trigger trig = ctx.Instance as Trigger; ViewTableBase parent = null; if (idx != null) parent = idx.Table; |
︙ | ︙ | |||
710 711 712 713 714 715 716 | if (parent is Table) { foreach (Column c in ((Table)parent).Columns) { CheckState check = CheckState.Unchecked; for (int n = 0; n < values.Length; n++) { | | | 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 | if (parent is Table) { foreach (Column c in ((Table)parent).Columns) { CheckState check = CheckState.Unchecked; for (int n = 0; n < values.Length; n++) { if (values[n].Trim() == String.Format(CultureInfo.InvariantCulture, "[{0}]", c.ColumnName)) { check = CheckState.Checked; break; } } _list.Items.Add(c.ColumnName, check); } |
︙ | ︙ | |||
734 735 736 737 738 739 740 | using (DataTable tbl = reader.GetSchemaTable()) { foreach (DataRow row in tbl.Rows) { CheckState check = CheckState.Unchecked; for (int n = 0; n < values.Length; n++) { | | | 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 | using (DataTable tbl = reader.GetSchemaTable()) { foreach (DataRow row in tbl.Rows) { CheckState check = CheckState.Unchecked; for (int n = 0; n < values.Length; n++) { if (values[n].Trim() == String.Format(CultureInfo.InvariantCulture, "[{0}]", row[SchemaTableColumn.ColumnName])) { check = CheckState.Checked; break; } } _list.Items.Add(row[SchemaTableColumn.ColumnName].ToString(), check); } |
︙ | ︙ | |||
830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 | foreach (Column c in tbl.Columns) { selector.AddNode(c.ColumnName, c.ColumnName, null); } } } } } internal class TablesTypeEditor : ObjectSelectorEditor { public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context) { return UITypeEditorEditStyle.DropDown; } protected override void FillTreeWithData(Selector selector, ITypeDescriptorContext context, IServiceProvider provider) { | > > > > > > > > > > > > > > > > | 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 | foreach (Column c in tbl.Columns) { selector.AddNode(c.ColumnName, c.ColumnName, null); } } } } public override bool IsDropDownResizable { get { return true; } } } internal class TablesTypeEditor : ObjectSelectorEditor { public override bool IsDropDownResizable { get { return true; } } public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context) { return UITypeEditorEditStyle.DropDown; } protected override void FillTreeWithData(Selector selector, ITypeDescriptorContext context, IServiceProvider provider) { |
︙ | ︙ |
Changes to SQLite.Designer/Design/SimpleTokenizer.cs.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | /******************************************************** * ADO.NET 2.0 Data Provider for SQLite Version 3.X * Written by Robert Simpson (robert@blackcastlesoft.com) * * Released to the public domain, use at your own risk! ********************************************************/ namespace SQLite.Designer.Design { using System; using System.Collections.Generic; using System.Text; internal static class SimpleTokenizer { public struct StringParts { internal string value; internal int position; internal string quote; internal bool sep; internal int depth; internal string keyword; internal char sepchar; public override string ToString() { | > | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 | /******************************************************** * ADO.NET 2.0 Data Provider for SQLite Version 3.X * Written by Robert Simpson (robert@blackcastlesoft.com) * * Released to the public domain, use at your own risk! ********************************************************/ namespace SQLite.Designer.Design { using System; using System.Collections.Generic; using System.Text; using System.Globalization; internal static class SimpleTokenizer { public struct StringParts { internal string value; internal int position; internal string quote; internal bool sep; internal int depth; internal string keyword; internal char sepchar; public override string ToString() { return String.Format(CultureInfo.InvariantCulture, "{0} {1} at {2} {3} depth {4}", value, quote, position, sep == true ? "(sep)" : "", depth); } } public static StringParts[] BreakString(string source) { char[] opens = new char[] { '\"', '[', '\'', '(', ')', ',', ' ', ';', '\r', '\n', '\t' }; char[] opens2 = new char[] { '\"', '[', '\'', '(', ')', ',', ' ', ';', '\r', '\n', '\t', '.' }; |
︙ | ︙ | |||
60 61 62 63 64 65 66 | startat += tok.value.Length; continue; } else if (source.Length > 1 && source[0] == '/' && source[1] == '*') { StringParts tok = new StringParts(); tok.position = startat; | | | | | 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 | startat += tok.value.Length; continue; } else if (source.Length > 1 && source[0] == '/' && source[1] == '*') { StringParts tok = new StringParts(); tok.position = startat; x = source.IndexOf("*/", StringComparison.Ordinal); if (x == -1) tok.value = source; else tok.value = source.Substring(0, x + 2); //ls.Add(tok); source = source.Substring(tok.value.Length); startat += tok.value.Length; continue; } int comment = source.IndexOf("--", n, StringComparison.Ordinal); if (comment == -1) comment = source.IndexOf("/*", n, StringComparison.Ordinal); if (n > 0) n = source.IndexOfAny(opens2, n); else n = source.IndexOfAny(opens, n); if (comment > -1 && (n == -1 || comment < n)) |
︙ | ︙ | |||
125 126 127 128 129 130 131 | tok.position = startat; if (tok.value.Length > 1) { x = opensstr.IndexOf(tok.value[0]); if (x != -1 && tok.value[tok.value.Length - 1] == closes[x]) { | | | 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 | tok.position = startat; if (tok.value.Length > 1) { x = opensstr.IndexOf(tok.value[0]); if (x != -1 && tok.value[tok.value.Length - 1] == closes[x]) { tok.quote = String.Format(CultureInfo.InvariantCulture, "{0}{1}", tok.value[0], tok.value[tok.value.Length - 1]); tok.value = tok.value.Substring(1, tok.value.Length - 2); } else tok.keyword = tok.value.ToUpperInvariant(); } if (source.Length - n > 1 && ((source[n] == '-' && source[n + 1] == '-') || source[n] == '/' && source[n + 1] == '*')) |
︙ | ︙ | |||
168 169 170 171 172 173 174 | tok.position = startat; if (tok.value.Length > 1) { x = opensstr.IndexOf(tok.value[0]); if (x != -1 && tok.value[tok.value.Length - 1] == closes[x]) { | | | 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 | tok.position = startat; if (tok.value.Length > 1) { x = opensstr.IndexOf(tok.value[0]); if (x != -1 && tok.value[tok.value.Length - 1] == closes[x]) { tok.quote = String.Format(CultureInfo.InvariantCulture, "{0}{1}", tok.value[0], tok.value[tok.value.Length - 1]); tok.value = tok.value.Substring(1, tok.value.Length - 2); } else tok.keyword = tok.value.ToUpperInvariant(); } if (tok.value.Length > 0) ls.Add(tok); } |
︙ | ︙ |
Changes to SQLite.Designer/Design/Table.cs.
︙ | ︙ | |||
11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 | using System.Data.Common; using System.ComponentModel.Design; using System.ComponentModel; using System.Drawing.Design; using System.Collections.Generic; using System.Data; using System.Text; using SQLite.Designer.Editors; internal abstract class ViewTableBase: IHaveConnection { public abstract string OldName { get; } public abstract string Name { get; set; } public abstract string Catalog { get; } public abstract object Triggers { get; } public abstract void MakeDirty(); public abstract DbConnection GetConnection(); public abstract ViewTableBase DesignTable { get; } } internal class Table : ViewTableBase, ICustomTypeDescriptor { private string _name; private string _oldname; private string _catalog; private List<Column> _columns = new List<Column>(); | > | | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 | using System.Data.Common; using System.ComponentModel.Design; using System.ComponentModel; using System.Drawing.Design; using System.Collections.Generic; using System.Data; using System.Text; using System.Globalization; using SQLite.Designer.Editors; internal abstract class ViewTableBase: IHaveConnection { public abstract string OldName { get; } public abstract string Name { get; set; } public abstract string Catalog { get; } public abstract object Triggers { get; } public abstract void MakeDirty(); public abstract DbConnection GetConnection(); public abstract ViewTableBase DesignTable { get; } } internal class Table : ViewTableBase, ICustomTypeDescriptor { private string _name; private string _oldname; private string _catalog; private List<Column> _columns = new List<Column>(); private bool _exists; private string _origSql = String.Empty; private List<Index> _indexes = new List<Index>(); private List<Index> _oldindexes = new List<Index>(); private List<ForeignKey> _fkeys = new List<ForeignKey>(); private List<ForeignKey> _oldfkeys = new List<ForeignKey>(); private List<string> _check = new List<string>(); private List<Trigger> _triggers = new List<Trigger>(); |
︙ | ︙ | |||
293 294 295 296 297 298 299 | public override string OldName { get { return _oldname; } } public override string ToString() { | | | 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 | public override string OldName { get { return _oldname; } } public override string ToString() { return String.Format(CultureInfo.InvariantCulture, "[{0}].[{1}]", Catalog, Name); } [Category("Storage")] [Editor(typeof(CatalogTypeEditor), typeof(UITypeEditor))] [DefaultValue("main")] [RefreshProperties(RefreshProperties.All)] public override string Catalog |
︙ | ︙ | |||
325 326 327 328 329 330 331 | { StringBuilder builder = new StringBuilder(); string altName = null; if (_exists) { Guid g = Guid.NewGuid(); | | | 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 | { StringBuilder builder = new StringBuilder(); string altName = null; if (_exists) { Guid g = Guid.NewGuid(); altName = String.Format(CultureInfo.InvariantCulture, "{0}_{1}", Name, g.ToString("N")); if (_oldindexes.Count > 0) { builder.Append("-- Drop previous indexes on the table\r\n"); foreach (Index idx in _oldindexes) { builder.AppendFormat("DROP INDEX [{0}].[{1}];\r\n", _catalog, idx.Name); |
︙ | ︙ | |||
368 369 370 371 372 373 374 | separator = ",\r\n "; } } if (_key.Columns.Count > 1) { string innersep = ""; | | | | | | | | 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 | separator = ",\r\n "; } } if (_key.Columns.Count > 1) { string innersep = ""; builder.AppendFormat(CultureInfo.InvariantCulture, "{0}CONSTRAINT [PK_{1}] PRIMARY KEY (", separator, Name); foreach (IndexColumn c in _key.Columns) { builder.AppendFormat(CultureInfo.InvariantCulture, "{0}[{1}]", innersep, c.Column); if (String.IsNullOrEmpty(c.Collate) == false && String.Compare(c.Collate, "BINARY", StringComparison.OrdinalIgnoreCase) != 0) builder.AppendFormat(CultureInfo.InvariantCulture, " COLLATE {0}", c.Collate.ToUpperInvariant()); if (c.SortMode != ColumnSortMode.Ascending) builder.Append(" DESC"); innersep = ", "; } builder.Append(")"); if (_key.Conflict != ConflictEnum.Abort) builder.AppendFormat(CultureInfo.InvariantCulture, " ON CONFLICT {0}", _key.Conflict.ToString().ToUpperInvariant()); } for (int n = 0; n < Check.Count; n++) { string check = Check[n]; if (String.IsNullOrEmpty(check) == true) continue; SimpleTokenizer.StringParts[] arr = SimpleTokenizer.BreakString(check); for (int x = 0; x < arr.Length; x++) { if (arr[x].depth == 0) { check = String.Format(CultureInfo.InvariantCulture, "({0})", check); break; } } builder.Append(separator); builder.AppendFormat("CONSTRAINT [CK_{0}_{1}] CHECK {2}", Name, n + 1, check); } |
︙ | ︙ | |||
608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 | string CatalogScope { get; } [Browsable(false)] string TableScope { get; } } internal class CollationTypeEditor : ObjectSelectorEditor { public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context) { return UITypeEditorEditStyle.DropDown; } protected override void FillTreeWithData(Selector selector, ITypeDescriptorContext context, IServiceProvider provider) { base.FillTreeWithData(selector, context, provider); selector.AddNode("BINARY", "BINARY", null); selector.AddNode("NOCASE", "NOCASE", null); } } internal class CatalogTypeEditor : ObjectSelectorEditor { public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context) { return UITypeEditorEditStyle.DropDown; } protected override void FillTreeWithData(Selector selector, ITypeDescriptorContext context, IServiceProvider provider) { | > > > > > > > > > > > > > > > > | 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 | string CatalogScope { get; } [Browsable(false)] string TableScope { get; } } internal class CollationTypeEditor : ObjectSelectorEditor { public override bool IsDropDownResizable { get { return true; } } public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context) { return UITypeEditorEditStyle.DropDown; } protected override void FillTreeWithData(Selector selector, ITypeDescriptorContext context, IServiceProvider provider) { base.FillTreeWithData(selector, context, provider); selector.AddNode("BINARY", "BINARY", null); selector.AddNode("NOCASE", "NOCASE", null); } } internal class CatalogTypeEditor : ObjectSelectorEditor { public override bool IsDropDownResizable { get { return true; } } public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context) { return UITypeEditorEditStyle.DropDown; } protected override void FillTreeWithData(Selector selector, ITypeDescriptorContext context, IServiceProvider provider) { |
︙ | ︙ |
Changes to SQLite.Designer/Design/Trigger.cs.
︙ | ︙ | |||
13 14 15 16 17 18 19 20 21 22 23 24 25 26 | using System.Text; using System.ComponentModel; using System.ComponentModel.Design; using System.Windows.Forms; using System.Drawing.Design; using System.Data; using System.Data.Common; public enum TriggerOccurs { Before = 0, After = 1, } | > | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | using System.Text; using System.ComponentModel; using System.ComponentModel.Design; using System.Windows.Forms; using System.Drawing.Design; using System.Data; using System.Data.Common; using System.Globalization; public enum TriggerOccurs { Before = 0, After = 1, } |
︙ | ︙ | |||
81 82 83 84 85 86 87 | private string _when; private ViewTableBase _table; private string _name; private string _columns; private string _action; private bool _calcname; private string _origsql; | | | 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 | private string _when; private ViewTableBase _table; private string _name; private string _columns; private string _action; private bool _calcname; private string _origsql; private bool _dirty; protected Trigger(Trigger source) { _triggerOccurs = source._triggerOccurs; _type = source._type; //_eachRow = source._eachRow; _when = source._when; |
︙ | ︙ | |||
122 123 124 125 126 127 128 | } private void WriteSql(StringBuilder builder, bool temp) { string name = Name; if (temp == true) | | | | | | | | | | 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 | } private void WriteSql(StringBuilder builder, bool temp) { string name = Name; if (temp == true) name = String.Format(CultureInfo.InvariantCulture, "{0}_{1}", name, Guid.NewGuid().ToString("N")); builder.AppendFormat(CultureInfo.InvariantCulture, "CREATE TRIGGER [{0}].[{1}]", _table.Catalog, name); switch (_triggerOccurs) { case 0: builder.Append(" BEFORE"); break; case 1: builder.Append(" AFTER"); break; case 2: builder.Append(" INSTEAD OF"); break; } builder.AppendFormat(CultureInfo.InvariantCulture, " {0}", _type.ToString().ToUpperInvariant()); if (_type == TriggerType.Update && String.IsNullOrEmpty(Columns) == false) builder.AppendFormat(CultureInfo.InvariantCulture, " OF {0}", Columns); builder.AppendFormat(CultureInfo.InvariantCulture, " ON [{0}].[{1}]", _table.Catalog, _table.Name); if (EachRow) builder.Append(" FOR EACH ROW"); if (String.IsNullOrEmpty(When) == false) builder.AppendFormat(CultureInfo.InvariantCulture, " WHEN {0}", When); builder.AppendFormat(CultureInfo.InvariantCulture, "\r\nBEGIN\r\n{0}", SQL); SimpleTokenizer.StringParts[] arr = SimpleTokenizer.BreakString(SQL); if (arr[arr.Length - 1].sepchar != ';') builder.Append(";"); builder.Append("\r\nEND;"); } |
︙ | ︙ | |||
243 244 245 246 247 248 249 | { get { if (String.IsNullOrEmpty(_name)) { if (_calcname == true) return GetHashCode().ToString(); | | | | 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 | { get { if (String.IsNullOrEmpty(_name)) { if (_calcname == true) return GetHashCode().ToString(); string name = String.Format(CultureInfo.InvariantCulture, "{0}_{1}", NamePrefix, NewName); int count = 0; string proposed = name; _calcname = true; for (int n = 0; n < ((IList)_table.Triggers).Count; n++) { Trigger idx = ((IList)_table.Triggers)[n] as Trigger; proposed = string.Format(CultureInfo.InvariantCulture, "{0}{1}", name, (count > 0) ? count.ToString() : ""); if (idx.Name == proposed) { count++; n = -1; } } _calcname = false; |
︙ | ︙ | |||
411 412 413 414 415 416 417 418 419 420 421 422 423 424 | } if (String.IsNullOrEmpty(arr[x].quote) == false) builder.Append(arr[x].quote[0]); builder.Append(arr[x].value); if (String.IsNullOrEmpty(arr[x].quote) == false) builder.Append(arr[x].quote[1]); } while (depth > 0) { depth--; builder.Append(")"); } _when = builder.ToString(); | > | 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 | } if (String.IsNullOrEmpty(arr[x].quote) == false) builder.Append(arr[x].quote[0]); builder.Append(arr[x].value); if (String.IsNullOrEmpty(arr[x].quote) == false) builder.Append(arr[x].quote[1]); x++; } while (depth > 0) { depth--; builder.Append(")"); } _when = builder.ToString(); |
︙ | ︙ | |||
532 533 534 535 536 537 538 | { bool dirty = false; if (_form.DialogResult == DialogResult.Cancel) value = _orig; if (editValue != null) { | < < | 534 535 536 537 538 539 540 541 542 543 544 545 546 547 | { bool dirty = false; if (_form.DialogResult == DialogResult.Cancel) value = _orig; if (editValue != null) { if (!(editValue is IList)) { return editValue; } IList list = (IList)editValue; list.Clear(); for (int i = 0; i < value.Length; i++) |
︙ | ︙ |
Changes to SQLite.Designer/Design/Unique.cs.
︙ | ︙ | |||
9 10 11 12 13 14 15 16 17 18 19 20 21 22 | { using System; using System.Collections.Generic; using System.Text; using System.ComponentModel; using System.Data; using System.Data.Common; [TypeConverter(typeof(ExpandableObjectConverter))] [DefaultProperty("Enabled")] internal class Unique : IHaveConnection { private bool _isUnique; private ConflictEnum _conflict = ConflictEnum.Abort; | > | 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | { using System; using System.Collections.Generic; using System.Text; using System.ComponentModel; using System.Data; using System.Data.Common; using System.Globalization; [TypeConverter(typeof(ExpandableObjectConverter))] [DefaultProperty("Enabled")] internal class Unique : IHaveConnection { private bool _isUnique; private ConflictEnum _conflict = ConflictEnum.Abort; |
︙ | ︙ | |||
89 90 91 92 93 94 95 | } } } public override string ToString() { if (_isUnique == false) | | | | 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 | } } } public override string ToString() { if (_isUnique == false) return Convert.ToString(false, CultureInfo.InvariantCulture); else return String.Format(CultureInfo.InvariantCulture, "{0} ({1})", Convert.ToString(true, CultureInfo.InvariantCulture), Convert.ToString(Conflict, CultureInfo.InvariantCulture)); //return Convert.ToString(true); } } public enum ConflictEnum { Abort = 2, Rollback = 0, Fail = 3, Ignore = 4, Replace = 5, } } |
Changes to SQLite.Designer/Design/View.cs.
︙ | ︙ | |||
11 12 13 14 15 16 17 18 19 20 21 22 23 24 | using System.Data.Common; using System.ComponentModel.Design; using System.ComponentModel; using System.Drawing.Design; using System.Collections.Generic; using System.Data; using System.Text; using SQLite.Designer.Editors; internal class View : ViewTableBase, ICustomTypeDescriptor { private string _name; private string _oldname; private string _sql; | > | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 | using System.Data.Common; using System.ComponentModel.Design; using System.ComponentModel; using System.Drawing.Design; using System.Collections.Generic; using System.Data; using System.Text; using System.Globalization; using SQLite.Designer.Editors; internal class View : ViewTableBase, ICustomTypeDescriptor { private string _name; private string _oldname; private string _sql; |
︙ | ︙ | |||
96 97 98 99 100 101 102 | { _triggers.Add(((ICloneable)trig).Clone() as ViewTrigger); } } public override string ToString() { | | | 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 | { _triggers.Add(((ICloneable)trig).Clone() as ViewTrigger); } } public override string ToString() { return String.Format(CultureInfo.InvariantCulture, "[{0}].[{1}]", Catalog, Name); } [Category("Storage")] [RefreshProperties(RefreshProperties.All)] [ParenthesizePropertyName(true)] public override string Name { |
︙ | ︙ |
Changes to SQLite.Designer/Editors/AutoCompleteColumn.cs.
︙ | ︙ | |||
29 30 31 32 33 34 35 | return typeof(AutoCompleteEditingControl); } } } public class AutoCompleteEditingControl : DataGridViewComboBoxEditingControl { | | | | 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 | return typeof(AutoCompleteEditingControl); } } } public class AutoCompleteEditingControl : DataGridViewComboBoxEditingControl { private bool inPrepare; private bool isDeleting; public override object EditingControlFormattedValue { get { return base.Text; } |
︙ | ︙ | |||
54 55 56 57 58 59 60 61 62 63 64 65 66 67 | base.PrepareEditingControlForEdit(selectAll); if (base.Items.Count == 0) { base.Items.Add("integer"); base.Items.Add("int"); base.Items.Add("smallint"); base.Items.Add("tinyint"); base.Items.Add("bit"); base.Items.Add("varchar(50)"); base.Items.Add("nvarchar(50)"); base.Items.Add("text"); base.Items.Add("ntext"); base.Items.Add("image"); base.Items.Add("money"); | > | 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 | base.PrepareEditingControlForEdit(selectAll); if (base.Items.Count == 0) { base.Items.Add("integer"); base.Items.Add("int"); base.Items.Add("smallint"); base.Items.Add("tinyint"); base.Items.Add("bigint"); base.Items.Add("bit"); base.Items.Add("varchar(50)"); base.Items.Add("nvarchar(50)"); base.Items.Add("text"); base.Items.Add("ntext"); base.Items.Add("image"); base.Items.Add("money"); |
︙ | ︙ |
Changes to SQLite.Designer/Editors/TableDesignerDoc.cs.
︙ | ︙ | |||
15 16 17 18 19 20 21 | using System.Drawing; using System.Text; using System.Windows.Forms; using Microsoft.VisualStudio.Shell.Interop; using Microsoft.VisualStudio.OLE.Interop; using Microsoft.VisualStudio; using Microsoft.VisualStudio.Data; | < > > | | | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 | using System.Drawing; using System.Text; using System.Windows.Forms; using Microsoft.VisualStudio.Shell.Interop; using Microsoft.VisualStudio.OLE.Interop; using Microsoft.VisualStudio; using Microsoft.VisualStudio.Data; using System.ComponentModel.Design; using System.Globalization; using SQLite.Designer.Design; public partial class TableDesignerDoc : DesignerDocBase, IVsPersistDocData, IVsWindowPane, IOleCommandTarget, ISelectionContainer, IVsWindowPaneCommit, IVsWindowFrameNotify { private static Dictionary<int, string> _editingTables = new Dictionary<int, string>(); internal DataConnection _connection; internal Microsoft.VisualStudio.Data.ServiceProvider _serviceProvider; internal Table _table; internal bool _dirty; internal bool _init; internal DataViewHierarchyAccessor _accessor; internal int _itemId; static private bool _warned; public TableDesignerDoc(int itemId, DataViewHierarchyAccessor accessor, string tableName) { _accessor = accessor; _connection = accessor.Connection; _itemId = itemId; _init = true; |
︙ | ︙ | |||
65 66 67 68 69 70 71 | if (String.IsNullOrEmpty(tableName)) { string alltables = tables.ToString(); do { | | | 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 | if (String.IsNullOrEmpty(tableName)) { string alltables = tables.ToString(); do { tableName = String.Format(CultureInfo.InvariantCulture, "Table{0}", n); n++; } while (alltables.IndexOf(tableName + ",", StringComparison.OrdinalIgnoreCase) > -1 || _editingTables.ContainsValue(tableName)); _editingTables.Add(GetHashCode(), tableName); } _table = new Table(tableName, _connection.ConnectionSupport.ProviderObject as DbConnection, this); foreach(Column c in _table.Columns) |
︙ | ︙ | |||
111 112 113 114 115 116 117 | public string Caption { get { string catalog = "main"; if (_table != null) catalog = _table.Catalog; | | | 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 | public string Caption { get { string catalog = "main"; if (_table != null) catalog = _table.Catalog; return String.Format(CultureInfo.InvariantCulture, "{0}.{1} Table (SQLite [{2}])", catalog, base.Name, ((DbConnection)_connection.ConnectionSupport.ProviderObject).DataSource); } } public new string Name { get { |
︙ | ︙ | |||
504 505 506 507 508 509 510 | { Column oc = c; c = new Column(_table, newrow); int num = 1; while (String.IsNullOrEmpty(c.ColumnName) == true) { bool found = false; | | | 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 | { Column oc = c; c = new Column(_table, newrow); int num = 1; while (String.IsNullOrEmpty(c.ColumnName) == true) { bool found = false; string proposed = String.Format(CultureInfo.InvariantCulture, "{0}{1}", oc.ColumnName, num); foreach (Column cc in _table.Columns) { if (String.Compare(cc.ColumnName, proposed, StringComparison.OrdinalIgnoreCase) == 0) { found = true; break; } |
︙ | ︙ |
Changes to SQLite.Designer/Editors/ViewDesignerDoc.cs.
︙ | ︙ | |||
18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 | using Microsoft.VisualStudio.Shell.Interop; using Microsoft.VisualStudio.OLE.Interop; using Microsoft.VisualStudio; using Microsoft.VisualStudio.Data; using SQLite.Designer.Design; using System.ComponentModel.Design; using System.Runtime.InteropServices; public partial class ViewDesignerDoc : DesignerDocBase, IVsPersistDocData, IVsWindowPane, IOleCommandTarget, ISelectionContainer, IVsWindowPaneCommit, IVsWindowFrameNotify { private static Dictionary<int, string> _editingTables = new Dictionary<int, string>(); | > | | | | | | 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 | using Microsoft.VisualStudio.Shell.Interop; using Microsoft.VisualStudio.OLE.Interop; using Microsoft.VisualStudio; using Microsoft.VisualStudio.Data; using SQLite.Designer.Design; using System.ComponentModel.Design; using System.Runtime.InteropServices; using System.Globalization; public partial class ViewDesignerDoc : DesignerDocBase, IVsPersistDocData, IVsWindowPane, IOleCommandTarget, ISelectionContainer, IVsWindowPaneCommit, IVsWindowFrameNotify { private static Dictionary<int, string> _editingTables = new Dictionary<int, string>(); private bool _qdinit; private bool _init; internal DataConnection _connection; internal Microsoft.VisualStudio.Data.ServiceProvider _serviceProvider; internal bool _dirty; internal UserControl _queryDesigner; internal Type _typeQB; internal SQLite.Designer.Design.View _view; internal IOleCommandTarget _qbole; internal IOleInPlaceActiveObject _qbbase; private IntPtr _qbsql; internal DataViewHierarchyAccessor _accessor; internal int _itemId; static private bool _warned; public delegate bool EnumWindowsCallback(IntPtr hwnd, IntPtr lParam); [DllImport("user32.Dll")] static extern bool EnumChildWindows(IntPtr parentHandle, EnumWindowsCallback callback, IntPtr lParam); [DllImport("user32.dll", CharSet = CharSet.Auto)] static extern int GetClassName(IntPtr hWnd, StringBuilder lpClassName, int nMaxCount); [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)] static extern int GetWindowText(IntPtr hWnd, StringBuilder lpString, int nMaxCount); |
︙ | ︙ | |||
99 100 101 102 103 104 105 | if (String.IsNullOrEmpty(viewName)) { string alltables = tables.ToString(); do { | | | 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 | if (String.IsNullOrEmpty(viewName)) { string alltables = tables.ToString(); do { viewName = String.Format(CultureInfo.InvariantCulture, "View{0}", n); n++; } while (alltables.IndexOf(viewName + ",", StringComparison.OrdinalIgnoreCase) > -1 || _editingTables.ContainsValue(viewName)); _editingTables.Add(GetHashCode(), viewName); } _view = new SQLite.Designer.Design.View(viewName, _connection.ConnectionSupport.ProviderObject as DbConnection, this); } |
︙ | ︙ | |||
141 142 143 144 145 146 147 | public string Caption { get { string catalog = "main"; if (_view != null) catalog = _view.Catalog; | | | 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 | public string Caption { get { string catalog = "main"; if (_view != null) catalog = _view.Catalog; return String.Format(CultureInfo.InvariantCulture, "{0}.{1} View (SQLite [{2}])", catalog, base.Name, ((DbConnection)_connection.ConnectionSupport.ProviderObject).DataSource); } } public override string CanonicalName { get { |
︙ | ︙ |