Added:
branches/6.0/MySql.Web/Providers/Properties/Resources.Designer.cs
Modified:
branches/6.0/CHANGES
branches/6.0/MySql.VisualStudio/DbObjects/Column.cs
branches/6.0/MySql.VisualStudio/DbObjects/ForeignKey.cs
branches/6.0/MySql.VisualStudio/DbObjects/Index.cs
branches/6.0/MySql.VisualStudio/DbObjects/Table.cs
branches/6.0/MySql.VisualStudio/DbObjects/TablePartCollection.cs
branches/6.0/MySql.VisualStudio/Editors/IndexColumnEditorDialog.cs
branches/6.0/MySql.VisualStudio/Editors/TextBufferEditor.cs
branches/6.0/MySql.VisualStudio/LanguageService/Tokenizer.cs
branches/6.0/MySql.VisualStudio/MySql.VisualStudio.csproj
branches/6.0/MySql.VisualStudio/Nodes/BaseNode.cs
branches/6.0/MySql.VisualStudio/Nodes/DocumentNode.cs
branches/6.0/MySql.Web/Providers/MySql.Web.csproj
Log:
fixed compilation on VS 2005 (bug #44822)
Modified: branches/6.0/CHANGES
===================================================================
--- branches/6.0/CHANGES 2009-05-15 14:15:05 UTC (rev 1603)
+++ branches/6.0/CHANGES 2009-05-15 14:15:29 UTC (rev 1604)
@@ -1,5 +1,6 @@
Version 6.0.4
- fixed regression where using stored procs with datasets (bug #44460)
+- fixed compilation under VS 2005 (bug #44822)
Version 6.0.3 - 4/22/09
- fixed broken connection prompting
@@ -35,6 +36,17 @@
- fixed membership provider so that calling GetPassword with an incorrect password will throw the appropriate exception (bug #38939)
- Implemented initial entity framework support
+Version 5.2.7
+- fixed procedure parameters collection so that an exception is thrown if we can't get the
+ parameters. Also used this to optimize the procedure cache optimization
+- Added "nvarchar" and "nchar" to possible data types returned by the DataSourceInformation
+ schema collection so procs that use those types with parameters will work (bug #39409)
+- fixed problem where the connector would incorrectly report the length of utf8 columns on servers
+ 6.0 and later. This was caused by 6.0 now using 4 bytes for utf8 columns
+- fixed bug in role provider that was causing it to not correctly fetch the application
+ id which caused it to incorrectly report roles (bug #44414)
+- fixed Visual Studio 2005 solution so that it builds
+
Version 5.2.6
- cleaned up how stored procedure execution operated when the user does or does not have execute privs
on the routine (bug #40139)
Modified: branches/6.0/MySql.VisualStudio/DbObjects/Column.cs
===================================================================
--- branches/6.0/MySql.VisualStudio/DbObjects/Column.cs 2009-05-15 14:15:05 UTC (rev 1603)
+++ branches/6.0/MySql.VisualStudio/DbObjects/Column.cs 2009-05-15 14:15:29 UTC (rev 1604)
@@ -48,52 +48,98 @@
#region Properties
[Browsable(false)]
- internal Table OwningTable { get; set; }
+ internal Table OwningTable;
+ private string _columnName;
[Category("General")]
[Description("The name of this column")]
- public string ColumnName { get; set; }
+ public string ColumnName
+ {
+ get { return _columnName; }
+ set { _columnName = value; }
+ }
+ private string _dataType;
[Category("General")]
[DisplayName("Data Type")]
[TypeConverter(typeof(DataTypeConverter))]
[RefreshProperties(RefreshProperties.All)]
- public string DataType { get; set; }
+ public string DataType
+ {
+ get { return _dataType; }
+ set { _dataType = value; }
+ }
+ private bool _allowNull;
[TypeConverter(typeof(YesNoTypeConverter))]
[Category("Options")]
[DisplayName("Allow Nulls")]
- public bool AllowNull { get; set; }
+ public bool AllowNull
+ {
+ get { return _allowNull; }
+ set { _allowNull = value; }
+ }
+ private bool _isUnsigned;
[TypeConverter(typeof(YesNoTypeConverter))]
[Category("Options")]
[DisplayName("Is Unsigned")]
- public bool IsUnsigned { get; set; }
+ public bool IsUnsigned
+ {
+ get { return _isUnsigned; }
+ set { _isUnsigned = value; }
+ }
+ private bool _isZeroFill;
[TypeConverter(typeof(YesNoTypeConverter))]
[Category("Options")]
[DisplayName("Is Zerofill")]
- public bool IsZerofill { get; set; }
+ public bool IsZerofill
+ {
+ get { return _isZeroFill; }
+ set { _isZeroFill = value; }
+ }
+ private string _defaultValue;
[Category("General")]
[DisplayName("Default Value")]
- public string DefaultValue { get; set; }
+ public string DefaultValue
+ {
+ get { return _defaultValue; }
+ set { _defaultValue = value; }
+ }
+ private bool _autoIncrement;
[TypeConverter(typeof(YesNoTypeConverter))]
[Category("Options")]
[DisplayName("Autoincrement")]
- public bool AutoIncrement { get; set; }
+ public bool AutoIncrement
+ {
+ get { return _autoIncrement; }
+ set { _autoIncrement = value; }
+ }
//[TypeConverter(typeof(YesNoTypeConverter))]
//[Category("Options")]
//[DisplayName("Primary Key")]
//[RefreshProperties(RefreshProperties.All)]
[Browsable(false)]
- public bool PrimaryKey { get; set; }
+ public bool PrimaryKey;
- public int Precision { get; set; }
- public int Scale { get; set; }
+ private int _precision;
+ public int Precision
+ {
+ get { return _precision; }
+ set { _precision = value; }
+ }
+ private int _scale;
+ public int Scale
+ {
+ get { return _scale; }
+ set { _scale = value; }
+ }
+
[Category("Encoding")]
[DisplayName("Character Set")]
[TypeConverter(typeof(CharacterSetTypeConverter))]
@@ -108,12 +154,22 @@
}
}
+ private string _collation;
[Category("Encoding")]
[TypeConverter(typeof(CollationTypeConverter))]
- public string Collation { get; set; }
+ public string Collation
+ {
+ get { return _collation; }
+ set { _collation = value; }
+ }
+ private string _comment;
[Category("Miscellaneous")]
- public string Comment { get; set; }
+ public string Comment
+ {
+ get { return _comment; }
+ set { _comment = value; }
+ }
#endregion
Modified: branches/6.0/MySql.VisualStudio/DbObjects/ForeignKey.cs
===================================================================
--- branches/6.0/MySql.VisualStudio/DbObjects/ForeignKey.cs 2009-05-15 14:15:05 UTC (rev 1603)
+++ branches/6.0/MySql.VisualStudio/DbObjects/ForeignKey.cs 2009-05-15 14:15:29 UTC (rev 1604)
@@ -25,6 +25,7 @@
{
bool isNew;
ForeignKey oldFk;
+ Table Table;
private ForeignKey(Table t)
{
@@ -67,19 +68,54 @@
}
}
- private Table Table { get; set; }
- public string Name { get; set; }
- public string ReferencedTable { get; set; }
- public MatchOption Match { get; set; }
- public ReferenceOption UpdateAction { get; set; }
- public ReferenceOption DeleteAction { get; set; }
- public List<FKColumnPair> Columns { get; set; }
+ private string _name;
+ public string Name
+ {
+ get { return _name; }
+ set { _name = value; }
+ }
+ private string _referencedTable;
+ public string ReferencedTable
+ {
+ get { return _referencedTable; }
+ set { _referencedTable = value; }
+ }
+
+ private MatchOption _match;
+ public MatchOption Match
+ {
+ get { return _match; }
+ set { _match = value; }
+ }
+
+ private ReferenceOption _updateAction;
+ public ReferenceOption UpdateAction
+ {
+ get { return _updateAction; }
+ set { _updateAction = value; }
+ }
+
+ private ReferenceOption _deleteAction;
+ public ReferenceOption DeleteAction
+ {
+ get { return _deleteAction; }
+ set { _deleteAction = value; }
+ }
+
+ private List<FKColumnPair> _columns;
+ public List<FKColumnPair> Columns
+ {
+ get { return _columns; }
+ set { _columns = value; }
+ }
+
+ public bool NameSet;
+
public override string ToString()
{
return Name;
}
- public bool NameSet { get; set; }
public void SetName(string name, bool makeUnique)
{
@@ -207,7 +243,7 @@
class FKColumnPair
{
- public string ReferencedColumn { get; set; }
- public string Column { get; set; }
+ public string ReferencedColumn;
+ public string Column;
}
}
Modified: branches/6.0/MySql.VisualStudio/DbObjects/Index.cs
===================================================================
--- branches/6.0/MySql.VisualStudio/DbObjects/Index.cs 2009-05-15 14:15:05 UTC (rev 1603)
+++ branches/6.0/MySql.VisualStudio/DbObjects/Index.cs 2009-05-15 14:15:29 UTC (rev 1604)
@@ -96,14 +96,24 @@
get { return table; }
}
+ private string _name;
[Category("Identity")]
[DisplayName("(Name)")]
[Description("The name of this index/key")]
- public string Name { get; set; }
+ public string Name
+ {
+ get { return _name; }
+ set { _name = value; }
+ }
+ private string _comment;
[Category("Identity")]
[Description("A description or comment about this index/key")]
- public string Comment { get; set; }
+ public string Comment
+ {
+ get { return _comment; }
+ set { _comment = value; }
+ }
[Category("(General)")]
[Description("The columns of this index/key and their associated sort order")]
@@ -114,43 +124,83 @@
get { return indexColumns; }
}
+ private IndexType _indexType;
[Category("(General)")]
[Description("Specifies if this object is an index or key")]
- public IndexType Type { get; set; }
+ public IndexType Type
+ {
+ get { return _indexType; }
+ set { _indexType = value; }
+ }
+ private bool _isUnique;
[Category("(General)")]
[DisplayName("Is Unique")]
[Description("Specifies if this index/key uniquely identifies every row")]
[TypeConverter(typeof(YesNoTypeConverter))]
- public bool IsUnique { get; set; }
+ public bool IsUnique
+ {
+ get { return _isUnique; }
+ set { _isUnique = value; }
+ }
+ private bool _isPrimary;
[Browsable(false)]
- public bool IsPrimary { get; set; }
+ public bool IsPrimary
+ {
+ get { return _isPrimary; }
+ set { _isPrimary = value; }
+ }
+ private IndexUsingType _indexUsing;
[Category("Storage")]
[DisplayName("Index Algorithm")]
[Description("Specifies the algorithm that should be used for storing the index/key")]
- public IndexUsingType IndexUsing { get; set; }
+ public IndexUsingType IndexUsing
+ {
+ get { return _indexUsing; }
+ set { _indexUsing = value; }
+ }
+ private int _keyBlockSize;
[Category("Storage")]
[DisplayName("Key Block Size")]
[Description("Suggested size in bytes to use for index key blocks. A zero value means to use the storage engine default.")]
- public int KeyBlockSize { get; set; }
+ public int KeyBlockSize
+ {
+ get { return _keyBlockSize; }
+ set { _keyBlockSize = value; }
+ }
+ private string _parser;
[Description("Specifies a parser plugin to be used for this index/key. This is only valid for full-text indexes or keys.")]
- public string Parser { get; set; }
+ public string Parser
+ {
+ get { return _parser; }
+ set { _parser = value; }
+ }
+ private bool _fullText;
[DisplayName("Is Full-text Index/Key")]
[Description("Specifies if this is a full-text index or key. This is only supported on MyISAM tables.")]
[TypeConverter(typeof(YesNoTypeConverter))]
[RefreshProperties(RefreshProperties.All)]
- public bool FullText { get; set; }
+ public bool FullText
+ {
+ get { return _fullText; }
+ set { _fullText = value; }
+ }
+ private bool _spatial;
[DisplayName("Is Spatial Index/Key")]
[Description("Specifies if this is a spatial index or key. This is only supported on MyISAM tables.")]
[TypeConverter(typeof(YesNoTypeConverter))]
[RefreshProperties(RefreshProperties.All)]
- public bool Spatial { get; set; }
+ public bool Spatial
+ {
+ get { return _spatial; }
+ set { _spatial = value; }
+ }
#endregion
@@ -382,8 +432,8 @@
class IndexColumn
{
- public Index OwningIndex { get; set; }
- public string ColumnName { get; set; }
- public IndexSortOrder SortOrder { get; set; }
+ public Index OwningIndex;
+ public string ColumnName;
+ public IndexSortOrder SortOrder;
}
}
Modified: branches/6.0/MySql.VisualStudio/DbObjects/Table.cs
===================================================================
--- branches/6.0/MySql.VisualStudio/DbObjects/Table.cs 2009-05-15 14:15:05 UTC (rev 1603)
+++ branches/6.0/MySql.VisualStudio/DbObjects/Table.cs 2009-05-15 14:15:29 UTC (rev 1604)
@@ -38,7 +38,7 @@
}
internal class Table : ICustomTypeDescriptor
- {
+ {
private TableNode owningNode;
internal Table OldTable;
private string characterSet;
@@ -85,14 +85,37 @@
ForeignKeys.Saved();
}
+ private bool _isNew;
[Browsable(false)]
- public bool IsNew { get; private set; }
+ public bool IsNew
+ {
+ get { return _isNew; }
+ private set { _isNew = value; }
+ }
+
+ private TablePartCollection<Column> _columns;
[Browsable(false)]
- public TablePartCollection<Column> Columns { get; private set; }
+ public TablePartCollection<Column> Columns
+ {
+ get { return _columns; }
+ private set { _columns = value; }
+ }
+
+ private TablePartCollection<Index> _indexes;
[Browsable(false)]
- public TablePartCollection<Index> Indexes { get; private set; }
+ public TablePartCollection<Index> Indexes
+ {
+ get { return _indexes; }
+ private set { _indexes = value; }
+ }
+
+ private TablePartCollection<ForeignKey> _foreignKeys;
[Browsable(false)]
- public TablePartCollection<ForeignKey> ForeignKeys { get; private set; }
+ public TablePartCollection<ForeignKey> ForeignKeys
+ {
+ get { return _foreignKeys; }
+ private set { _foreignKeys = value; }
+ }
internal TableNode OwningNode
{
@@ -110,16 +133,31 @@
#region Table options
+ private string _name;
[Category("(Identity)")]
[MyDescription("TableNameDesc")]
- public string Name { get; set; }
+ public string Name
+ {
+ get { return _name; }
+ set { _name = value; }
+ }
+ private string _schema;
[Category("(Identity)")]
[MyDescription("TableSchemaDesc")]
- public string Schema { get; private set; }
+ public string Schema
+ {
+ get { return _schema; }
+ private set { _schema = value; }
+ }
+ private string _comment;
[MyDescription("TableCommentDesc")]
- public string Comment { get; set; }
+ public string Comment
+ {
+ get { return _comment; }
+ set { _comment = value; }
+ }
[Category("Table Options")]
[DisplayName("Character Set")]
@@ -137,88 +175,153 @@
}
}
+ private string _collation;
[Category("Table Options")]
[DisplayName("Collation")]
[TypeConverter(typeof(CollationTypeConverter))]
[MyDescription("TableCollationDesc")]
- public string Collation { get; set; }
+ public string Collation
+ {
+ get { return _collation; }
+ set { _collation = value; }
+ }
+ private ulong _autoInc;
[Category("Table")]
[DisplayName("Auto Increment")]
[MyDescription("TableAutoIncStartDesc")]
- public ulong AutoInc { get; set; }
+ public ulong AutoInc
+ {
+ get { return _autoInc; }
+ set { _autoInc = value; }
+ }
#endregion
#region Storage options
+ private string _engine;
[Category("Storage")]
[DisplayName("Storage Engine")]
[MyDescription("TableEngineDescription")]
[TypeConverter(typeof(TableEngineTypeConverter))]
[RefreshProperties(RefreshProperties.All)]
- public string Engine { get; set; }
+ public string Engine
+ {
+ get { return _engine; }
+ set { _engine = value; }
+ }
+ private string _dataDirectory;
[Category("Storage")]
[DisplayName("Data Directory")]
[MyDescription("TableDataDirDesc")]
- public string DataDirectory { get; set; }
+ public string DataDirectory
+ {
+ get { return _dataDirectory; }
+ set { _dataDirectory = value; }
+ }
+ private string _indexDirectory;
[Category("Storage")]
[DisplayName("Index Directory")]
[MyDescription("TableIndexDirDesc")]
- public string IndexDirectory { get; set; }
+ public string IndexDirectory
+ {
+ get { return _indexDirectory; }
+ set { _indexDirectory = value; }
+ }
#endregion
#region Row options
+ private RowFormat _rowFormat;
[Category("Row")]
[DisplayName("Row Format")]
[MyDescription("TableRowFormatDesc")]
- public RowFormat RowFormat { get; set; }
+ public RowFormat RowFormat
+ {
+ get { return _rowFormat; }
+ set { _rowFormat = value; }
+ }
+ private bool _checkSum;
[Category("Row")]
[DisplayName("Compute Checksum")]
[MyDescription("TableCheckSumDesc")]
[DefaultValue(false)]
[TypeConverter(typeof(YesNoTypeConverter))]
- public bool CheckSum { get; set; }
+ public bool CheckSum
+ {
+ get { return _checkSum; }
+ set { _checkSum = value; }
+ }
+ private ulong _avgRowLength;
[Category("Row")]
[DisplayName("Average Row Length")]
[MyDescription("TableAvgRowLengthDesc")]
[TypeConverter(typeof(NumericTypeConverter))]
- public ulong AvgRowLength { get; set; }
+ public ulong AvgRowLength
+ {
+ get { return _avgRowLength; }
+ set { _avgRowLength = value; }
+ }
+ private ulong _minRows;
[Category("Row")]
[DisplayName("Minimum Rows")]
[MyDescription("TableMinRowsDesc")]
[TypeConverter(typeof(NumericTypeConverter))]
- public ulong MinRows { get; set; }
+ public ulong MinRows
+ {
+ get { return _minRows; }
+ set { _minRows = value; }
+ }
+ private UInt64 _maxRows;
[Category("Row")]
[DisplayName("Maximum Rows")]
[MyDescription("TableMaxRowsDesc")]
[TypeConverter(typeof(NumericTypeConverter))]
- public UInt64 MaxRows { get; set; }
+ public UInt64 MaxRows
+ {
+ get { return _maxRows; }
+ set { _maxRows = value; }
+ }
+ private PackKeysMethod _packKeys;
[Category("Row")]
[DisplayName("Pack Keys")]
[MyDescription("TablePackKeysDesc")]
[DefaultValue(PackKeysMethod.Default)]
- public PackKeysMethod PackKeys { get; set; }
+ public PackKeysMethod PackKeys
+ {
+ get { return _packKeys; }
+ set { _packKeys = value; }
+ }
+ private InsertMethod _insertMethod;
[Category("Row")]
[DisplayName("Insert method")]
[MyDescription("TableInsertMethodDesc")]
[DefaultValue(InsertMethod.First)]
- public InsertMethod InsertMethod { get; set; }
+ public InsertMethod InsertMethod
+ {
+ get { return _insertMethod; }
+ set { _insertMethod = value; }
+ }
+ private bool _delayKeyWrite;
[Category("Row")]
[DisplayName("Delay Key Write")]
[MyDescription("DelayKeyWriteDesc")]
- public bool DelayKeyWrite { get; set; }
+ public bool DelayKeyWrite
+ {
+ get { return _delayKeyWrite; }
+ set { _delayKeyWrite = value; }
+ }
#endregion
Modified: branches/6.0/MySql.VisualStudio/DbObjects/TablePartCollection.cs
===================================================================
--- branches/6.0/MySql.VisualStudio/DbObjects/TablePartCollection.cs 2009-05-15 14:15:05 UTC (rev 1603)
+++ branches/6.0/MySql.VisualStudio/DbObjects/TablePartCollection.cs 2009-05-15 14:15:29 UTC (rev 1604)
@@ -36,7 +36,12 @@
Deleted = new List<T>();
}
- public List<T> Deleted { get; private set; }
+ private List<T> _deleted;
+ public List<T> Deleted
+ {
+ get { return _deleted; }
+ private set { _deleted = value; }
+ }
public void Delete(T t)
{
Modified: branches/6.0/MySql.VisualStudio/Editors/IndexColumnEditorDialog.cs
===================================================================
--- branches/6.0/MySql.VisualStudio/Editors/IndexColumnEditorDialog.cs 2009-05-15 14:15:05 UTC (rev 1603)
+++ branches/6.0/MySql.VisualStudio/Editors/IndexColumnEditorDialog.cs 2009-05-15 14:15:29 UTC (rev 1604)
@@ -198,8 +198,19 @@
public class IndexColumnGridRow
{
- public string ColumnName { get; set; }
- public string SortOrder { get; set; }
+ private string _columnName;
+ public string ColumnName
+ {
+ get { return _columnName; }
+ set { _columnName = value; }
+ }
+
+ private string _sortOrder;
+ public string SortOrder
+ {
+ get { return _sortOrder; }
+ set { _sortOrder = value; }
+ }
}
}
Modified: branches/6.0/MySql.VisualStudio/Editors/TextBufferEditor.cs
===================================================================
--- branches/6.0/MySql.VisualStudio/Editors/TextBufferEditor.cs 2009-05-15 14:15:05 UTC (rev 1603)
+++ branches/6.0/MySql.VisualStudio/Editors/TextBufferEditor.cs 2009-05-15 14:15:29 UTC (rev 1604)
@@ -33,9 +33,20 @@
CreateCodeEditor();
}
- public IVsCodeWindow CodeWindow { get; private set; }
- public IVsTextBuffer TextBuffer { get; private set; }
+ private IVsCodeWindow _codeWindow;
+ public IVsCodeWindow CodeWindow
+ {
+ get { return _codeWindow; }
+ private set { _codeWindow = value; }
+ }
+ private IVsTextBuffer _textBuffer;
+ public IVsTextBuffer TextBuffer
+ {
+ get { return _textBuffer; }
+ private set { _textBuffer = value; }
+ }
+
private void CreateCodeEditor()
{
Guid clsidTextBuffer = typeof(VsTextBufferClass).GUID;
Modified: branches/6.0/MySql.VisualStudio/LanguageService/Tokenizer.cs
===================================================================
--- branches/6.0/MySql.VisualStudio/LanguageService/Tokenizer.cs 2009-05-15 14:15:05 UTC (rev 1603)
+++ branches/6.0/MySql.VisualStudio/LanguageService/Tokenizer.cs 2009-05-15 14:15:29 UTC (rev 1604)
@@ -23,7 +23,18 @@
class Tokenizer
{
private string text;
+ private int Pos;
+ private string LastToken;
+ private int _startIndex;
+ private int _stopIndex;
+ private bool _lineComment;
+ private bool _quoted;
+ public bool AnsiQuotes;
+ public bool BackslashEscapes;
+ public bool ReturnComments;
+ public bool BlockComment;
+
#region Properties
public string Text
@@ -32,17 +43,30 @@
set { text = value; Pos = 0; }
}
- public bool AnsiQuotes { get; set; }
- public bool BackslashEscapes { get; set; }
- public int StartIndex { get; private set; }
- public int StopIndex { get; private set; }
- public bool ReturnComments { get; set; }
- public bool LineComment { get; private set; }
- public bool BlockComment { get; set; }
- public bool Quoted { get; private set; }
- private int Pos { get; set; }
- private string LastToken { get; set; }
+ public int StartIndex
+ {
+ get { return _startIndex; }
+ private set { _startIndex = value; }
+ }
+ public int StopIndex
+ {
+ get { return _stopIndex; }
+ private set { _stopIndex = value; }
+ }
+
+ public bool LineComment
+ {
+ get { return _lineComment; }
+ private set { _lineComment = value; }
+ }
+
+ public bool Quoted
+ {
+ get { return _quoted; }
+ private set { _quoted = value; }
+ }
+
#endregion
Modified: branches/6.0/MySql.VisualStudio/MySql.VisualStudio.csproj
===================================================================
--- branches/6.0/MySql.VisualStudio/MySql.VisualStudio.csproj 2009-05-15 14:15:05 UTC (rev 1603)
+++ branches/6.0/MySql.VisualStudio/MySql.VisualStudio.csproj 2009-05-15 14:15:29 UTC (rev 1604)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
+ <ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
@@ -11,7 +11,7 @@
<SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
- <ProjectGuid>{E7E48744-7BB3-463E-9A9A-7B4553D79C0E}</ProjectGuid>
+ <ProjectGuid>{DC3517FF-AC26-4755-9B7A-EF658FF69593}</ProjectGuid>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>2.0</OldToolsVersion>
Modified: branches/6.0/MySql.VisualStudio/Nodes/BaseNode.cs
===================================================================
--- branches/6.0/MySql.VisualStudio/Nodes/BaseNode.cs 2009-05-15 14:15:05 UTC (rev 1603)
+++ branches/6.0/MySql.VisualStudio/Nodes/BaseNode.cs 2009-05-15 14:15:29 UTC (rev 1604)
@@ -42,6 +42,8 @@
protected Guid commandGroupGuid;
protected string name;
private static string defaultStorageEngine;
+ public DataViewHierarchyAccessor HierarchyAccessor;
+ public bool IsNew;
public BaseNode(DataViewHierarchyAccessor hierarchyAccessor, int id)
{
@@ -81,20 +83,52 @@
}
}
- public bool IsNew { get; set; }
- public int ItemId { get; protected set; }
- public string NodeId { get; protected set; }
- public DataViewHierarchyAccessor HierarchyAccessor { get; set; }
- public string Server { get; private set; }
- public string Database { get; private set; }
- public virtual bool Dirty { get; protected set; }
+ private int _itemId;
+ public int ItemId
+ {
+ get { return _itemId; }
+ protected set { _itemId = value; }
+ }
+ private string _nodeId;
+ public string NodeId
+ {
+ get { return _nodeId; }
+ protected set { _nodeId = value; }
+ }
+
+ private string _server;
+ public string Server
+ {
+ get { return _server; }
+ private set { _server = value; }
+ }
+
+ private string _database;
+ public string Database
+ {
+ get { return _database; }
+ private set { _database = value; }
+ }
+
+ private bool _dirty;
+ public virtual bool Dirty
+ {
+ get { return _dirty; }
+ protected set { _dirty = value; }
+ }
+
protected string Moniker
{
get { return String.Format("mysql://{0}/{1}/{2}", Server, Database, Name); }
}
- public int NameIndex { get; protected set; }
+ private int _nameIndex;
+ public int NameIndex
+ {
+ get { return _nameIndex; }
+ protected set { _nameIndex = value; }
+ }
public virtual string SchemaCollection
{
Modified: branches/6.0/MySql.VisualStudio/Nodes/DocumentNode.cs
===================================================================
--- branches/6.0/MySql.VisualStudio/Nodes/DocumentNode.cs 2009-05-15 14:15:05 UTC (rev 1603)
+++ branches/6.0/MySql.VisualStudio/Nodes/DocumentNode.cs 2009-05-15 14:15:29 UTC (rev 1604)
@@ -42,12 +42,8 @@
{
}
- #region Properties
+ private uint DocumentCookie;
- private uint DocumentCookie { get; set; }
-
- #endregion
-
protected abstract void Load();
public abstract string GetSaveSql();
protected abstract string GetCurrentName();
Modified: branches/6.0/MySql.Web/Providers/MySql.Web.csproj
===================================================================
--- branches/6.0/MySql.Web/Providers/MySql.Web.csproj 2009-05-15 14:15:05 UTC (rev 1603)
+++ branches/6.0/MySql.Web/Providers/MySql.Web.csproj 2009-05-15 14:15:29 UTC (rev 1604)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
+ <ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{C28B1166-1380-445D-AEC1-8A18B990DD18}</ProjectGuid>
<OutputType>Library</OutputType>
Copied: branches/6.0/MySql.Web/Providers/Properties/Resources.Designer.cs (from rev 1602, branches/5.2/MySql.Web/Providers/Properties/Resources.Designer.cs)
===================================================================
--- branches/6.0/MySql.Web/Providers/Properties/Resources.Designer.cs (rev 0)
+++ branches/6.0/MySql.Web/Providers/Properties/Resources.Designer.cs 2009-05-15 14:15:29 UTC (rev 1604)
@@ -0,0 +1,459 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Runtime Version:2.0.50727.3082
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace MySql.Web.Properties {
+ using System;
+
+
+ /// <summary>
+ /// A strongly-typed resource class, for looking up localized strings, etc.
+ /// </summary>
+ // This class was auto-generated by the StronglyTypedResourceBuilder
+ // class via a tool like ResGen or Visual Studio.
+ // To add or remove a member, edit your .ResX file then rerun ResGen
+ // with the /str option, or rebuild your VS project.
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ public class Resources {
+
+ private static global::System.Resources.ResourceManager resourceMan;
+
+ private static global::System.Globalization.CultureInfo resourceCulture;
+
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ internal Resources() {
+ }
+
+ /// <summary>
+ /// Returns the cached ResourceManager instance used by this class.
+ /// </summary>
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ public static global::System.Resources.ResourceManager ResourceManager {
+ get {
+ if (object.ReferenceEquals(resourceMan, null)) {
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MySql.Web.Properties.Resources", typeof(Resources).Assembly);
+ resourceMan = temp;
+ }
+ return resourceMan;
+ }
+ }
+
+ /// <summary>
+ /// Overrides the current thread's CurrentUICulture property for all
+ /// resource lookups using this strongly typed resource class.
+ /// </summary>
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ public static global::System.Globalization.CultureInfo Culture {
+ get {
+ return resourceCulture;
+ }
+ set {
+ resourceCulture = value;
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Cannot delete a populated role..
+ /// </summary>
+ public static string CannotDeleteAPopulatedRole {
+ get {
+ return ResourceManager.GetString("CannotDeleteAPopulatedRole", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Setting EnablePasswordRetrieval to true when PasswordFormat is Hashed is not supported..
+ /// </summary>
+ public static string CannotRetrieveHashedPasswords {
+ get {
+ return ResourceManager.GetString("CannotRetrieveHashedPasswords", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Cannot unencode a hashed password..
+ /// </summary>
+ public static string CannotUnencodeHashedPwd {
+ get {
+ return ResourceManager.GetString("CannotUnencodeHashedPwd", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Change password operation was canceled..
+ /// </summary>
+ public static string ChangePasswordCanceled {
+ get {
+ return ResourceManager.GetString("ChangePasswordCanceled", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to There was an error during membership provider initilization..
+ /// </summary>
+ public static string ErrorInitOfMembershipProvider {
+ get {
+ return ResourceManager.GetString("ErrorInitOfMembershipProvider", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to There was an error during role provider initilization..
+ /// </summary>
+ public static string ErrorInitOfRoleProvider {
+ get {
+ return ResourceManager.GetString("ErrorInitOfRoleProvider", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to There was an error during profile provider initilization..
+ /// </summary>
+ public static string ErrorInitProfileProvider {
+ get {
+ return ResourceManager.GetString("ErrorInitProfileProvider", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to There was an error resetting the password..
+ /// </summary>
+ public static string ErrorResettingPassword {
+ get {
+ return ResourceManager.GetString("ErrorResettingPassword", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Role names must not be null or empty..
+ /// </summary>
+ public static string IllegalRoleName {
+ get {
+ return ResourceManager.GetString("IllegalRoleName", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to User names must not be null or empty..
+ /// </summary>
+ public static string IllegalUserName {
+ get {
+ return ResourceManager.GetString("IllegalUserName", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Incorrect password answer..
+ /// </summary>
+ public static string IncorrectPasswordAnswer {
+ get {
+ return ResourceManager.GetString("IncorrectPasswordAnswer", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Invalid characters in user name..
+ /// </summary>
+ public static string InvalidCharactersInUserName {
+ get {
+ return ResourceManager.GetString("InvalidCharactersInUserName", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Unable to initialize provider. Missing or incorrect schema..
+ /// </summary>
+ public static string MissingOrWrongSchema {
+ get {
+ return ResourceManager.GetString("MissingOrWrongSchema", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to The mono runtime did not support hashed passwords. Please use clear or encrypted passwords..
+ /// </summary>
+ public static string MonoDoesNotSupportHash {
+ get {
+ return ResourceManager.GetString("MonoDoesNotSupportHash", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Change password canceled due to New password validation failure..
+ /// </summary>
+ public static string NewPasswordValidationFailed {
+ get {
+ return ResourceManager.GetString("NewPasswordValidationFailed", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Non alpha numeric characters in '{0}' needs to be greater than or equal to '{1}'..
+ /// </summary>
+ public static string NotEnoughNonAlphaNumericInPwd {
+ get {
+ return ResourceManager.GetString("NotEnoughNonAlphaNumericInPwd", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Password answer supplied is invalid..
+ /// </summary>
+ public static string PasswordAnswerInvalid {
+ get {
+ return ResourceManager.GetString("PasswordAnswerInvalid", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to The length of parameter '{0}' needs to be greater or equal to '{1}'..
+ /// </summary>
+ public static string PasswordNotLongEnough {
+ get {
+ return ResourceManager.GetString("PasswordNotLongEnough", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Password question supplied is invalid..
+ /// </summary>
+ public static string PasswordQuestionInvalid {
+ get {
+ return ResourceManager.GetString("PasswordQuestionInvalid", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Password answer required for password reset..
+ /// </summary>
+ public static string PasswordRequiredForReset {
+ get {
+ return ResourceManager.GetString("PasswordRequiredForReset", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Reset password canceled due to password validation failure..
+ /// </summary>
+ public static string PasswordResetCanceledNotValid {
+ get {
+ return ResourceManager.GetString("PasswordResetCanceledNotValid", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Password Reset is not enabled..
+ /// </summary>
+ public static string PasswordResetNotEnabled {
+ get {
+ return ResourceManager.GetString("PasswordResetNotEnabled", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Password Retrieval Not Enabled..
+ /// </summary>
+ public static string PasswordRetrievalNotEnabled {
+ get {
+ return ResourceManager.GetString("PasswordRetrievalNotEnabled", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Profile update failed..
+ /// </summary>
+ public static string ProfileUpdateFailed {
+ get {
+ return ResourceManager.GetString("ProfileUpdateFailed", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Role name already exists..
+ /// </summary>
+ public static string RoleNameAlreadyExists {
+ get {
+ return ResourceManager.GetString("RoleNameAlreadyExists", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Role name not found..
+ /// </summary>
+ public static string RoleNameNotFound {
+ get {
+ return ResourceManager.GetString("RoleNameNotFound", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to CREATE TABLE mysql_Membership(`PKID` varchar(36) NOT NULL,
+ /// Username varchar(255) NOT NULL,
+ /// ApplicationName varchar(255) NOT NULL,
+ /// Email varchar(128) NOT NULL,
+ /// Comment varchar(255) default NULL,
+ /// Password varchar(128) NOT NULL,
+ /// PasswordQuestion varchar(255) default NULL,
+ /// PasswordAnswer varchar(255) default NULL,
+ /// IsApproved tinyint(1) default NULL,
+ /// LastActivityDate datetim [rest of string was truncated]";.
+ /// </summary>
+ public static string schema1 {
+ get {
+ return ResourceManager.GetString("schema1", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to ALTER TABLE mysql_Membership
+ /// ADD PasswordKey char(32) AFTER Password,
+ /// ADD PasswordFormat tinyint AFTER PasswordKey,
+ /// CHANGE Email Email VARCHAR(128), COMMENT='2';
+ ///
+ ///
+ /// .
+ /// </summary>
+ public static string schema2 {
+ get {
+ return ResourceManager.GetString("schema2", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to /* Provider schema block -- version 3 */
+ ///
+ ////* create our application and user tables */
+ ///create table my_aspnet_Applications(id INT PRIMARY KEY AUTO_INCREMENT, name VARCHAR(256), description VARCHAR(256));
+ ///create table my_aspnet_Users(id INT PRIMARY KEY AUTO_INCREMENT,
+ /// applicationId INT NOT NULL, name VARCHAR(256) NOT NULL,
+ /// isAnonymous TINYINT(1) NOT NULL DEFAULT 1, lastActivityDate DATETIME);
+ ///create table my_aspnet_Profiles(userId INT PRIMARY KEY, valueindex longtext, stringdata longtext, binary [rest of string was truncated]";.
+ /// </summary>
+ public static string schema3 {
+ get {
+ return ResourceManager.GetString("schema3", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to ALTER TABLE my_aspnet_Membership CONVERT TO CHARACTER SET DEFAULT;
+ ///ALTER TABLE my_aspnet_Roles CONVERT TO CHARACTER SET DEFAULT;
+ ///ALTER TABLE my_aspnet_UsersInRoles CONVERT TO CHARACTER SET DEFAULT;
+ ///
+ ///UPDATE my_aspnet_SchemaVersion SET version=4 WHERE version=3;
+ ///.
+ /// </summary>
+ public static string schema4 {
+ get {
+ return ResourceManager.GetString("schema4", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Unable to create application..
+ /// </summary>
+ public static string UnableToCreateApplication {
+ get {
+ return ResourceManager.GetString("UnableToCreateApplication", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Unable to create user..
+ /// </summary>
+ public static string UnableToCreateUser {
+ get {
+ return ResourceManager.GetString("UnableToCreateUser", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Unable to lock out user..
+ /// </summary>
+ public static string UnableToLockOutUser {
+ get {
+ return ResourceManager.GetString("UnableToLockOutUser", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Unable to retrieve profile data from database..
+ /// </summary>
+ public static string UnableToRetrieveProfileData {
+ get {
+ return ResourceManager.GetString("UnableToRetrieveProfileData", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Unable to update failure count. Membership database may be corrupt..
+ /// </summary>
+ public static string UnableToUpdateFailureCount {
+ get {
+ return ResourceManager.GetString("UnableToUpdateFailureCount", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Unsupported password format..
+ /// </summary>
+ public static string UnsupportedPasswordFormat {
+ get {
+ return ResourceManager.GetString("UnsupportedPasswordFormat", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to User is already in role..
+ /// </summary>
+ public static string UserIsAlreadyInRole {
+ get {
+ return ResourceManager.GetString("UserIsAlreadyInRole", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to The supplied user is locked out..
+ /// </summary>
+ public static string UserIsLockedOut {
+ get {
+ return ResourceManager.GetString("UserIsLockedOut", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Username not found..
+ /// </summary>
+ public static string UsernameNotFound {
+ get {
+ return ResourceManager.GetString("UsernameNotFound", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to User not in role..
+ /// </summary>
+ public static string UserNotInRole {
+ get {
+ return ResourceManager.GetString("UserNotInRole", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to The validate password operation was canceled..
+ /// </summary>
+ public static string ValidatePasswordCanceled {
+ get {
+ return ResourceManager.GetString("ValidatePasswordCanceled", resourceCulture);
+ }
+ }
+ }
+}
| Thread |
|---|
| • Connector/NET commit: r1604 - in branches/6.0: . MySql.VisualStudio MySql.VisualStudio/DbObjects MySql.VisualStudio/Editors MySql.VisualStudio/Languag... | rburnett | 15 May |
