Author: bmotmans
Date: 2008-01-29 09:50:04 -0500 (Tue, 29 Jan 2008)
New Revision: 94253
Modified:
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Firebird/ChangeLog
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Firebird/MonoDevelop.Database.Sql.Firebird.mdp
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/ChangeLog
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/NpgsqlSchemaProvider.cs
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/ChangeLog
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/SqlServerSchemaProvider.cs
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/ChangeLog
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/Makefile.am
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/MonoDevelop.Database.Sql.Sqlite.mdp
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql/ChangeLog
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql/Providers/AbstractSchemaProvider.cs
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql/Schema/DataTypeSchema.cs
Log:
* MonoDevelop.Database.Sql/Schema/DataTypeSchema.cs,
MonoDevelop.Database.Sql/Providers/AbstractSchemaProvider.cs:
renamed the "DataType" property to "DotNetType"
* MonoDevelop.Database.Sql.Sqlite/MonoDevelop.Database.Sql.Sqlite.mdp,
MonoDevelop.Database.Sql.Sqlite/Makefile.am: use a Gac reference
for Mono.Data.Sqlite
* MonoDevelop.Database.Sql.Npgsql/NpgsqlSchemaProvider.cs,
MonoDevelop.Database.Sql.SqlServer/SqlServerSchemaProvider.cs: Add
missing capability
* MonoDevelop.Database.Sql.Firebird/MonoDevelop.Database.Sql.Firebird.mdp:
removed the hard copy of the firebird .dll, use a pkg-config
reference when firebird is supported
Modified:
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql/ChangeLog
===================================================================
---
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql/ChangeLog
2008-01-29 14:49:14 UTC (rev 94252)
+++
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql/ChangeLog
2008-01-29 14:50:04 UTC (rev 94253)
@@ -1,5 +1,10 @@
2008-01-29 Ben Motmans <[EMAIL PROTECTED]>
+ * Schema/DataTypeSchema.cs, Providers/AbstractSchemaProvider.cs:
renamed the
+ "DataType" property to "DotNetType"
+
+2008-01-29 Ben Motmans <[EMAIL PROTECTED]>
+
* ConnectionPool/FakeConnectionPool.cs: throw NotSupportedExceptions
instead
of NotImplementedExceptions
* MonoDevelop.Database.Sql.addin.xml: changed the name of the addin
Modified:
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql/Providers/AbstractSchemaProvider.cs
===================================================================
---
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql/Providers/AbstractSchemaProvider.cs
2008-01-29 14:49:14 UTC (rev 94252)
+++
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql/Providers/AbstractSchemaProvider.cs
2008-01-29 14:50:04 UTC (rev 94253)
@@ -449,7 +449,7 @@
schema.LengthRange = new Range (GetRowInt (row,
dataTypeItemStrings[1]));
schema.CreateFormat = GetRowString (row,
dataTypeItemStrings[2]);
schema.CreateParameters = GetRowString (row,
dataTypeItemStrings[3]);
- schema.DataType = Type.GetType (GetRowString (row,
dataTypeItemStrings[4]), false, false);
+ schema.DotNetType = Type.GetType (GetRowString (row,
dataTypeItemStrings[4]), false, false);
schema.IsAutoincrementable = GetRowBool (row,
dataTypeItemStrings[5]);
schema.IsFixedLength = GetRowBool (row,
dataTypeItemStrings[6]);
schema.IsNullable = GetRowBool (row,
dataTypeItemStrings[7]);
Modified:
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql/Schema/DataTypeSchema.cs
===================================================================
---
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql/Schema/DataTypeSchema.cs
2008-01-29 14:49:14 UTC (rev 94252)
+++
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql/Schema/DataTypeSchema.cs
2008-01-29 14:50:04 UTC (rev 94253)
@@ -39,7 +39,7 @@
protected bool isFixedLength;
protected DataTypeCategory category;
- protected Type dataType;
+ protected Type dotNetType;
protected string createFormat;
protected string createParameters;
@@ -64,7 +64,7 @@
this.isAutoincrementable = dt.isAutoincrementable;
this.isFixedLength = dt.isFixedLength;
this.category = dt.category;
- this.dataType = dt.dataType;
+ this.dotNetType = dt.dotNetType;
this.createFormat = dt.createFormat;
this.createParameters = dt.createParameters;
this.lengthRange = new Range (dt.lengthRange);
@@ -160,11 +160,11 @@
}
}
- public Type DataType {
- get { return dataType; }
+ public Type DotNetType {
+ get { return dotNetType; }
set {
- if (dataType != value) {
- dataType = value;
+ if (dotNetType != value) {
+ dotNetType = value;
OnChanged();
}
}
@@ -233,39 +233,6 @@
}
}
- public virtual Type GetDotNetDataType ()
- {
- //TODO: improve detection based on the length/precision
of the DateTypeSchema
- switch (DataTypeCategory) {
- case DataTypeCategory.AutoNumber:
- case DataTypeCategory.Integer:
- return isNullable ? typeof (int?) : typeof
(int);
- case DataTypeCategory.Binary:
- case DataTypeCategory.VarBinary:
- return typeof (byte[]);
- case DataTypeCategory.Bit:
- case DataTypeCategory.Boolean:
- return isNullable ? typeof (bool?) : typeof
(bool);
- case DataTypeCategory.Char:
- case DataTypeCategory.NChar:
- case DataTypeCategory.VarChar:
- case DataTypeCategory.NVarChar:
- case DataTypeCategory.Xml:
- return typeof (string);
- case DataTypeCategory.Date:
- case DataTypeCategory.DateTime:
- case DataTypeCategory.Time:
- case DataTypeCategory.TimeStamp:
- return isNullable ? typeof (DateTime?) : typeof
(DateTime);
- case DataTypeCategory.Float:
- return isNullable ? typeof (double?) : typeof
(double);
- case DataTypeCategory.Uid:
- case DataTypeCategory.Other:
- default:
- return typeof (object);
- }
- }
-
public override object Clone ()
{
return new DataTypeSchema (this);
Modified:
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Firebird/ChangeLog
===================================================================
---
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Firebird/ChangeLog
2008-01-29 14:49:14 UTC (rev 94252)
+++
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Firebird/ChangeLog
2008-01-29 14:50:04 UTC (rev 94253)
@@ -1,3 +1,8 @@
+2008-01-29 Ben Motmans <[EMAIL PROTECTED]>
+
+ * MonoDevelop.Database.Sql.Firebird.mdp: removed the hard copy of the
+ firebird .dll, use a pkg-config reference when firebird is supported
+
2008-01-25 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* MonoDevelop.Database.Sql.Firebird.addin.xml: Update MD version.
Modified:
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Firebird/MonoDevelop.Database.Sql.Firebird.mdp
===================================================================
---
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Firebird/MonoDevelop.Database.Sql.Firebird.mdp
2008-01-29 14:49:14 UTC (rev 94252)
+++
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Firebird/MonoDevelop.Database.Sql.Firebird.mdp
2008-01-29 14:50:04 UTC (rev 94253)
@@ -23,7 +23,6 @@
<References>
<ProjectReference type="Gac" localcopy="True" refto="System,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<ProjectReference type="Gac" localcopy="True" refto="System.Data,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <ProjectReference type="Assembly" localcopy="True"
refto="../../contrib/FirebirdSql.Data.Firebird.dll" />
<ProjectReference type="Project" localcopy="False"
refto="MonoDevelop.Database.Sql" />
</References>
<Deployment.LinuxDeployData generatePcFile="False" />
Modified:
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/ChangeLog
===================================================================
---
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/ChangeLog
2008-01-29 14:49:14 UTC (rev 94252)
+++
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/ChangeLog
2008-01-29 14:50:04 UTC (rev 94253)
@@ -1,5 +1,9 @@
2008-01-29 Ben Motmans <[EMAIL PROTECTED]>
+ * NpgsqlSchemaProvider.cs: Add missing capability
+
+2008-01-29 Ben Motmans <[EMAIL PROTECTED]>
+
* gtk-gui,
gtk-gui/MonoDevelop.Database.Sql.Npgsql.NpgsqlCreateDatabaseWidget.cs,
gtk-gui/generated.cs, gtk-gui/objects.xml,
Modified:
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/NpgsqlSchemaProvider.cs
===================================================================
---
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/NpgsqlSchemaProvider.cs
2008-01-29 14:49:14 UTC (rev 94252)
+++
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/NpgsqlSchemaProvider.cs
2008-01-29 14:50:04 UTC (rev 94253)
@@ -42,6 +42,7 @@
AddSupportedSchemaActions (SchemaType.Database,
SchemaActions.All);
AddSupportedSchemaActions (SchemaType.Table,
SchemaActions.Create | SchemaActions.Drop | SchemaActions.Rename |
SchemaActions.Schema);
AddSupportedSchemaActions (SchemaType.View,
SchemaActions.All);
+ AddSupportedSchemaActions (SchemaType.Procedure,
SchemaActions.All);
AddSupportedSchemaActions (SchemaType.TableColumn,
SchemaActions.All);
AddSupportedSchemaActions
(SchemaType.ProcedureParameter, SchemaActions.Schema);
AddSupportedSchemaActions (SchemaType.Trigger,
SchemaActions.All);
Modified:
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/ChangeLog
===================================================================
---
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/ChangeLog
2008-01-29 14:49:14 UTC (rev 94252)
+++
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/ChangeLog
2008-01-29 14:50:04 UTC (rev 94253)
@@ -1,5 +1,9 @@
2008-01-29 Ben Motmans <[EMAIL PROTECTED]>
+ * SqlServerSchemaProvider.cs: Add missing capability
+
+2008-01-29 Ben Motmans <[EMAIL PROTECTED]>
+
* MonoDevelop.Database.Sql.SqlServer.mdp: depend on Gtk# 2.8 instead of
2.12
* gtk-gui,
gtk-gui/MonoDevelop.Database.Sql.SqlServer.SqlServerColumnEditorWidget.cs,
Modified:
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/SqlServerSchemaProvider.cs
===================================================================
---
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/SqlServerSchemaProvider.cs
2008-01-29 14:49:14 UTC (rev 94252)
+++
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/SqlServerSchemaProvider.cs
2008-01-29 14:50:04 UTC (rev 94253)
@@ -46,6 +46,7 @@
AddSupportedSchemaActions (SchemaType.Database,
SchemaActions.All);
AddSupportedSchemaActions (SchemaType.Table,
SchemaActions.Create | SchemaActions.Drop | SchemaActions.Rename |
SchemaActions.Schema);
AddSupportedSchemaActions (SchemaType.View,
SchemaActions.All);
+ AddSupportedSchemaActions (SchemaType.Procedure,
SchemaActions.All);
AddSupportedSchemaActions (SchemaType.TableColumn,
SchemaActions.All);
AddSupportedSchemaActions
(SchemaType.ProcedureParameter, SchemaActions.Schema);
AddSupportedSchemaActions (SchemaType.Trigger,
SchemaActions.All);
Modified:
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/ChangeLog
===================================================================
---
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/ChangeLog
2008-01-29 14:49:14 UTC (rev 94252)
+++
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/ChangeLog
2008-01-29 14:50:04 UTC (rev 94253)
@@ -1,5 +1,10 @@
2008-01-29 Ben Motmans <[EMAIL PROTECTED]>
+ * MonoDevelop.Database.Sql.Sqlite.mdp, Makefile.am: use a Gac reference
for
+ Mono.Data.Sqlite
+
+2008-01-29 Ben Motmans <[EMAIL PROTECTED]>
+
* MonoDevelop.Database.Sql.Sqlite.mdp: depend on Gtk# 2.8 instead of
2.12
* gtk-gui, gtk-gui/generated.cs,
gtk-gui/MonoDevelop.Database.Sql.Sqlite.SqliteCreateDatabaseDialog.cs,
Modified:
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/Makefile.am
===================================================================
---
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/Makefile.am
2008-01-29 14:49:14 UTC (rev 94252)
+++
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/Makefile.am
2008-01-29 14:50:04 UTC (rev 94253)
@@ -6,8 +6,8 @@
-r:$(top_builddir)/build/MonoDevelop.Database.Components.dll \
-r:$(top_builddir)/build/MonoDevelop.Database.Designer.dll \
-r:$(top_builddir)/build/MonoDevelop.Database.Sql.dll \
- -r:$(top_srcdir)/contrib/Sqlite/Mono.Data.Sqlite.dll \
-r:Mono.Data \
+ -r:Mono.Data.Sqlite \
-r:Mono.Posix \
-r:System \
-r:System.Data
@@ -31,27 +31,21 @@
gtk-gui/gui.stetic \
MonoDevelop.Database.Sql.Sqlite.addin.xml
-SQLITE_FILES = \
- Mono.Data.Sqlite.dll
+if ENABLE_SQLITE
+all: $(ASSEMBLY)
+else
+all:
+endif
-SRC_SQLITE_FILES = $(addprefix $(top_srcdir)/contrib/Sqlite/, $(SQLITE_FILES))
-BUILD_SQLITE_FILES = $(addprefix $(ADDIN_BUILD)/, $(notdir $(SQLITE_FILES)))
-
-all: $(ASSEMBLY) $(BUILD_SQLITE_FILES)
-
-$(BUILD_SQLITE_FILES): $(SRC_SQLITE_FILES)
- mkdir -p $(ADDIN_BUILD)
- cp $(SRC_SQLITE_FILES) $(ADDIN_BUILD)/.
-
$(ASSEMBLY): $(FILES) $(build_resources)
mkdir -p $(ADDIN_BUILD)
$(CSC) $(CSC_FLAGS) $(REFS) $(build_resources:%=/resource:%)
$(build_sources) -out:$@ -target:library
assemblydir = $(MD_ADDIN_DIR)/MonoDevelop.Database
-assembly_DATA = $(ASSEMBLY) $(BUILD_SQLITE_FILES)
+assembly_DATA = $(ASSEMBLY)
-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(BUILD_SQLITE_FILES)
-EXTRA_DIST = $(FILES) $(RES) $(SRC_SQLITE_FILES)
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
+EXTRA_DIST = $(FILES) $(RES)
include $(top_srcdir)/Makefile.include
Modified:
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/MonoDevelop.Database.Sql.Sqlite.mdp
===================================================================
---
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/MonoDevelop.Database.Sql.Sqlite.mdp
2008-01-29 14:49:14 UTC (rev 94252)
+++
trunk/monodevelop/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/MonoDevelop.Database.Sql.Sqlite.mdp
2008-01-29 14:50:04 UTC (rev 94253)
@@ -43,7 +43,6 @@
<ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.Core.Gui,
Version=0.17.0.0, Culture=neutral" />
<ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.Ide,
Version=0.17.0.0, Culture=neutral" />
<ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.Projects,
Version=0.0.0.0, Culture=neutral" />
- <ProjectReference type="Assembly" localcopy="True"
refto="../contrib/Sqlite/Mono.Data.Sqlite.dll" />
<ProjectReference type="Gac" localcopy="True"
refto="MonoDevelop.Projects.Gui, Version=0.17.0.0, Culture=neutral" />
<ProjectReference type="Gac" localcopy="True" refto="NRefactory,
Version=0.0.0.0, Culture=neutral" />
<ProjectReference type="Gac" localcopy="True" refto="Mono.Cecil,
Version=0.6.8.8607, Culture=neutral" />
@@ -52,6 +51,7 @@
<ProjectReference type="Gac" localcopy="True" refto="pango-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<ProjectReference type="Gac" localcopy="True" refto="atk-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<ProjectReference type="Gac" localcopy="True" refto="gdk-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <ProjectReference type="Gac" localcopy="True" refto="Mono.Data.Sqlite,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
</References>
<Deployment.LinuxDeployData generatePcFile="False" />
<GtkDesignInfo gettextClass="AddinCatalog" gtkVersion="2.8.3" />
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
