[Adapdev-commits] Adapdev/src/Adapdev.Data/Sql MySqlCriteria.cs,NONE,1.1 MySqlDeleteQuery.cs,NONE,1.

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24456/src/Adapdev.Data/Sql

Modified Files:
	CriteriaFactory.cs DialectConstants.cs QueryConstants.cs 
	QueryFactory.cs QueryHelper.cs 
Added Files:
	MySqlCriteria.cs MySqlDeleteQuery.cs MySqlInsertQuery.cs 
	MySqlSelectQuery.cs MySqlUpdateQuery.cs 
Log Message:
- benr: initial mysql integration checkin

Index: QueryConstants.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/QueryConstants.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** QueryConstants.cs	20 May 2005 02:10:53 -0000	1.2
--- QueryConstants.cs	25 Jul 2005 02:22:15 -0000	1.3
***************
*** 19,22 ****
--- 19,25 ----
  		public const char ORACLE_DATE = '\'';
  
+ 		public const char MYSQL_STRING = '\'';
+ 		public const char MYSQL_DATE = '\'';
+ 
  	}
  }
\ No newline at end of file

Index: QueryHelper.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/QueryHelper.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** QueryHelper.cs	20 May 2005 02:10:53 -0000	1.4
--- QueryHelper.cs	25 Jul 2005 02:22:15 -0000	1.5
***************
*** 57,60 ****
--- 57,62 ----
  				case Adapdev.Data.DbType.ORACLE:
  					return DialectConstants.ORACLE_DATE;
+ 				case Adapdev.Data.DbType.MYSQL:
+ 					return DialectConstants.MYSQL_DATE;
  				default:
  					throw new Exception("DbType " + type + " not supported currently.");
***************
*** 77,80 ****
--- 79,84 ----
  				case Adapdev.Data.DbType.ORACLE:
  					return DialectConstants.ORACLE_PREDELIM;
+ 				case Adapdev.Data.DbType.MYSQL:
+ 					return DialectConstants.MYSQL_PREDELIM;
  				default:
  					throw new Exception("DbType " + type + " not supported currently.");
***************
*** 97,100 ****
--- 101,106 ----
  				case Adapdev.Data.DbType.ORACLE:
  					return DialectConstants.ORACLE_POSTDELIM;
+ 				case Adapdev.Data.DbType.MYSQL:
+ 					return DialectConstants.MYSQL_POSTDELIM;
  				default:
  					throw new Exception("DbType " + type + " not supported currently.");
***************
*** 117,120 ****
--- 123,128 ----
  				case Adapdev.Data.DbType.ORACLE:
  					return DialectConstants.ORACLE_STRING;
+ 				case Adapdev.Data.DbType.MYSQL:
+ 					return DialectConstants.MYSQL_STRING;
  				default:
  					throw new Exception("DbType " + type + " not supported currently.");
***************
*** 140,143 ****
--- 148,154 ----
  				case DbProviderType.OLEDB:
  					return "?";
+ 				case DbProviderType.MYSQL:
+ 					columnName = StringUtil.RemoveSpaces(columnName);
+ 					return "?" + columnName;
  				default:
  					throw new Exception("DbProviderType " + provider + " is not currently supported.");
***************
*** 162,165 ****
--- 173,183 ----
  			return s;
  		}
+ 
+ 		public static string GetMySqlLastInsertedCommand(string table, string column)
+ 		{
+ 			string s = "SELECT `" + column + "` FROM `" + table + "` ORDER BY `" + column + "` DESC LIMIT 1";
+ 			Console.WriteLine(s);
+ 			return s;
+ 		}
  	}
  }
\ No newline at end of file

--- NEW FILE: MySqlSelectQuery.cs ---
using System;

namespace Adapdev.Data.Sql
{
	/// <summary>
	/// Summary description for MySqlSelectQuery.
	/// </summary>
	public class MySqlSelectQuery : SelectQuery
	{
		public MySqlSelectQuery():base(DbType.MYSQL, DbProviderType.MYSQL){}
		public MySqlSelectQuery(string table):base(DbType.MYSQL, DbProviderType.MYSQL, table){}

		protected override string GetLimit()
		{
			if (maxRecords > 0)
			{
				return " LIMIT " + maxRecords;
			}
			return "";
		}

		public override string GetText()
		{
			return "SELECT " + this.GetColumns() + " FROM " + this._table + this._join + this.GetCriteria() + this.GetOrderBy() + this.GetGroupBy() + this.GetLimit();	
		}


	}
}

--- NEW FILE: MySqlUpdateQuery.cs ---
using System;

namespace Adapdev.Data.Sql
{
	/// <summary>
	/// Summary description for MySqlUpdateQuery.
	/// </summary>
	public class MySqlUpdateQuery : UpdateQuery
	{
		public MySqlUpdateQuery():base(DbType.MYSQL, DbProviderType.MYSQL){}
		public MySqlUpdateQuery(string table):base(DbType.MYSQL, DbProviderType.MYSQL, table){}
	}
}

Index: CriteriaFactory.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/CriteriaFactory.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CriteriaFactory.cs	10 Apr 2005 09:59:21 -0000	1.2
--- CriteriaFactory.cs	25 Jul 2005 02:22:15 -0000	1.3
***************
*** 18,21 ****
--- 18,23 ----
  				case DbType.ORACLE:
  					return new OracleCriteria();
+ 				case DbType.MYSQL:
+ 					return new MySqlCriteria();
  				default:
  					throw new Exception("DbType " + type + " not supported currently.");

--- NEW FILE: MySqlDeleteQuery.cs ---
using System;

namespace Adapdev.Data.Sql
{
	/// <summary>
	/// Summary description for MySqlDeleteQuery.
	/// </summary>
	public class MySqlDeleteQuery : DeleteQuery
	{
		public MySqlDeleteQuery():base(DbType.MYSQL, DbProviderType.MYSQL){}
		public MySqlDeleteQuery(string table):base(DbType.MYSQL, DbProviderType.MYSQL, table){}
	}
}

Index: QueryFactory.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/QueryFactory.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** QueryFactory.cs	10 Apr 2005 09:59:21 -0000	1.2
--- QueryFactory.cs	25 Jul 2005 02:22:15 -0000	1.3
***************
*** 34,37 ****
--- 34,39 ----
  				case DbType.ORACLE:
  					return new OracleUpdateQuery();
+ 				case DbType.MYSQL:
+ 					return new MySqlUpdateQuery();
  				default:
  					throw new System.NotImplementedException("DbType " + db + " not supported currently.");
***************
*** 61,64 ****
--- 63,68 ----
  				case DbType.ORACLE:
  					return new OracleSelectQuery();
+ 				case DbType.MYSQL:
+ 					return new MySqlSelectQuery();
  				default:
  					throw new System.NotImplementedException("DbType " + db + " not supported currently.");			
***************
*** 95,98 ****
--- 99,104 ----
  				case DbType.ORACLE:
  					return new OracleDeleteQuery();
+ 				case DbType.MYSQL:
+ 					return new MySqlDeleteQuery();
  				default:
  					throw new System.NotImplementedException("DbType " + db + " not supported currently.");
***************
*** 129,132 ****
--- 135,140 ----
  				case DbType.ORACLE:
  					return new OracleInsertQuery();
+ 				case DbType.MYSQL:
+ 					return new MySqlInsertQuery();
  				default:
  					throw new System.NotImplementedException("DbType " + db + " not supported currently.");

--- NEW FILE: MySqlCriteria.cs ---
namespace Adapdev.Data.Sql
{
	using System.Collections;
	using System.Text;
	using Adapdev.Text;

	/// <summary>
	/// Summary description for MySqlCriteria.
	/// </summary>
	public class MySqlCriteria : Criteria
	{
		public MySqlCriteria() : base(DbType.MYSQL, DbProviderType.MYSQL)
		{
		}

		public MySqlCriteria(string sql) : base(DbType.MYSQL, DbProviderType.MYSQL, sql)
		{
		}
	}
}
Index: DialectConstants.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/DialectConstants.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DialectConstants.cs	10 Apr 2005 09:59:21 -0000	1.2
--- DialectConstants.cs	25 Jul 2005 02:22:15 -0000	1.3
***************
*** 20,23 ****
--- 20,28 ----
  		public const char ORACLE_DATE = '\'';
  		public const char ORACLE_STRING = '\'';
+ 
+ 		public const char MYSQL_PREDELIM = '`';
+ 		public const char MYSQL_POSTDELIM = '`';
+ 		public const char MYSQL_DATE = '\'';
+ 		public const char MYSQL_STRING = '\'';
  	}
  }
\ No newline at end of file

--- NEW FILE: MySqlInsertQuery.cs ---
using System;

namespace Adapdev.Data.Sql
{
	/// <summary>
	/// Summary description for MySqlInsertQuery.
	/// </summary>
	public class MySqlInsertQuery : InsertQuery
	{
		public MySqlInsertQuery():base(DbType.MYSQL, DbProviderType.MYSQL){}
		public MySqlInsertQuery(string table):base(DbType.MYSQL, DbProviderType.MYSQL, table){}
	}
}