diff -Nru monodevelop-database-2.8.5+dfsg/configure monodevelop-database-2.8.6.3+dfsg/configure --- monodevelop-database-2.8.5+dfsg/configure 2009-10-17 23:00:00.000000000 +0000 +++ monodevelop-database-2.8.6.3+dfsg/configure 2009-10-17 23:00:00.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for monodevelop-database 2.8.5. +# Generated by GNU Autoconf 2.68 for monodevelop-database 2.8.6.3. # # Report bugs to . # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='monodevelop-database' PACKAGE_TARNAME='monodevelop-database' -PACKAGE_VERSION='2.8.5' -PACKAGE_STRING='monodevelop-database 2.8.5' +PACKAGE_VERSION='2.8.6.3' +PACKAGE_STRING='monodevelop-database 2.8.6.3' PACKAGE_BUGREPORT='monodevelop-list@lists.ximian.com' PACKAGE_URL='' @@ -1242,7 +1242,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures monodevelop-database 2.8.5 to adapt to many kinds of systems. +\`configure' configures monodevelop-database 2.8.6.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1309,7 +1309,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of monodevelop-database 2.8.5:";; + short | recursive ) echo "Configuration of monodevelop-database 2.8.6.3:";; esac cat <<\_ACEOF @@ -1428,7 +1428,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -monodevelop-database configure 2.8.5 +monodevelop-database configure 2.8.6.3 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1445,7 +1445,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by monodevelop-database $as_me 2.8.5, which was +It was created by monodevelop-database $as_me 2.8.6.3, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2261,7 +2261,7 @@ # Define the identity of the package. PACKAGE='monodevelop-database' - VERSION='2.8.5' + VERSION='2.8.6.3' cat >>confdefs.h <<_ACEOF @@ -2959,7 +2959,7 @@ fi MONOADDINS_REQUIRED_VERSION=0.4 -MONODEVELOP_REQUIRED_VERSION=2.8.5 +MONODEVELOP_REQUIRED_VERSION=2.8.6.3 GTKSHARP_REQUIRED_VERSION=2.12.8 @@ -4330,7 +4330,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by monodevelop-database $as_me 2.8.5, which was +This file was extended by monodevelop-database $as_me 2.8.6.3, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4383,7 +4383,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -monodevelop-database config.status 2.8.5 +monodevelop-database config.status 2.8.6.3 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -Nru monodevelop-database-2.8.5+dfsg/configure.in monodevelop-database-2.8.6.3+dfsg/configure.in --- monodevelop-database-2.8.5+dfsg/configure.in 2009-10-17 23:00:00.000000000 +0000 +++ monodevelop-database-2.8.6.3+dfsg/configure.in 2009-10-17 23:00:00.000000000 +0000 @@ -1,4 +1,4 @@ -AC_INIT([monodevelop-database], 2.8.5, [monodevelop-list@lists.ximian.com]) +AC_INIT([monodevelop-database], 2.8.6.3, [monodevelop-list@lists.ximian.com]) AC_PREREQ(2.53) AM_INIT_AUTOMAKE([1.9 tar-ustar]) AM_MAINTAINER_MODE @@ -52,7 +52,7 @@ dnl hard dependencies MONOADDINS_REQUIRED_VERSION=0.4 -MONODEVELOP_REQUIRED_VERSION=2.8.5 +MONODEVELOP_REQUIRED_VERSION=2.8.6.3 GTKSHARP_REQUIRED_VERSION=2.12.8 PKG_CHECK_MODULES(MONO_ADDINS, mono-addins >= $MONOADDINS_REQUIRED_VERSION) diff -Nru monodevelop-database-2.8.5+dfsg/debian/changelog monodevelop-database-2.8.6.3+dfsg/debian/changelog --- monodevelop-database-2.8.5+dfsg/debian/changelog 2011-12-19 15:23:18.000000000 +0000 +++ monodevelop-database-2.8.6.3+dfsg/debian/changelog 2012-02-05 10:09:52.000000000 +0000 @@ -1,3 +1,18 @@ +monodevelop-database (2.8.6.3+dfsg-1) unstable; urgency=low + + * [f026317] Imported Upstream version 2.8.6.3+dfsg + * [eb892a8] Bump Monodevelop version requirements to 2.8.6.3 + + -- Jo Shields Sun, 05 Feb 2012 11:09:40 +0100 + +monodevelop-database (2.8.5+dfsg-2) unstable; urgency=low + + * [ad926f6] Remove gbp.conf since we're using master branch now + * [234d9cb] Correct order of parameters to dh + * [15a7547] Update debian/rules for DH8-compatible "--with cli" + + -- Jo Shields Fri, 20 Jan 2012 16:11:41 +0000 + monodevelop-database (2.8.5+dfsg-1) experimental; urgency=low * [ff25795] Imported Upstream version 2.8.5+dfsg diff -Nru monodevelop-database-2.8.5+dfsg/debian/control monodevelop-database-2.8.6.3+dfsg/debian/control --- monodevelop-database-2.8.5+dfsg/debian/control 2011-12-19 14:57:17.000000000 +0000 +++ monodevelop-database-2.8.6.3+dfsg/debian/control 2012-02-05 10:09:15.000000000 +0000 @@ -5,9 +5,9 @@ Uploaders: Mirco Bauer , Jo Shields Build-Depends: debhelper (>= 7.0.50), dh-autoreconf Build-Depends-Indep: cli-common-dev (>= 0.8~), - monodevelop (>= 2.8.5), - monodevelop-versioncontrol (>= 2.8.5), - monodevelop-nunit (>= 2.8.5), + monodevelop (>= 2.8.6.3), + monodevelop-versioncontrol (>= 2.8.6.3), + monodevelop-nunit (>= 2.8.6.3), mono-devel (>= 2.10), libgtk2.0-cil-dev, libmysql-cil-dev, diff -Nru monodevelop-database-2.8.5+dfsg/debian/gbp.conf monodevelop-database-2.8.6.3+dfsg/debian/gbp.conf --- monodevelop-database-2.8.5+dfsg/debian/gbp.conf 2011-11-10 17:25:37.000000000 +0000 +++ monodevelop-database-2.8.6.3+dfsg/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -[DEFAULT] -debian-branch = master-experimental -upstream-branch = upstream-experimental diff -Nru monodevelop-database-2.8.5+dfsg/debian/rules monodevelop-database-2.8.6.3+dfsg/debian/rules --- monodevelop-database-2.8.5+dfsg/debian/rules 2011-12-19 14:57:46.000000000 +0000 +++ monodevelop-database-2.8.6.3+dfsg/debian/rules 2012-02-05 10:08:49.000000000 +0000 @@ -11,9 +11,7 @@ DEB_SOURCE_NAME = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Source | cut -d" " -f2) VERSION = $(shell echo $(DEB_VERSION) | cut -d"-" -f1 | sed 's/+dfsg.*//') -MDVERSION = 2.8.5 - -include /usr/share/cli-common/cli.make +MDVERSION = 2.8.6.3 override_dh_gencontrol: dh_gencontrol -i -- -Vmisc:Version=$(MDVERSION) @@ -51,6 +49,6 @@ rm -r $(DEB_SOURCE_NAME)-$(VERSION) %: - dh --with autoreconf $@ + dh $@ --with autoreconf,cli .PHONY: get-orig-source diff -Nru monodevelop-database-2.8.5+dfsg/MonoDevelop.Database.CodeGenerator/MonoDevelop.Database.CodeGenerator.addin.xml monodevelop-database-2.8.6.3+dfsg/MonoDevelop.Database.CodeGenerator/MonoDevelop.Database.CodeGenerator.addin.xml --- monodevelop-database-2.8.5+dfsg/MonoDevelop.Database.CodeGenerator/MonoDevelop.Database.CodeGenerator.addin.xml 2009-10-17 23:00:00.000000000 +0000 +++ monodevelop-database-2.8.6.3+dfsg/MonoDevelop.Database.CodeGenerator/MonoDevelop.Database.CodeGenerator.addin.xml 2009-10-17 23:00:00.000000000 +0000 @@ -6,7 +6,7 @@ url = "http://www.monodevelop.com" description = "Database CodeGenerator Module" category = "Database" - version = "2.8.5"> + version = "2.8.6.3"> @@ -15,11 +15,11 @@ - - - - - + + + + + diff -Nru monodevelop-database-2.8.5+dfsg/MonoDevelop.Database.Components/MonoDevelop.Database.Components.addin.xml monodevelop-database-2.8.6.3+dfsg/MonoDevelop.Database.Components/MonoDevelop.Database.Components.addin.xml --- monodevelop-database-2.8.5+dfsg/MonoDevelop.Database.Components/MonoDevelop.Database.Components.addin.xml 2009-10-17 23:00:00.000000000 +0000 +++ monodevelop-database-2.8.6.3+dfsg/MonoDevelop.Database.Components/MonoDevelop.Database.Components.addin.xml 2009-10-17 23:00:00.000000000 +0000 @@ -6,7 +6,7 @@ url = "http://www.monodevelop.com" description = "Database Components Module" category = "Database" - version = "2.8.5"> + version = "2.8.6.3"> @@ -15,10 +15,10 @@ - - - - + + + + diff -Nru monodevelop-database-2.8.5+dfsg/MonoDevelop.Database.ConnectionManager/MonoDevelop.Database.ConnectionManager.addin.xml monodevelop-database-2.8.6.3+dfsg/MonoDevelop.Database.ConnectionManager/MonoDevelop.Database.ConnectionManager.addin.xml --- monodevelop-database-2.8.5+dfsg/MonoDevelop.Database.ConnectionManager/MonoDevelop.Database.ConnectionManager.addin.xml 2009-10-17 23:00:00.000000000 +0000 +++ monodevelop-database-2.8.6.3+dfsg/MonoDevelop.Database.ConnectionManager/MonoDevelop.Database.ConnectionManager.addin.xml 2009-10-17 23:00:00.000000000 +0000 @@ -6,7 +6,7 @@ url = "http://www.monodevelop.com" description = "Database ConnectionManager Module" category = "Database" - version = "2.8.5"> + version = "2.8.6.3"> @@ -15,12 +15,12 @@ - - - - - - + + + + + + diff -Nru monodevelop-database-2.8.5+dfsg/MonoDevelop.Database.Designer/MonoDevelop.Database.Designer.addin.xml monodevelop-database-2.8.6.3+dfsg/MonoDevelop.Database.Designer/MonoDevelop.Database.Designer.addin.xml --- monodevelop-database-2.8.5+dfsg/MonoDevelop.Database.Designer/MonoDevelop.Database.Designer.addin.xml 2009-10-17 23:00:00.000000000 +0000 +++ monodevelop-database-2.8.6.3+dfsg/MonoDevelop.Database.Designer/MonoDevelop.Database.Designer.addin.xml 2009-10-17 23:00:00.000000000 +0000 @@ -6,7 +6,7 @@ url = "http://www.monodevelop.com" description = "Database Designer Module" category = "Database" - version = "2.8.5"> + version = "2.8.6.3"> @@ -15,9 +15,9 @@ - - - + + + \ No newline at end of file diff -Nru monodevelop-database-2.8.5+dfsg/MonoDevelop.Database.Query/MonoDevelop.Database.Query.addin.xml monodevelop-database-2.8.6.3+dfsg/MonoDevelop.Database.Query/MonoDevelop.Database.Query.addin.xml --- monodevelop-database-2.8.5+dfsg/MonoDevelop.Database.Query/MonoDevelop.Database.Query.addin.xml 2009-10-17 23:00:00.000000000 +0000 +++ monodevelop-database-2.8.6.3+dfsg/MonoDevelop.Database.Query/MonoDevelop.Database.Query.addin.xml 2009-10-17 23:00:00.000000000 +0000 @@ -6,7 +6,7 @@ url = "http://www.monodevelop.com" description = "Database Query Module" category = "Database" - version = "2.8.5"> + version = "2.8.6.3"> @@ -15,10 +15,10 @@ - - - - + + + + diff -Nru monodevelop-database-2.8.5+dfsg/MonoDevelop.Database.Sql/Dialect/AbstractSqlDialect.cs monodevelop-database-2.8.6.3+dfsg/MonoDevelop.Database.Sql/Dialect/AbstractSqlDialect.cs --- monodevelop-database-2.8.5+dfsg/MonoDevelop.Database.Sql/Dialect/AbstractSqlDialect.cs 2009-10-17 23:00:00.000000000 +0000 +++ monodevelop-database-2.8.6.3+dfsg/MonoDevelop.Database.Sql/Dialect/AbstractSqlDialect.cs 2009-10-17 23:00:00.000000000 +0000 @@ -244,8 +244,8 @@ int columnCount = statement.Columns.Count; for (int i=0; i + version = "2.8.6.3"> - + diff -Nru monodevelop-database-2.8.5+dfsg/MonoDevelop.Database.Sql/Providers/AbstractSchemaProvider.cs monodevelop-database-2.8.6.3+dfsg/MonoDevelop.Database.Sql/Providers/AbstractSchemaProvider.cs --- monodevelop-database-2.8.5+dfsg/MonoDevelop.Database.Sql/Providers/AbstractSchemaProvider.cs 2009-10-17 23:00:00.000000000 +0000 +++ monodevelop-database-2.8.6.3+dfsg/MonoDevelop.Database.Sql/Providers/AbstractSchemaProvider.cs 2009-10-17 23:00:00.000000000 +0000 @@ -813,42 +813,32 @@ public virtual string GetSelectQuery (TableSchema table) { - StringBuilder sb = new StringBuilder ("SELECT "); - bool coma = false; + ISqlDialect dialect = this.ConnectionPool.DbFactory.Dialect; + IdentifierExpression tableId = new IdentifierExpression (table.Name); + List columns = new List(); + foreach (ColumnSchema col in table.Columns) { - if (coma) - sb.AppendFormat(","); - coma = true; - sb.AppendLine (); - sb.AppendFormat ("{0}{1}", Convert.ToString (Convert.ToChar (9)), col.Name); + columns.Add(new IdentifierExpression(col.Name)); } - sb.AppendLine (); - sb.AppendFormat ("FROM {0}", table.Name); - return sb.ToString (); + + SelectStatement sel = new SelectStatement (new FromTableClause (tableId),columns); + return dialect.GetSql(sel); } public virtual string GetUpdateQuery (TableSchema table) { - StringBuilder sb = new StringBuilder ("UPDATE "); - sb.AppendFormat ("{0} {1}{1}{2}SET", table.Name, Convert.ToString (Convert.ToChar (9)), Environment.NewLine); - bool coma = false; + ISqlDialect dialect = this.ConnectionPool.DbFactory.Dialect; + IdentifierExpression tableId = new IdentifierExpression (table.Name); + List columns = new List(); + List values = new List(); + foreach (ColumnSchema col in table.Columns) { - if (coma) - sb.AppendFormat(","); - coma = true; - sb.AppendLine (); - if (col.DataType.FullName.IndexOf ("varchar", StringComparison.OrdinalIgnoreCase) > -1 || - col.DataType.FullName.IndexOf ("char", StringComparison.OrdinalIgnoreCase) > -1 || - col.DataType.FullName.IndexOf ("nvarchar", StringComparison.OrdinalIgnoreCase) > -1 || - col.DataType.FullName.IndexOf ("varbinary", StringComparison.OrdinalIgnoreCase) > -1 || - col.DataType.FullName.IndexOf ("nchar", StringComparison.OrdinalIgnoreCase) > -1) - sb.AppendFormat ("{2}{0} = <{1}({3})> ", col.Name, col.DataType.FullName, Convert.ToString (Convert.ToChar (9)), col.DataType.LengthRange.Max); - else - sb.AppendFormat ("{2}{0} = <{1}> ", col.Name, col.DataType.FullName, Convert.ToString (Convert.ToChar (9))); + columns.Add(new IdentifierExpression(col.Name)); + values.Add(new IdentifierExpression(col.DataTypeName)); } - sb.AppendLine (); - sb.Append ("WHERE "); - return sb.ToString (); + + UpdateStatement upd = new UpdateStatement (tableId, columns, values); + return dialect.GetSql(upd); } public virtual string GetInsertQuery (TableSchema table) diff -Nru monodevelop-database-2.8.5+dfsg/MonoDevelop.Database.Sql.MySql/MonoDevelop.Database.Sql.MySql.addin.xml monodevelop-database-2.8.6.3+dfsg/MonoDevelop.Database.Sql.MySql/MonoDevelop.Database.Sql.MySql.addin.xml --- monodevelop-database-2.8.5+dfsg/MonoDevelop.Database.Sql.MySql/MonoDevelop.Database.Sql.MySql.addin.xml 2009-10-17 23:00:00.000000000 +0000 +++ monodevelop-database-2.8.6.3+dfsg/MonoDevelop.Database.Sql.MySql/MonoDevelop.Database.Sql.MySql.addin.xml 2009-10-17 23:00:00.000000000 +0000 @@ -6,7 +6,7 @@ url = "http://www.monodevelop.com" description = "Database Module" category = "Database" - version = "2.8.5"> + version = "2.8.6.3"> @@ -15,12 +15,12 @@ - - - - - - + + + + + + diff -Nru monodevelop-database-2.8.5+dfsg/MonoDevelop.Database.Sql.Npgsql/MonoDevelop.Database.Sql.Npgsql.addin.xml monodevelop-database-2.8.6.3+dfsg/MonoDevelop.Database.Sql.Npgsql/MonoDevelop.Database.Sql.Npgsql.addin.xml --- monodevelop-database-2.8.5+dfsg/MonoDevelop.Database.Sql.Npgsql/MonoDevelop.Database.Sql.Npgsql.addin.xml 2009-10-17 23:00:00.000000000 +0000 +++ monodevelop-database-2.8.6.3+dfsg/MonoDevelop.Database.Sql.Npgsql/MonoDevelop.Database.Sql.Npgsql.addin.xml 2009-10-17 23:00:00.000000000 +0000 @@ -6,7 +6,7 @@ url = "http://www.monodevelop.com" description = "Database Module" category = "Database" - version = "2.8.5"> + version = "2.8.6.3"> @@ -15,12 +15,12 @@ - - - - - - + + + + + + diff -Nru monodevelop-database-2.8.5+dfsg/MonoDevelop.Database.Sql.Sqlite/MonoDevelop.Database.Sql.Sqlite.addin.xml monodevelop-database-2.8.6.3+dfsg/MonoDevelop.Database.Sql.Sqlite/MonoDevelop.Database.Sql.Sqlite.addin.xml --- monodevelop-database-2.8.5+dfsg/MonoDevelop.Database.Sql.Sqlite/MonoDevelop.Database.Sql.Sqlite.addin.xml 2009-10-17 23:00:00.000000000 +0000 +++ monodevelop-database-2.8.6.3+dfsg/MonoDevelop.Database.Sql.Sqlite/MonoDevelop.Database.Sql.Sqlite.addin.xml 2009-10-17 23:00:00.000000000 +0000 @@ -6,7 +6,7 @@ url = "http://www.monodevelop.com" description = "Database Module" category = "Database" - version = "2.8.5"> + version = "2.8.6.3"> @@ -15,12 +15,12 @@ - - - - - - + + + + + + diff -Nru monodevelop-database-2.8.5+dfsg/MonoDevelop.Database.Sql.SqlServer/MonoDevelop.Database.Sql.SqlServer.addin.xml monodevelop-database-2.8.6.3+dfsg/MonoDevelop.Database.Sql.SqlServer/MonoDevelop.Database.Sql.SqlServer.addin.xml --- monodevelop-database-2.8.5+dfsg/MonoDevelop.Database.Sql.SqlServer/MonoDevelop.Database.Sql.SqlServer.addin.xml 2009-10-17 23:00:00.000000000 +0000 +++ monodevelop-database-2.8.6.3+dfsg/MonoDevelop.Database.Sql.SqlServer/MonoDevelop.Database.Sql.SqlServer.addin.xml 2009-10-17 23:00:00.000000000 +0000 @@ -6,7 +6,7 @@ url = "http://www.monodevelop.com" description = "Database Module" category = "Database" - version = "2.8.5"> + version = "2.8.6.3"> @@ -15,12 +15,12 @@ - - - - - - + + + + + +