From: Michael D. <mik...@us...> - 2004-04-19 04:32:38
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Hql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16820/NHibernate/Hql Modified Files: FromParser.cs QueryTranslator.cs Log Message: Trying to get the HQL back to being able to handle the basic HQL - found some quick fixes. Index: QueryTranslator.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Hql/QueryTranslator.cs,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** QueryTranslator.cs 15 Apr 2004 11:36:35 -0000 1.24 --- QueryTranslator.cs 19 Apr 2004 04:32:30 -0000 1.25 *************** *** 286,297 **** } internal string CreateNameFor(System.Type type) { ! return Prefix(type.Name) + NextCount() + StringHelper.Underscore; } internal string CreateNameForCollection(string role) { ! return Prefix( StringHelper.Unqualify(role) ) + NextCount() + StringHelper.Underscore; } --- 286,308 ---- } + internal string CreateName(string description) + { + // this is a bit ugly, since Alias is really for + // aliasing SQL identifiers ... but it does what + // we want! + return new Alias(10, NextCount().ToString() + StringHelper.Underscore) + .ToAliasString(StringHelper.Unqualify(description).ToLower(), dialect); + } + internal string CreateNameFor(System.Type type) { ! return CreateName(type.Name); ! //return Prefix(type.Name) + NextCount() + StringHelper.Underscore; } internal string CreateNameForCollection(string role) { ! return CreateName(role); ! //return Prefix( StringHelper.Unqualify(role) ) + NextCount() + StringHelper.Underscore; } Index: FromParser.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Hql/FromParser.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** FromParser.cs 14 Apr 2004 12:34:00 -0000 1.5 --- FromParser.cs 19 Apr 2004 04:32:30 -0000 1.6 *************** *** 24,27 **** --- 24,28 ---- private bool afterJoinType; private bool afterFetch; + //TODO: H2.0.3 does not have classPersister as a field... private ILoadable classPersister; private JoinType joinType = JoinType.None; *************** *** 42,46 **** if ( lcToken.Equals(StringHelper.Comma) ) { ! if (!expectingJoin) throw new QueryException("unexpected token: ,"); expectingJoin = false; expectingAs = false; --- 43,47 ---- if ( lcToken.Equals(StringHelper.Comma) ) { ! if ( !(expectingJoin|expectingAs) ) throw new QueryException("unexpected token: ,"); expectingJoin = false; expectingAs = false; *************** *** 79,83 **** else if ( joinTypes.Contains(lcToken) ) { ! if (!expectingJoin) throw new QueryException("unexpected token: " + token); joinType = (JoinType) joinTypes[lcToken]; afterJoinType = true; --- 80,84 ---- else if ( joinTypes.Contains(lcToken) ) { ! if ( !(expectingJoin|expectingAs) ) throw new QueryException("unexpected token: " + token); joinType = (JoinType) joinTypes[lcToken]; afterJoinType = true; *************** *** 119,127 **** // AS construction ! if (classPersister!=null) ! { ! q.AddFromClass(token, classPersister); ! } ! else if (entityName!=null) { q.SetAliasName(token, entityName); --- 120,129 ---- // AS construction ! // if (classPersister!=null) ! // { ! // q.AddFromClass(token, classPersister); ! // } ! //else if (entityName!=null) ! if (entityName!=null) { q.SetAliasName(token, entityName); |