Code review changes

maca88 · maca88 · commit bf80075e9c3e · 2020-09-19T23:09:12.000+02:00
diff --git a/src/NHibernate/Hql/Ast/ANTLR/Tree/JoinSubqueryFromElement.cs b/src/NHibernate/Hql/Ast/ANTLR/Tree/JoinSubqueryFromElement.cs
@@ -57,9 +57,12 @@ private IType CreateDataType(SelectClause selectClause, out IEntityPersister ent
 
 		public SqlString RenderText(SqlString subQuery, ISessionFactoryImplementor sessionFactory)
 		{
-			var array = RenderText(sessionFactory).Split("{query}");
-
-			return new SqlString(new object[] {array[0], subQuery, array[1]});
+			var renderText = RenderText(sessionFactory);
+			var index = renderText.IndexOfOrdinal("{query}");
+			return new SqlString(
+				renderText.Substring(0, index),
+				subQuery,
+				renderText.Substring(index + 7));
 		}
 
 		public override string GetIdentityColumn()

Original file line number	Diff line number	Diff line change
`@@ -57,9 +57,12 @@ private IType CreateDataType(SelectClause selectClause, out IEntityPersister ent`
`57`	`57`
`58`	`58`	`public SqlString RenderText(SqlString subQuery, ISessionFactoryImplementor sessionFactory)`
`59`	`59`	`{`
`60`		`- var array = RenderText(sessionFactory).Split("{query}");`
`61`		`-`
`62`		`- return new SqlString(new object[] {array[0], subQuery, array[1]});`
	`60`	`+ var renderText = RenderText(sessionFactory);`
	`61`	`+ var index = renderText.IndexOfOrdinal("{query}");`
	`62`	`+ return new SqlString(`
	`63`	`+ renderText.Substring(0, index),`
	`64`	`+ subQuery,`
	`65`	`+ renderText.Substring(index + 7));`
`63`	`66`	`}`
`64`	`67`
`65`	`68`	`public override string GetIdentityColumn()`