Once these
- * future-renames are staged to Quats throught the AST, a simple stateless
+ * future-renames are staged to Quats through the AST, a simple stateless
* reduction will then apply the renames to the Property AST elements around the
* Ident's (and potentially Lifts etc...) with the renamed Quats.
*
* The entire process above can be done with a series of stateless
- * transformations with straighforward operations since the majority of the
+ * transformations with straightforward operations since the majority of the
* logic actually lives within the Quats themselves.
*/
class RenameProperties(traceConfig: TraceConfig) {
@@ -73,7 +73,7 @@ object CompleteRenames extends StatelessTransformer {
}
}
-/** Take renames propogated to the quats and apply them to properties */
+/** Take renames propagated to the quats and apply them to properties */
class ApplyRenamesToProps(traceConfig: TraceConfig) extends StatelessTransformer {
val interp = new Interpolator(TraceType.RenameProperties, traceConfig, 1)
@@ -161,7 +161,7 @@ object SeedRenames extends StatelessTransformer {
}
// Represents a nested property path to an identity i.e. Property(Property(... Ident(), ...))
-object PropertyMatroshka {
+object PropertyMatryoshka {
def traverse(initial: Property): Option[(Ast, List[String], List[Renameable])] =
initial match {
diff --git a/quill-engine/src/main/scala/io/getquill/norm/RepropagateQuats.scala b/quill-engine/src/main/scala/io/getquill/norm/RepropagateQuats.scala
index fcc6350804..93bacd7d9a 100644
--- a/quill-engine/src/main/scala/io/getquill/norm/RepropagateQuats.scala
+++ b/quill-engine/src/main/scala/io/getquill/norm/RepropagateQuats.scala
@@ -184,7 +184,7 @@ class RepropagateQuats(traceConfig: TraceConfig) extends StatelessTransformer {
case OnConflict.Properties(props) =>
val propsR = props.map {
// Recreate the assignment with new idents but only if we need to repropagate
- case prop @ PropertyMatroshka(ident: Ident, _, _) =>
+ case prop @ PropertyMatryoshka(ident: Ident, _, _) =>
trace"Repropagate OnConflict.Properties Quat ${oca.quat.suppress(msg)} from $oca into:" andReturn
BetaReduction(prop, RWR, ident -> ident.retypeQuatFrom(oca.quat)).asInstanceOf[Property]
case other =>
@@ -214,7 +214,7 @@ class RepropagateQuats(traceConfig: TraceConfig) extends StatelessTransformer {
OnConflict.Update(assignmentsR)
case _ => act
}
- trace"Completing OnConflict Repropogation: " andReturn
+ trace"Completing OnConflict Repropagation: " andReturn
OnConflict(actionR, targetR, actR)
case other => super.apply(other)
diff --git a/quill-engine/src/main/scala/io/getquill/norm/SheathLeafClauses.scala b/quill-engine/src/main/scala/io/getquill/norm/SheathLeafClauses.scala
index a58dbbe7ee..89aaff0516 100644
--- a/quill-engine/src/main/scala/io/getquill/norm/SheathLeafClauses.scala
+++ b/quill-engine/src/main/scala/io/getquill/norm/SheathLeafClauses.scala
@@ -181,13 +181,13 @@ case class SheathLeafClauses(state: Option[String], traceConfig: TraceConfig)
*/
case GroupByMap(query, eg, by, e, LeafQuat(body)) =>
val innerState = query match {
- // If it's an infix inside e.g. Grp(i:Infix,..)(e,by) the higher-level apply should have changed it approporately
+ // If it's an infix inside e.g. Grp(i:Infix,..)(e,by) the higher-level apply should have changed it appropriately
// by adding an extra Map step inside which has a CaseClass that holds a new attribute that we will pass around
// e.g. from GrpTo(leaf,e,e)(e,Agg(e)) should have changed to GrpTo(M(leaf,e,CC(i->e)),e,e.i)(e,Agg(M(e->e.i)))
case infix: io.getquill.ast.Infix =>
val newId = Ident("i", infix.quat)
Some((Map(infix, newId, CaseClass.Single("i" -> newId)), Some("i")))
- // If it's a query inside e.g. Grp(qry:Query,..)(e,by) the higher-level apply should have changed it approporately
+ // If it's a query inside e.g. Grp(qry:Query,..)(e,by) the higher-level apply should have changed it appropriately
// e.g. from GrpTo(ent,e,e.v)(e,Agg(e)) should have changed to GrpTo(ent,e,CC(v->e.v))(e,Agg(M(e->e.v))
case _: Query =>
val (q, s) = apply(query)
@@ -223,13 +223,13 @@ case class SheathLeafClauses(state: Option[String], traceConfig: TraceConfig)
// Typically the body of a groupBy.map is an aggregation.
case Map(grpBy @ GroupBy(LeafQuat(query), eg, LeafQuat(by)), e, LeafQuat(body)) =>
val innerState = query match {
- // If it's an infix inside e.g. Map(Grp(i:Infix),e,by) the higher-level apply should have changed it approporately
+ // If it's an infix inside e.g. Map(Grp(i:Infix),e,by) the higher-level apply should have changed it appropriately
// by adding an extra Map step inside which has a CaseClass that holds a new attribute that we will pass around
// e.g. from Map(Grp(leaf,e,e),e,Agg(e)) should have changed to Map(Grp(M(leaf,e,CC(i->e)),e,e.i),e,Agg(M(e->e.i)))
case infix: io.getquill.ast.Infix =>
val newId = Ident("i", infix.quat)
Some((Map(infix, newId, CaseClass.Single("i" -> newId)), Some("i")))
- // If it's a query inside e.g. Map(Grp(qry:Query),e,by) the higher-level apply should have changed it approporately
+ // If it's a query inside e.g. Map(Grp(qry:Query),e,by) the higher-level apply should have changed it appropriately
// e.g. from Map(Grp(M(ent,e,e.v),e,e),e,Agg(e)) should have changed to Map(Grp(M(ent,e,CC(v->e.v)),e,e.v),e,Agg(M(e->e.v)))
case _: Query =>
val (q, s) = apply(query)
diff --git a/quill-engine/src/main/scala/io/getquill/norm/StablizeLifts.scala b/quill-engine/src/main/scala/io/getquill/norm/StabilizeLifts.scala
similarity index 66%
rename from quill-engine/src/main/scala/io/getquill/norm/StablizeLifts.scala
rename to quill-engine/src/main/scala/io/getquill/norm/StabilizeLifts.scala
index 65f792d435..84a73345ec 100644
--- a/quill-engine/src/main/scala/io/getquill/norm/StablizeLifts.scala
+++ b/quill-engine/src/main/scala/io/getquill/norm/StabilizeLifts.scala
@@ -3,10 +3,10 @@ package io.getquill.norm
import io.getquill.ast._
import scala.collection.immutable.{Map => IMap}
-private[getquill] object StablizeLifts {
+private[getquill] object StabilizeLifts {
- def stablize(ast: Ast): (Ast, State) = {
- val (a, t) = StubLiftValus(State(IMap.empty, Token(0))).apply(ast)
+ def stabilize(ast: Ast): (Ast, State) = {
+ val (a, t) = StubLiftValues(State(IMap.empty, Token(0))).apply(ast)
(a, t.state)
}
@@ -49,32 +49,32 @@ private[getquill] object StablizeLifts {
}
}
- case class StubLiftValus(state: State) extends StatefulTransformer[State] {
+ case class StubLiftValues(state: State) extends StatefulTransformer[State] {
override def apply(e: Ast): (Ast, StatefulTransformer[State]) = e match {
case l: Lift =>
val (ast, ss) = applyLift(l)
- (ast, StubLiftValus(ss))
+ (ast, StubLiftValues(ss))
case others =>
super.apply(others)
}
private def applyLift(ast: Lift): (Ast, State) = ast match {
case l: ScalarValueLift =>
- val stub = state.nextToken
- val stablized = l.copy(value = stub)
- stablized -> state.addReplace(stub, l.value)
+ val stub = state.nextToken
+ val stabilized = l.copy(value = stub)
+ stabilized -> state.addReplace(stub, l.value)
case l: ScalarQueryLift =>
- val stub = state.nextToken
- val stablized = l.copy(value = stub)
- stablized -> state.addReplace(stub, l.value)
+ val stub = state.nextToken
+ val stabilized = l.copy(value = stub)
+ stabilized -> state.addReplace(stub, l.value)
case l: CaseClassValueLift =>
- val stub = state.nextToken
- val stablized = l.copy(value = stub)
- stablized -> state.addReplace(stub, l.value)
+ val stub = state.nextToken
+ val stabilized = l.copy(value = stub)
+ stabilized -> state.addReplace(stub, l.value)
case l: CaseClassQueryLift =>
- val stub = state.nextToken
- val stablized = l.copy(value = stub)
- stablized -> state.addReplace(stub, l.value)
+ val stub = state.nextToken
+ val stabilized = l.copy(value = stub)
+ stabilized -> state.addReplace(stub, l.value)
}
}
}
diff --git a/quill-engine/src/main/scala/io/getquill/norm/SymbolicReduction.scala b/quill-engine/src/main/scala/io/getquill/norm/SymbolicReduction.scala
index 018cad4156..29c14768d5 100644
--- a/quill-engine/src/main/scala/io/getquill/norm/SymbolicReduction.scala
+++ b/quill-engine/src/main/scala/io/getquill/norm/SymbolicReduction.scala
@@ -7,7 +7,7 @@ import io.getquill.util.TraceConfig
* This stage represents Normalization Stage1: Symbolic Reduction in Philip
* Wadler's Paper "A Practical Theory of Language Integrated Query", given in
* Figure 11.
- * http://homepages.inf.ed.ac.uk/slindley/papers/practical-theory-of-linq.pdf
+ * https://homepages.inf.ed.ac.uk/slindley/papers/practical-theory-of-linq.pdf
*
* It represents foundational normalizations done to sequences that represents
* queries. In Wadler's paper, he characterizes them as `for x in P ...``
@@ -44,7 +44,7 @@ class SymbolicReduction(traceConfig: TraceConfig) {
val er = AttachToEntity(Filter(_, _, cr))(e)
Some(FlatMap(a, d, er))
- // This transformation does not have an analogue in Wadler's paper, it represents the fundemental nature of the Monadic 'bind' function
+ // This transformation does not have an analogue in Wadler's paper, it represents the fundamental nature of the Monadic 'bind' function
// that A.flatMap(a => B).flatMap(b => C) is isomorphic to A.flatMap(a => B.flatMap(b => C)).
//
// a.flatMap(b => c).flatMap(d => e) =>
diff --git a/quill-engine/src/main/scala/io/getquill/norm/capture/AvoidAliasConflict.scala b/quill-engine/src/main/scala/io/getquill/norm/capture/AvoidAliasConflict.scala
index 202cf087c1..4b1f3e53e2 100644
--- a/quill-engine/src/main/scala/io/getquill/norm/capture/AvoidAliasConflict.scala
+++ b/quill-engine/src/main/scala/io/getquill/norm/capture/AvoidAliasConflict.scala
@@ -48,7 +48,7 @@ import scala.collection.immutable.Set
* however remains the same. To make sure that aliases do not conflict.
*
* One important side-function of this transformation is to transform temporary
- * variables (e.g. as created by the `AttachToEntity` phase) into permanant ones
+ * variables (e.g. as created by the `AttachToEntity` phase) into permanent ones
* of the form x[0-9]+. Since `AvoidAliasConflict` typically runs not on the
* entire Ast but the sub-parts of it used by normalizations, making temporary
* aliases permanent cannot be done in these sub-parts because the 'state' of
@@ -83,7 +83,7 @@ private[getquill] case class AvoidAliasConflict(state: Set[IdentName], detemp: B
}
}
- // Cannot realize direct super-cluase of a join because of how ExpandJoin does $a$b.
+ // Cannot realize direct super-clause of a join because of how ExpandJoin does $a$b.
// This is tested in JoinComplexSpec which verifies that ExpandJoin behaves correctly.
object CanRealias {
def unapply(q: Ast): Boolean =
@@ -323,9 +323,9 @@ private[getquill] object AvoidAliasConflict {
}
/**
- * Make sure query parameters do not collide with paramters of a AST function.
- * Do this by walkning through the function's subtree and transforming and
- * queries encountered.
+ * Make sure query parameters do not collide with parameters of a AST
+ * function. Do this by walking through the function's subtree and
+ * transforming and queries encountered.
*/
def sanitizeVariables(f: Function, dangerousVariables: Set[IdentName], traceConfig: TraceConfig): Function =
AvoidAliasConflict(dangerousVariables, false, traceConfig).applyFunction(f)
diff --git a/quill-engine/src/main/scala/io/getquill/norm/capture/DemarcateExternalAliases.scala b/quill-engine/src/main/scala/io/getquill/norm/capture/DemarcateExternalAliases.scala
index 70fae4ab58..5c96d3b7d9 100644
--- a/quill-engine/src/main/scala/io/getquill/norm/capture/DemarcateExternalAliases.scala
+++ b/quill-engine/src/main/scala/io/getquill/norm/capture/DemarcateExternalAliases.scala
@@ -13,7 +13,7 @@ import io.getquill.ast._
* clause. These two filters will be combined into one at which point the
* meaning of `r.i` in the 2nd filter will be confused for the first filter's
* alias (i.e. the `r` in `filter(r => ...)`. Therefore, we need to change this
- * vunerable `r.i` in the second filter clause to an `ExternalIdent` before any
+ * vulnerable `r.i` in the second filter clause to an `ExternalIdent` before any
* of the simplifications are done.
*
* Note that we only want to do this for Queries inside of a `Returning` clause
diff --git a/quill-engine/src/main/scala/io/getquill/quat/Quat.scala b/quill-engine/src/main/scala/io/getquill/quat/Quat.scala
index c0f3fb2e9e..c16f46b861 100644
--- a/quill-engine/src/main/scala/io/getquill/quat/Quat.scala
+++ b/quill-engine/src/main/scala/io/getquill/quat/Quat.scala
@@ -153,7 +153,7 @@ sealed trait Quat {
}
case (Quat.Generic, fieldName) =>
io.getquill.util.Messages.trace(
- s"The field '${fieldName}' was looked up from from a Generic Quat. Assuming it will also be Quat.Generic",
+ s"The field '${fieldName}' was looked up from a Generic Quat. Assuming it will also be Quat.Generic",
traceType = TraceType.Warning
)
Quat.Unknown
diff --git a/quill-engine/src/main/scala/io/getquill/quotation/FreeVariables.scala b/quill-engine/src/main/scala/io/getquill/quotation/FreeVariables.scala
index 8d6cb8c874..4d640d6de2 100644
--- a/quill-engine/src/main/scala/io/getquill/quotation/FreeVariables.scala
+++ b/quill-engine/src/main/scala/io/getquill/quotation/FreeVariables.scala
@@ -89,7 +89,7 @@ case class FreeVariables(state: State) extends StatefulTransformer[State] {
case q @ GroupBy(a, b, c) => (q, free(a, b, c))
case q @ GroupByMap(a, b, c, d, e) =>
// First search for free variables in the groupBy's `by` clause, then search for them in the `to` clause
- // if any were found int he `by` clause, propogate them forward to the to-clause
+ // if any were found int he `by` clause, propagate them forward to the to-clause
val s1 = free(a, b, c)
val s2 = new FreeVariables(s1.state).free(a, d, e)
(q, s2)
diff --git a/quill-engine/src/main/scala/io/getquill/sql/SqlQuery.scala b/quill-engine/src/main/scala/io/getquill/sql/SqlQuery.scala
index 3241ee39ff..df0ce67d9a 100644
--- a/quill-engine/src/main/scala/io/getquill/sql/SqlQuery.scala
+++ b/quill-engine/src/main/scala/io/getquill/sql/SqlQuery.scala
@@ -259,7 +259,7 @@ class SqlQueryApply(traceConfig: TraceConfig) {
// Note: In the future, in the GroupByMap case need to verify that columns used in aggregations are actually contained in the grouping
// we can use the list that comes out of flatGroupByAsts for reference for fields being grouped-by
- // (e.g. need to keep in mind embedded objects could be in them... so we might have to traverse mutliple levels
+ // (e.g. need to keep in mind embedded objects could be in them... so we might have to traverse multiple levels
// of properties in order to verify)
// Given a clause that looks like:
@@ -380,25 +380,25 @@ class SqlQueryApply(traceConfig: TraceConfig) {
)(quat)
case SortBy(q, Ident(alias, _), p, o) =>
- val b = base(q, alias, false)
- val criterias = orderByCriterias(p, o, b.from)
+ val b = base(q, alias, false)
+ val criteria = orderByCriteria(p, o, b.from)
// If the sortBy body uses the filter alias, make sure it matches one of the aliases in the fromContexts
if (
b.orderBy.isEmpty && (!CollectAst.byType[Ident](p).map(_.name).contains(alias) || collectAliases(b.from)
.contains(alias))
)
trace"Flattening| SortBy(Ident) [Simple]" andReturn
- b.copy(orderBy = criterias)(quat)
+ b.copy(orderBy = criteria)(quat)
else
trace"Flattening| SortBy(Ident) [Complex]" andReturn
FlattenSqlQuery(
from = QueryContext(apply(q), alias) :: Nil,
- orderBy = criterias,
+ orderBy = criteria,
select = select(alias, quat)
)(quat)
// TODO Finish describing
- // Happens when you either have an aggrgation in the middle of a query
+ // Happens when you either have an aggregation in the middle of a query
// ...
// Or as the result of a map
case Aggregation(op, q: Query) =>
@@ -468,7 +468,7 @@ class SqlQueryApply(traceConfig: TraceConfig) {
// selects from an alias of an outer clause. For example, query[Person].map(p => Name(p.firstName, p.lastName)).distinctOn(_.name)
// (Let's say Person(firstName, lastName, age), Name(first, last)) will turn into
// SELECT DISTINCT ON (p.name), p.firstName AS first, p.lastName AS last, p.age FROM Person
- // This doesn't work beause `name` in `p.name` doesn't exist yet. Therefore we have to nest this in a subquery:
+ // This doesn't work because `name` in `p.name` doesn't exist yet. Therefore we have to nest this in a subquery:
// SELECT DISTINCT ON (p.name) FROM (SELECT p.firstName AS first, p.lastName AS last, p.age FROM Person p) AS p
// The only exception to this is if we are directly selecting from an entity:
// query[Person].distinctOn(_.firstName) which should be fine: SELECT (x.firstName), x.firstName, x.lastName, a.age FROM Person x
@@ -508,14 +508,14 @@ class SqlQueryApply(traceConfig: TraceConfig) {
case other => QueryContext(apply(other), alias)
}
- private def orderByCriterias(ast: Ast, ordering: Ast, from: List[FromContext]): List[OrderByCriteria] =
+ private def orderByCriteria(ast: Ast, ordering: Ast, from: List[FromContext]): List[OrderByCriteria] =
(ast, ordering) match {
- case (Tuple(properties), ord: PropertyOrdering) => properties.flatMap(orderByCriterias(_, ord, from))
+ case (Tuple(properties), ord: PropertyOrdering) => properties.flatMap(orderByCriteria(_, ord, from))
case (Tuple(properties), TupleOrdering(ord)) =>
- properties.zip(ord).flatMap { case (a, o) => orderByCriterias(a, o, from) }
+ properties.zip(ord).flatMap { case (a, o) => orderByCriteria(a, o, from) }
// if its a quat product, use ExpandSelection to break it down into its component fields and apply the ordering to all of them
case (id @ Ident(_, _: Quat.Product), ord) =>
- new ExpandSelection(from).ofSubselect(List(SelectValue(ast))).map(_.ast).flatMap(orderByCriterias(_, ord, from))
+ new ExpandSelection(from).ofSubselect(List(SelectValue(ast))).map(_.ast).flatMap(orderByCriteria(_, ord, from))
case (a, o: PropertyOrdering) => List(OrderByCriteria(a, o))
case other => fail(s"Invalid order by criteria $ast")
}
diff --git a/quill-engine/src/main/scala/io/getquill/sql/idiom/SqlIdiom.scala b/quill-engine/src/main/scala/io/getquill/sql/idiom/SqlIdiom.scala
index f205e6b72f..2fea936a4b 100644
--- a/quill-engine/src/main/scala/io/getquill/sql/idiom/SqlIdiom.scala
+++ b/quill-engine/src/main/scala/io/getquill/sql/idiom/SqlIdiom.scala
@@ -77,7 +77,7 @@ trait SqlIdiom extends Idiom {
}
implicit val transpileContextImplicit: IdiomContext = idiomContext
- implicit val tokernizer: Tokenizer[Ast] = defaultTokenizer
+ implicit val tokenizer: Tokenizer[Ast] = defaultTokenizer
val interp = new Interpolator(TraceType.SqlNormalizations, idiomContext.traceConfig, 1)
import interp._
@@ -398,9 +398,9 @@ trait SqlIdiom extends Idiom {
}
protected def tokenOrderBy(
- criterias: List[OrderByCriteria]
+ criteria: List[OrderByCriteria]
)(implicit astTokenizer: Tokenizer[Ast], strategy: NamingStrategy) =
- stmt"ORDER BY ${criterias.token}"
+ stmt"ORDER BY ${criteria.token}"
implicit def sourceTokenizer(implicit
astTokenizer: Tokenizer[Ast],
diff --git a/quill-engine/src/main/scala/io/getquill/sql/idiom/VerifySqlQuery.scala b/quill-engine/src/main/scala/io/getquill/sql/idiom/VerifySqlQuery.scala
index 43fa8ddee5..3c33064475 100644
--- a/quill-engine/src/main/scala/io/getquill/sql/idiom/VerifySqlQuery.scala
+++ b/quill-engine/src/main/scala/io/getquill/sql/idiom/VerifySqlQuery.scala
@@ -72,7 +72,7 @@ object VerifySqlQuery {
case free =>
Some(
Error(free.map(f => Ident(f.name, Quat.Value)), ast)
- ) // Quat is not actually needed here here just for the sake of the Error Ident
+ ) // Quat is not actually needed here just for the sake of the Error Ident
}
}
@@ -141,9 +141,9 @@ object VerifySqlQuery {
throw new IllegalArgumentException("Cannot use Option.tableExists on a table or embedded case class")
case cond: If if cond.`then`.isInstanceOf[Quat.Product] =>
- throw throw new IllegalArgumentException("Cannot use table or embedded case class as a result of a condition")
+ throw new IllegalArgumentException("Cannot use table or embedded case class as a result of a condition")
case cond: If if cond.`else`.isInstanceOf[Quat.Product] =>
- throw throw new IllegalArgumentException("Cannot use table or embedded case class as a result of a condition")
+ throw new IllegalArgumentException("Cannot use table or embedded case class as a result of a condition")
case cond: If => checkIllegalIdents(cond.condition)
case other => None
diff --git a/quill-engine/src/main/scala/io/getquill/sql/norm/ExpandNestedQueries.scala b/quill-engine/src/main/scala/io/getquill/sql/norm/ExpandNestedQueries.scala
index 3a26215d92..1d8a607627 100644
--- a/quill-engine/src/main/scala/io/getquill/sql/norm/ExpandNestedQueries.scala
+++ b/quill-engine/src/main/scala/io/getquill/sql/norm/ExpandNestedQueries.scala
@@ -4,7 +4,7 @@ import io.getquill.ast._
import io.getquill.context.sql._
import io.getquill.sql.norm.{InContext, QueryLevel, SelectPropertyProtractor, StatelessQueryTransformer}
import io.getquill.ast.PropertyOrCore
-import io.getquill.norm.PropertyMatroshka
+import io.getquill.norm.PropertyMatryoshka
import io.getquill.quat.Quat
class ExpandSelection(from: List[FromContext]) {
@@ -45,7 +45,7 @@ class ExpandSelection(from: List[FromContext]) {
val exp = SelectPropertyProtractor(from)(ast, alternateQuat)
exp.map {
case (p: Property, Nil) =>
- // If the quat-path is nothing and there is some pre-existing alias (e.g. if we came from a case-class or quat)
+ // If the quat-path is nothing and there is some preexisting alias (e.g. if we came from a case-class or quat)
// the use that. Otherwise the selection is of an individual element so use the element name (before the rename)
// as the alias.
alias match {
@@ -103,7 +103,7 @@ object ExpandNestedQueries extends StatelessQueryTransformer {
def apply(p: Ast): Ast =
p match {
- case p @ PropertyMatroshka(inner, path, renameables) =>
+ case p @ PropertyMatryoshka(inner, path, renameables) =>
val isSubselect = inContext.isSubselect(p)
val propsAlreadyFixed = renameables.forall(_ == Renameable.Fixed)
val isPropertyRenamed = p.prevName.isDefined
diff --git a/quill-engine/src/main/scala/io/getquill/sql/norm/RemoveExtraAlias.scala b/quill-engine/src/main/scala/io/getquill/sql/norm/RemoveExtraAlias.scala
index 5ae1ade49b..95d4f4cfd0 100644
--- a/quill-engine/src/main/scala/io/getquill/sql/norm/RemoveExtraAlias.scala
+++ b/quill-engine/src/main/scala/io/getquill/sql/norm/RemoveExtraAlias.scala
@@ -6,9 +6,9 @@ import io.getquill.context.sql.{FlattenSqlQuery, SelectValue}
/**
* Remove aliases at the top level of the AST since they are not needed (quill
- * uses select row indexes to figure out what data corresponds to what
- * encodeable object) as well as entities whose aliases are the same as their
- * selection e.g. "select x.foo as foo" since this just adds syntactic noise.
+ * uses select row indexes to figure out what data corresponds to what encodable
+ * object) as well as entities whose aliases are the same as their selection
+ * e.g. "select x.foo as foo" since this just adds syntactic noise.
*/
case class RemoveExtraAlias(strategy: NamingStrategy) extends StatelessQueryTransformer {
// Remove aliases that are the same as as the select values. Since a strategy may change the name,
diff --git a/quill-engine/src/main/scala/io/getquill/sql/norm/RemoveUnusedSelects.scala b/quill-engine/src/main/scala/io/getquill/sql/norm/RemoveUnusedSelects.scala
index a05175f263..7343895975 100644
--- a/quill-engine/src/main/scala/io/getquill/sql/norm/RemoveUnusedSelects.scala
+++ b/quill-engine/src/main/scala/io/getquill/sql/norm/RemoveUnusedSelects.scala
@@ -15,7 +15,7 @@ import io.getquill.context.sql.{
TableContext,
UnaryOperationSqlQuery
}
-import io.getquill.norm.PropertyMatroshka
+import io.getquill.norm.PropertyMatryoshka
import io.getquill.quat.Quat
import scala.collection.mutable
@@ -53,7 +53,7 @@ object RemoveUnusedSelects {
// Since we first need to replace select values from super queries onto sub queries,
// take the newly filtered selects instead of the ones in the query which are pre-filtered
// ... unless we are on the top level query. Since in the top level query 'references'
- // will always be empty we need to copy through the entire select caluse
+ // will always be empty we need to copy through the entire select clause
val asts = gatherAsts(q, if (doSelectFiltration) newSelect else q.select)
// recurse into the from clause with ExpandContext
@@ -65,7 +65,7 @@ object RemoveUnusedSelects {
q.copy(from = fromContexts, select = newSelect)(q.quat)
} else {
// If we are on the top level, the list of aliases being used by clauses outer to 'us'
- // don't exist since we are the outermost level of the sql. Therefore no filteration
+ // don't exist since we are the outermost level of the sql. Therefore no filtration
// should happen in that case.
q.copy(from = fromContexts)(q.quat)
}
@@ -77,7 +77,7 @@ object RemoveUnusedSelects {
}
private def filterUnused(select: List[SelectValue], references: Set[Property]): List[SelectValue] = {
- val usedAliases = references.map { case PropertyMatroshka(_, list, _) =>
+ val usedAliases = references.map { case PropertyMatryoshka(_, list, _) =>
list.mkString
}.toSet
select.filter(sv =>
diff --git a/quill-engine/src/main/scala/io/getquill/sql/norm/SelectPropertyProtractor.scala b/quill-engine/src/main/scala/io/getquill/sql/norm/SelectPropertyProtractor.scala
index 0c43024c2e..7439d9d4dd 100644
--- a/quill-engine/src/main/scala/io/getquill/sql/norm/SelectPropertyProtractor.scala
+++ b/quill-engine/src/main/scala/io/getquill/sql/norm/SelectPropertyProtractor.scala
@@ -3,7 +3,7 @@ package io.getquill.sql.norm
import io.getquill.ast.{Ast, Core, Ident, Property, Renameable}
import io.getquill.ast.Visibility.{Hidden, Visible}
import io.getquill.context.sql.{FlatJoinContext, FromContext, InfixContext, JoinContext, QueryContext, TableContext}
-import io.getquill.norm.PropertyMatroshka
+import io.getquill.norm.PropertyMatryoshka
import io.getquill.quat.Quat
import io.getquill.sql.norm.InContext.{InContextType, InInfixContext, InQueryContext, InTableContext}
@@ -52,9 +52,9 @@ case class InContext(from: List[FromContext]) {
def contextReferenceType(ast: Ast) = {
val references = collectTableAliases(from)
ast match {
- case Ident(v, _) => references.get(v)
- case PropertyMatroshka(Ident(v, _), _, _) => references.get(v)
- case _ => None
+ case Ident(v, _) => references.get(v)
+ case PropertyMatryoshka(Ident(v, _), _, _) => references.get(v)
+ case _ => None
}
}
@@ -124,7 +124,7 @@ case class SelectPropertyProtractor(from: List[FromContext]) {
}
// Assuming a property contains only an Ident, Infix or Constant at this point
// and all situations where there is a case-class, tuple, etc... inside have already been beta-reduced
- case prop @ PropertyMatroshka(id @ Core(), _, _) =>
+ case prop @ PropertyMatryoshka(id @ Core(), _, _) =>
val isEntity = inContext.isEntityReference(id)
val effectiveQuat = nonAbstractQuat(prop.quat, alternateQuat)
@@ -184,7 +184,7 @@ case class ProtractQuat(refersToEntity: Boolean) {
*
* This needs to be projected into:
* SELECT g.mammid, g.mammood FROM -- (2) so their selection of sub-properties from here is correct
- * SELECT gim.mid AS mammid, gim.mood as mammood FROM g -- (1) for mamid and mammood need full quat path here...
+ * SELECT gim.mid AS mammid, gim.mood as mammood FROM g -- (1) for mammid and mammood need full quat path here...
*
* (See examples of this in ExpandNestedQueries multiple embedding levels series of tests. Also note that since sub-selection
* is typically done from tuples, paths typically start with _1,_2 etc...)
diff --git a/quill-engine/src/main/scala/io/getquill/sql/norm/nested/FindUnexpressedInfixes.scala b/quill-engine/src/main/scala/io/getquill/sql/norm/nested/FindUnexpressedInfixes.scala
index d3317a5ca2..f4ebb9002f 100644
--- a/quill-engine/src/main/scala/io/getquill/sql/norm/nested/FindUnexpressedInfixes.scala
+++ b/quill-engine/src/main/scala/io/getquill/sql/norm/nested/FindUnexpressedInfixes.scala
@@ -7,7 +7,7 @@ import io.getquill.ast._
import io.getquill.context.sql.SelectValue
/**
- * The challenge with appeneding infixes (that have not been used but are still
+ * The challenge with appending infixes (that have not been used but are still
* needed) back into the query, is that they could be inside of
* tuples/case-classes that have already been selected, or inside of sibling
* elements which have been selected. Take for instance a query that looks like
diff --git a/quill-engine/src/main/scala/io/getquill/util/Interpolator.scala b/quill-engine/src/main/scala/io/getquill/util/Interpolator.scala
index 96b6adaac7..b7111adb4e 100644
--- a/quill-engine/src/main/scala/io/getquill/util/Interpolator.scala
+++ b/quill-engine/src/main/scala/io/getquill/util/Interpolator.scala
@@ -178,7 +178,7 @@ class Interpolator(
case Some((output, indent)) =>
// Even though we usually want to evaluate the command after the initial log was done
// (so that future logs are nested under this one after the intro text but not
- // before the return) but we cann't do that in this case because the switch indicating
+ // before the return) but we can't do that in this case because the switch indicating
// whether to output anything or not is dependant on the return value.
val result = command
diff --git a/quill-engine/src/main/scala/io/getquill/util/Messages.scala b/quill-engine/src/main/scala/io/getquill/util/Messages.scala
index 253f83b1f5..b4fae12020 100644
--- a/quill-engine/src/main/scala/io/getquill/util/Messages.scala
+++ b/quill-engine/src/main/scala/io/getquill/util/Messages.scala
@@ -46,8 +46,8 @@ object Messages {
def traceQuats =
cache("quill.trace.quat", QuatTrace(variable("quill.trace.quat", "quill_trace_quat", QuatTrace.None.value)))
def cacheDynamicQueries = cache(
- "quill.query.cacheDaynamic",
- variable("quill.query.cacheDaynamic", "query_query_cacheDaynamic", "true").toBoolean
+ "quill.query.cacheDynamic",
+ variable("quill.query.cacheDynamic", "query_query_cacheDynamic", "true").toBoolean
)
def querySubexpand =
cache("quill.query.subexpand", variable("quill.query.subexpand", "query_query_subexpand", "true").toBoolean)
diff --git a/quill-jasync-mysql/src/test/scala/io/getquill/context/jasync/mysql/CaseClassQueryJAsyncSpec.scala b/quill-jasync-mysql/src/test/scala/io/getquill/context/jasync/mysql/CaseClassQueryJAsyncSpec.scala
index bf8ab23a04..cd73620d9a 100644
--- a/quill-jasync-mysql/src/test/scala/io/getquill/context/jasync/mysql/CaseClassQueryJAsyncSpec.scala
+++ b/quill-jasync-mysql/src/test/scala/io/getquill/context/jasync/mysql/CaseClassQueryJAsyncSpec.scala
@@ -46,6 +46,6 @@ class CaseClassQueryJAsyncSpec extends CaseClassQuerySpec {
"Example 3 - Inline Record as Filter" in {
await(
testContext.run(`Ex 3 Inline Record Usage`)
- ) should contain theSameElementsAs `Ex 3 Inline Record Usage exepected result`
+ ) should contain theSameElementsAs `Ex 3 Inline Record Usage expected result`
}
}
diff --git a/quill-jasync-postgres/src/test/scala/io/getquill/context/jasync/postgres/ArrayAsyncEncodingSpec.scala b/quill-jasync-postgres/src/test/scala/io/getquill/context/jasync/postgres/ArrayAsyncEncodingSpec.scala
index 177f2a3c9f..6ef5d0ced5 100644
--- a/quill-jasync-postgres/src/test/scala/io/getquill/context/jasync/postgres/ArrayAsyncEncodingSpec.scala
+++ b/quill-jasync-postgres/src/test/scala/io/getquill/context/jasync/postgres/ArrayAsyncEncodingSpec.scala
@@ -47,7 +47,7 @@ class ArrayAsyncEncodingSpec extends ArrayEncodingBaseSpec {
}
// Need to have an actual value in the table in order for the decoder to go off. Previously,
- // there was guarenteed to be information there due to ordering of build artifacts but not anymore.
+ // there was guaranteed to be information there due to ordering of build artifacts but not anymore.
"fail if found not an array" in {
case class RealEncodingTestEntity(
v1: String,
diff --git a/quill-jasync-postgres/src/test/scala/io/getquill/context/jasync/postgres/CaseClassQueryAsyncSpec.scala b/quill-jasync-postgres/src/test/scala/io/getquill/context/jasync/postgres/CaseClassQueryAsyncSpec.scala
index 0c08f9f118..068b58cd78 100644
--- a/quill-jasync-postgres/src/test/scala/io/getquill/context/jasync/postgres/CaseClassQueryAsyncSpec.scala
+++ b/quill-jasync-postgres/src/test/scala/io/getquill/context/jasync/postgres/CaseClassQueryAsyncSpec.scala
@@ -46,6 +46,6 @@ class CaseClassQueryAsyncSpec extends CaseClassQuerySpec {
"Example 3 - Inline Record as Filter" in {
await(
testContext.run(`Ex 3 Inline Record Usage`)
- ) should contain theSameElementsAs `Ex 3 Inline Record Usage exepected result`
+ ) should contain theSameElementsAs `Ex 3 Inline Record Usage expected result`
}
}
diff --git a/quill-jasync-zio-postgres/src/test/scala/io/getquill/context/zio/jasync/postgres/ArrayAsyncEncodingSpec.scala b/quill-jasync-zio-postgres/src/test/scala/io/getquill/context/zio/jasync/postgres/ArrayAsyncEncodingSpec.scala
index 161b3a882a..a92d373eae 100644
--- a/quill-jasync-zio-postgres/src/test/scala/io/getquill/context/zio/jasync/postgres/ArrayAsyncEncodingSpec.scala
+++ b/quill-jasync-zio-postgres/src/test/scala/io/getquill/context/zio/jasync/postgres/ArrayAsyncEncodingSpec.scala
@@ -44,7 +44,7 @@ class ArrayAsyncEncodingSpec extends ArrayEncodingBaseSpec with ZioSpec {
}
// Need to have an actual value in the table in order for the decoder to go off. Previously,
- // there was guarenteed to be information there due to ordering of build artifacts but not anymore.
+ // there was guaranteed to be information there due to ordering of build artifacts but not anymore.
"fail if found not an array" in {
case class RealEncodingTestEntity(
v1: String,
diff --git a/quill-jasync-zio-postgres/src/test/scala/io/getquill/context/zio/jasync/postgres/CaseClassQueryAsyncSpec.scala b/quill-jasync-zio-postgres/src/test/scala/io/getquill/context/zio/jasync/postgres/CaseClassQueryAsyncSpec.scala
index 0e6d245513..a9379341f0 100644
--- a/quill-jasync-zio-postgres/src/test/scala/io/getquill/context/zio/jasync/postgres/CaseClassQueryAsyncSpec.scala
+++ b/quill-jasync-zio-postgres/src/test/scala/io/getquill/context/zio/jasync/postgres/CaseClassQueryAsyncSpec.scala
@@ -44,6 +44,6 @@ class CaseClassQueryAsyncSpec extends CaseClassQuerySpec with ZioSpec {
"Example 3 - Inline Record as Filter" in {
runSyncUnsafe(
context.run(`Ex 3 Inline Record Usage`)
- ) should contain theSameElementsAs `Ex 3 Inline Record Usage exepected result`
+ ) should contain theSameElementsAs `Ex 3 Inline Record Usage expected result`
}
}
diff --git a/quill-jdbc-monix/src/test/scala/io/getquill/mock/MockTests.scala b/quill-jdbc-monix/src/test/scala/io/getquill/mock/MockTests.scala
index 09ba56715a..2d01912cd7 100644
--- a/quill-jdbc-monix/src/test/scala/io/getquill/mock/MockTests.scala
+++ b/quill-jdbc-monix/src/test/scala/io/getquill/mock/MockTests.scala
@@ -136,7 +136,7 @@ class MockTests extends Spec with AsyncMockitoSugar {
val ctx = new PostgresMonixJdbcContext(Literal, ds, EffectWrapper.using(scheduler))
import ctx._
- // In this case, instead of catching the error inside the observable, let it propogate to the top
+ // In this case, instead of catching the error inside the observable, let it propagate to the top
// and make sure that the connection is closed anyhow
val results =
Try {
diff --git a/quill-jdbc-zio/src/main/scala/io/getquill/context/qzio/ZioJdbcContext.scala b/quill-jdbc-zio/src/main/scala/io/getquill/context/qzio/ZioJdbcContext.scala
index 4527c475f3..9c12030e5c 100644
--- a/quill-jdbc-zio/src/main/scala/io/getquill/context/qzio/ZioJdbcContext.scala
+++ b/quill-jdbc-zio/src/main/scala/io/getquill/context/qzio/ZioJdbcContext.scala
@@ -185,7 +185,7 @@ abstract class ZioJdbcContext[+Dialect <: SqlIdiom, +Naming <: NamingStrategy]
* }}}
*
* The order of operations run in the case that a new connection needs to be
- * aquired are as follows: getDS from env, acquire-connection,
+ * acquired are as follows: getDS from env, acquire-connection,
* set-no-autocommit(connection), put-into-fiberref(connection), op - the
* corresponding execute_ method which will execute and pull connection from
* the fiberref, remove-from-fiberref(connection),
@@ -209,7 +209,7 @@ abstract class ZioJdbcContext[+Dialect <: SqlIdiom, +Naming <: NamingStrategy]
attemptBlocking(connection.setAutoCommit(prevAutoCommit)).orDie
}
_ <- ZIO.acquireRelease(currentConnection.set(Some(connection))) { _ =>
- // Note. We are failing the fiber if auto-commit reset fails. For some circumstances this may be too aggresive.
+ // Note. We are failing the fiber if auto-commit reset fails. For some circumstances this may be too aggressive.
// If the connection pool e.g. Hikari resets this property for a recycled connection anyway doing it here
// might not be necessary
currentConnection.set(None)
diff --git a/quill-jdbc-zio/src/test/scala/io/getquill/mock/ZioMockSpec.scala b/quill-jdbc-zio/src/test/scala/io/getquill/mock/ZioMockSpec.scala
index 57ea6ce4b0..d29e28b6a4 100644
--- a/quill-jdbc-zio/src/test/scala/io/getquill/mock/ZioMockSpec.scala
+++ b/quill-jdbc-zio/src/test/scala/io/getquill/mock/ZioMockSpec.scala
@@ -175,7 +175,7 @@ class ZioMockSpec extends AnyFreeSpec with MockitoSugar { // with AsyncMockitoSu
val ctx = new PostgresZioJdbcContext(Literal)
import ctx._
- // In this case, instead of catching the error inside the observable, let it propogate to the top
+ // In this case, instead of catching the error inside the observable, let it propagate to the top
// and make sure that the connection is closed anyhow
val resultMsg = Unsafe.unsafe { implicit u =>
zio.Runtime.default.unsafe.run {
diff --git a/quill-jdbc/src/main/scala/io/getquill/context/jdbc/Encoders.scala b/quill-jdbc/src/main/scala/io/getquill/context/jdbc/Encoders.scala
index 702d046ef9..bebf77651d 100644
--- a/quill-jdbc/src/main/scala/io/getquill/context/jdbc/Encoders.scala
+++ b/quill-jdbc/src/main/scala/io/getquill/context/jdbc/Encoders.scala
@@ -84,13 +84,13 @@ trait BasicTimeEncoders { self: Encoders =>
implicit val instantEncoder: Encoder[Instant] =
encoder(Types.TIMESTAMP_WITH_TIMEZONE, (index, value, row) => row.setTimestamp(index, Timestamp.from(value)))
- implicit val offseTimeEncoder: Encoder[OffsetTime] =
+ implicit val offsetTimeEncoder: Encoder[OffsetTime] =
encoder(
Types.TIME,
(index, value, row) =>
row.setTime(index, java.sql.Time.valueOf(value.withOffsetSameInstant(ZoneOffset.UTC).toLocalTime))
)
- implicit val offseDateTimeEncoder: Encoder[OffsetDateTime] =
+ implicit val offsetDateTimeEncoder: Encoder[OffsetDateTime] =
encoder(
Types.TIMESTAMP_WITH_TIMEZONE,
(index, value, row) => row.setTimestamp(index, java.sql.Timestamp.from(value.toInstant))
@@ -127,8 +127,8 @@ trait ObjectGenericTimeEncoders { self: Encoders =>
implicit val instantEncoder: Encoder[Instant] =
encoder(jdbcTypeOfInstant, (index, value, row) => row.setObject(index, jdbcEncodeInstant(value), jdbcTypeOfInstant))
- implicit val offseTimeEncoder: Encoder[OffsetTime] =
+ implicit val offsetTimeEncoder: Encoder[OffsetTime] =
encoder(jdbcTypeOfOffsetTime, (index, value, row) => row.setObject(index, value, jdbcTypeOfOffsetTime))
- implicit val offseDateTimeEncoder: Encoder[OffsetDateTime] =
+ implicit val offsetDateTimeEncoder: Encoder[OffsetDateTime] =
encoder(jdbcTypeOfOffsetDateTime, (index, value, row) => row.setObject(index, value, jdbcTypeOfOffsetDateTime))
}
diff --git a/quill-jdbc/src/main/scala/io/getquill/context/jdbc/JdbcContextTypes.scala b/quill-jdbc/src/main/scala/io/getquill/context/jdbc/JdbcContextTypes.scala
index 13f3a75cb9..964ed19a6b 100644
--- a/quill-jdbc/src/main/scala/io/getquill/context/jdbc/JdbcContextTypes.scala
+++ b/quill-jdbc/src/main/scala/io/getquill/context/jdbc/JdbcContextTypes.scala
@@ -34,7 +34,7 @@ trait JdbcContextTypes[+Dialect <: SqlIdiom, +Naming <: NamingStrategy]
* Parses instances of java.sql.Types to string form so it can be used in
* creation of sql arrays. Some databases does not support each of generic
* types, hence it's welcome to override this method and provide alternatives
- * to non-existent types.
+ * to nonexistent types.
*
* @param intType
* one of java.sql.Types
diff --git a/quill-jdbc/src/test/scala/io/getquill/context/jdbc/h2/CaseClassQueryJdbcSpec.scala b/quill-jdbc/src/test/scala/io/getquill/context/jdbc/h2/CaseClassQueryJdbcSpec.scala
index 3587e3ac13..21dbaa30c2 100644
--- a/quill-jdbc/src/test/scala/io/getquill/context/jdbc/h2/CaseClassQueryJdbcSpec.scala
+++ b/quill-jdbc/src/test/scala/io/getquill/context/jdbc/h2/CaseClassQueryJdbcSpec.scala
@@ -43,7 +43,7 @@ class CaseClassQueryJdbcSpec extends CaseClassQuerySpec {
"Example 3 - Inline Record as Filter" in {
testContext.run(
`Ex 3 Inline Record Usage`
- ) should contain theSameElementsAs `Ex 3 Inline Record Usage exepected result`
+ ) should contain theSameElementsAs `Ex 3 Inline Record Usage expected result`
}
"Example 4 - Ex 4 Mapped Union of Nicknames" in {
diff --git a/quill-jdbc/src/test/scala/io/getquill/context/jdbc/mysql/CaseClassQueryJdbcSpec.scala b/quill-jdbc/src/test/scala/io/getquill/context/jdbc/mysql/CaseClassQueryJdbcSpec.scala
index fcdcb7bac0..6cfd66e1b5 100644
--- a/quill-jdbc/src/test/scala/io/getquill/context/jdbc/mysql/CaseClassQueryJdbcSpec.scala
+++ b/quill-jdbc/src/test/scala/io/getquill/context/jdbc/mysql/CaseClassQueryJdbcSpec.scala
@@ -43,7 +43,7 @@ class CaseClassQueryJdbcSpec extends CaseClassQuerySpec {
"Example 3 - Inline Record as Filter" in {
testContext.run(
`Ex 3 Inline Record Usage`
- ) should contain theSameElementsAs `Ex 3 Inline Record Usage exepected result`
+ ) should contain theSameElementsAs `Ex 3 Inline Record Usage expected result`
}
"Example 4 - Ex 4 Mapped Union of Nicknames" in {
diff --git a/quill-jdbc/src/test/scala/io/getquill/context/jdbc/oracle/CaseClassQueryJdbcSpec.scala b/quill-jdbc/src/test/scala/io/getquill/context/jdbc/oracle/CaseClassQueryJdbcSpec.scala
index 6647e3c239..1072282c54 100644
--- a/quill-jdbc/src/test/scala/io/getquill/context/jdbc/oracle/CaseClassQueryJdbcSpec.scala
+++ b/quill-jdbc/src/test/scala/io/getquill/context/jdbc/oracle/CaseClassQueryJdbcSpec.scala
@@ -45,7 +45,7 @@ class CaseClassQueryJdbcSpec extends CaseClassQuerySpec {
"Example 3 - Inline Record as Filter" in {
testContext.run(
`Ex 3 Inline Record Usage`
- ) should contain theSameElementsAs `Ex 3 Inline Record Usage exepected result`
+ ) should contain theSameElementsAs `Ex 3 Inline Record Usage expected result`
}
"Example 4 - Ex 4 Mapped Union of Nicknames" in {
diff --git a/quill-jdbc/src/test/scala/io/getquill/context/jdbc/postgres/CaseClassQueryJdbcSpec.scala b/quill-jdbc/src/test/scala/io/getquill/context/jdbc/postgres/CaseClassQueryJdbcSpec.scala
index 3be1207245..1374eca6f6 100644
--- a/quill-jdbc/src/test/scala/io/getquill/context/jdbc/postgres/CaseClassQueryJdbcSpec.scala
+++ b/quill-jdbc/src/test/scala/io/getquill/context/jdbc/postgres/CaseClassQueryJdbcSpec.scala
@@ -43,7 +43,7 @@ class CaseClassQueryJdbcSpec extends CaseClassQuerySpec {
"Example 3 - Inline Record as Filter" in {
testContext.run(
`Ex 3 Inline Record Usage`
- ) should contain theSameElementsAs `Ex 3 Inline Record Usage exepected result`
+ ) should contain theSameElementsAs `Ex 3 Inline Record Usage expected result`
}
"Example 4 - Ex 4 Mapped Union of Nicknames" in {
diff --git a/quill-jdbc/src/test/scala/io/getquill/context/jdbc/sqlite/CaseClassQueryJdbcSpec.scala b/quill-jdbc/src/test/scala/io/getquill/context/jdbc/sqlite/CaseClassQueryJdbcSpec.scala
index 25f3eb7d17..1f0183ed62 100644
--- a/quill-jdbc/src/test/scala/io/getquill/context/jdbc/sqlite/CaseClassQueryJdbcSpec.scala
+++ b/quill-jdbc/src/test/scala/io/getquill/context/jdbc/sqlite/CaseClassQueryJdbcSpec.scala
@@ -43,6 +43,6 @@ class CaseClassQueryJdbcSpec extends CaseClassQuerySpec {
"Example 3 - Inline Record as Filter" in {
testContext.run(
`Ex 3 Inline Record Usage`
- ) should contain theSameElementsAs `Ex 3 Inline Record Usage exepected result`
+ ) should contain theSameElementsAs `Ex 3 Inline Record Usage expected result`
}
}
diff --git a/quill-ndbc-postgres/src/test/scala/io/getquill/context/ndbc/postgres/CaseClassQueryNdbcPostgresSpec.scala b/quill-ndbc-postgres/src/test/scala/io/getquill/context/ndbc/postgres/CaseClassQueryNdbcPostgresSpec.scala
index d7637ed4f4..3fd97c7180 100644
--- a/quill-ndbc-postgres/src/test/scala/io/getquill/context/ndbc/postgres/CaseClassQueryNdbcPostgresSpec.scala
+++ b/quill-ndbc-postgres/src/test/scala/io/getquill/context/ndbc/postgres/CaseClassQueryNdbcPostgresSpec.scala
@@ -44,6 +44,6 @@ class CaseClassQueryNdbcPostgresSpec extends CaseClassQuerySpec {
"Example 3 - Inline Record as Filter" in {
get(
context.run(`Ex 3 Inline Record Usage`)
- ) must contain theSameElementsAs `Ex 3 Inline Record Usage exepected result`
+ ) must contain theSameElementsAs `Ex 3 Inline Record Usage expected result`
}
}
diff --git a/quill-orientdb/src/main/scala/io/getquill/context/orientdb/OrientDBIdiom.scala b/quill-orientdb/src/main/scala/io/getquill/context/orientdb/OrientDBIdiom.scala
index 46e24ebf5c..80fc0eb9fa 100644
--- a/quill-orientdb/src/main/scala/io/getquill/context/orientdb/OrientDBIdiom.scala
+++ b/quill-orientdb/src/main/scala/io/getquill/context/orientdb/OrientDBIdiom.scala
@@ -38,7 +38,7 @@ trait OrientDBIdiom extends Idiom {
private def doTranslate(ast: Ast, cached: Boolean, executionType: ExecutionType, idiomContext: IdiomContext)(implicit
naming: NamingStrategy
): (Ast, Statement, ExecutionType) = {
- implicit val implcitIdiomContext: IdiomContext = idiomContext
+ implicit val implicitIdiomContext: IdiomContext = idiomContext
val normalizedAst =
if (cached)
NormalizeCaching { ast: Ast => SqlNormalize(ast, idiomContext.config) }(ast)
@@ -209,9 +209,9 @@ trait OrientDBIdiom extends Idiom {
}
protected def tokenOrderBy(
- criterias: List[OrderByCriteria]
+ criteria: List[OrderByCriteria]
)(implicit strategy: NamingStrategy, idiomContext: IdiomContext) =
- stmt"ORDER BY ${criterias.token}"
+ stmt"ORDER BY ${criteria.token}"
implicit def sourceTokenizer(implicit strategy: NamingStrategy, idiomContext: IdiomContext): Tokenizer[FromContext] =
Tokenizer[FromContext] {
diff --git a/quill-orientdb/src/test/scala/io/getquill/context/orientdb/CaseClassQueryOrientSpec.scala b/quill-orientdb/src/test/scala/io/getquill/context/orientdb/CaseClassQueryOrientSpec.scala
index e118edfee7..1d3d6b9795 100644
--- a/quill-orientdb/src/test/scala/io/getquill/context/orientdb/CaseClassQueryOrientSpec.scala
+++ b/quill-orientdb/src/test/scala/io/getquill/context/orientdb/CaseClassQueryOrientSpec.scala
@@ -48,7 +48,7 @@ class CaseClassQueryOrientSpec extends Spec {
query[Contact].filter(p => p.id == filtrationObject.idFilter)
}
- val `Ex 3 Inline Record Usage exepected result` = List(
+ val `Ex 3 Inline Record Usage expected result` = List(
new Contact(1, "Alex", "Jones", 60, 2, "foo")
)
@@ -68,6 +68,6 @@ class CaseClassQueryOrientSpec extends Spec {
"Example 2 - Inline Record as Filter" in {
testSyncDB.run(
`Ex 3 Inline Record Usage`
- ) must contain theSameElementsAs `Ex 3 Inline Record Usage exepected result`
+ ) must contain theSameElementsAs `Ex 3 Inline Record Usage expected result`
}
}
diff --git a/quill-spark/src/main/scala/io/getquill/QuillSparkContext.scala b/quill-spark/src/main/scala/io/getquill/QuillSparkContext.scala
index e6420592bb..71c3e1c022 100644
--- a/quill-spark/src/main/scala/io/getquill/QuillSparkContext.scala
+++ b/quill-spark/src/main/scala/io/getquill/QuillSparkContext.scala
@@ -55,7 +55,7 @@ trait QuillSparkContext extends Context[SparkDialect, Literal] with Encoders wit
sql"${lift(ds)}".pure.as[Query[T]]
}
- // Helper class for the perculateNullArrays method
+ // Helper class for the percolateNullArrays method
case class StructElement(column: Column, structField: StructField) {
def children: Array[StructElement] = structField.dataType match {
case StructType(fields) => fields.map(f => StructElement(column.getField(f.name), f))
@@ -88,7 +88,7 @@ trait QuillSparkContext extends Context[SparkDialect, Literal] with Encoders wit
node.structField.dataType match {
case st: StructType =>
// Recursively convert all parent array columns to single null values if all their children are null
- val preculatedColumn = struct(node.children.map(percolateNullArraysRecursive(_)).toIndexedSeq: _*)
+ val percolatedColumn = struct(node.children.map(percolateNullArraysRecursive(_)).toIndexedSeq: _*)
// Then express that column back out the schema
val mapped =
@@ -99,7 +99,7 @@ trait QuillSparkContext extends Context[SparkDialect, Literal] with Encoders wit
).otherwise(c)
}
- mapped(preculatedColumn).as(node.structField.name)
+ mapped(percolatedColumn).as(node.structField.name)
case _ =>
node.column.as(node.structField.name)
}
diff --git a/quill-spark/src/main/scala/io/getquill/context/spark/SimpleNestedExpansion.scala b/quill-spark/src/main/scala/io/getquill/context/spark/SimpleNestedExpansion.scala
index fa48e1a1bb..42372f90b3 100644
--- a/quill-spark/src/main/scala/io/getquill/context/spark/SimpleNestedExpansion.scala
+++ b/quill-spark/src/main/scala/io/getquill/context/spark/SimpleNestedExpansion.scala
@@ -59,10 +59,10 @@ object TopLevelExpansion {
* This unapplier object is used both here and in the SpartDialect select
* tokenization.
*
- * - unless the Ident has a Concrete Quat.Proudct with a single value, but
+ * - unless the Ident has a Concrete Quat.Product with a single value, but
* that has already been expanded into it's composite elements in
- * TopLevelExpanion.apply and the Ident shuold no longer exist in the select
- * values.
+ * TopLevelExpansion.apply and the Ident should no longer exist in the
+ * select values.
*
* Technically, all we we need to do here is to check that the ast element is
* not an ident, however due to previous issues encountered with surprising
diff --git a/quill-spark/src/main/scala/io/getquill/context/spark/SparkDialect.scala b/quill-spark/src/main/scala/io/getquill/context/spark/SparkDialect.scala
index bf8ce825c6..6b75db2a50 100644
--- a/quill-spark/src/main/scala/io/getquill/context/spark/SparkDialect.scala
+++ b/quill-spark/src/main/scala/io/getquill/context/spark/SparkDialect.scala
@@ -54,7 +54,7 @@ trait SparkIdiom extends SqlIdiom with CannotReturn { self =>
val normalizedAst = EscapeQuestionMarks(SqlNormalize(ast, idiomContext.config))
implicit val implicitIdiomContext: IdiomContext = idiomContext
- implicit val tokernizer = defaultTokenizer
+ implicit val tokenizer = defaultTokenizer
val token =
normalizedAst match {
@@ -125,7 +125,7 @@ trait SparkIdiom extends SqlIdiom with CannotReturn { self =>
// it is an ident but somehow it's type is not known
case List(SelectValue(Ident(a, Quat.Placeholder(_)), _, _)) =>
stmt"${a.token}.*"
- // It is an ident but actually it repsents a single sql-level value
+ // It is an ident but actually it represents a single sql-level value
case List(SelectValue(Ident(a, _: Quat.Primitive), _, _)) =>
stmt"${a.token}.*"
// If the selection is a single value e.g. SelectValue(prop.value), SelectValue(Constant) return it right here as a SingleValuePrimitive
diff --git a/quill-spark/src/test/scala/io/getquill/context/spark/QuestionMarkSpec.scala b/quill-spark/src/test/scala/io/getquill/context/spark/QuestionMarkSpec.scala
index 647339a9b8..baf1b6918e 100644
--- a/quill-spark/src/test/scala/io/getquill/context/spark/QuestionMarkSpec.scala
+++ b/quill-spark/src/test/scala/io/getquill/context/spark/QuestionMarkSpec.scala
@@ -26,7 +26,7 @@ class QuestionMarkSpec extends Spec {
testContext.run(q).collect() should contain theSameElementsAs Seq(peopleList(0))
}
- "simple variable usage must work in the middle of a stirng" in {
+ "simple variable usage must work in the middle of a string" in {
val newContact = Contact("Moe", "Rabbenu", 123, 2, "Something ? Something ? Else")
val extraPeopleList = peopleList :+ newContact
diff --git a/quill-spark/src/test/scala/io/getquill/context/spark/examples/GithubExample.scala b/quill-spark/src/test/scala/io/getquill/context/spark/examples/GitHubExample.scala
similarity index 98%
rename from quill-spark/src/test/scala/io/getquill/context/spark/examples/GithubExample.scala
rename to quill-spark/src/test/scala/io/getquill/context/spark/examples/GitHubExample.scala
index 677b5f795a..0073e708a7 100644
--- a/quill-spark/src/test/scala/io/getquill/context/spark/examples/GithubExample.scala
+++ b/quill-spark/src/test/scala/io/getquill/context/spark/examples/GitHubExample.scala
@@ -35,7 +35,7 @@ case class Activity(
org: User
)
-object GithubExample extends App {
+object GitHubExample extends App {
val files =
for {
diff --git a/quill-spark/src/test/scala/io/getquill/context/spark/examples/TopHashtagsExample.scala b/quill-spark/src/test/scala/io/getquill/context/spark/examples/TopHashtagsExample.scala
index bd96678882..92f605b18f 100644
--- a/quill-spark/src/test/scala/io/getquill/context/spark/examples/TopHashtagsExample.scala
+++ b/quill-spark/src/test/scala/io/getquill/context/spark/examples/TopHashtagsExample.scala
@@ -56,7 +56,7 @@ object TopHashtagsExample extends App {
.map(_.toLowerCase) // normalize hashtags (Dataset)
.groupBy($"value") // group by each hashtag (Dataframe)
.agg(fcount("*") as "count") // aggregate the count (Dataframe)
- .orderBy($"count" desc) // order (Datafeame)
+ .orderBy($"count" desc) // order (Dataframe)
.limit(n) // limit to top results (Dataframe)
.as[(String, BigInt)] // set the type again (Dataset)
}
@@ -64,7 +64,7 @@ object TopHashtagsExample extends App {
object quill {
def topHashtags(tweets: Dataset[Tweet], n: Int): Dataset[(String, Long)] =
run { // produce a dataset from the Quill query
- liftQuery(tweets) // trasform the dataset into a Quill query
+ liftQuery(tweets) // transform the dataset into a Quill query
.concatMap(_.text.split(" ")) // split into words and unnest results
.filter(_.startsWith("#")) // filter hashtag words
.map(_.toLowerCase) // normalize hashtags
diff --git a/quill-sql/src/test/scala/io/getquill/context/sql/AggregationSpec.scala b/quill-sql/src/test/scala/io/getquill/context/sql/AggregationSpec.scala
index 702f84f315..fedca52c96 100644
--- a/quill-sql/src/test/scala/io/getquill/context/sql/AggregationSpec.scala
+++ b/quill-sql/src/test/scala/io/getquill/context/sql/AggregationSpec.scala
@@ -27,7 +27,7 @@ class AggregationSpec extends Spec {
// SELECT p.age FROM (SELECT x.age + 1 FROM Person x) AS p WHERE p.age = 123
// => SELECT p.age + 1 FROM (SELECT x.age FROM Person x) AS p WHERE (p.age + 1) = 123
// Instead it should remain as the former query
- "simple operation should not propogate from nested" in {
+ "simple operation should not propagate from nested" in {
ctx.run {
query[Person].map(p => p.age + 1).nested.filter(p => p == 123)
}.string mustEqual "SELECT p.x FROM (SELECT p.age + 1 AS x FROM Person p) AS p WHERE p.x = 123"
@@ -44,7 +44,7 @@ class AggregationSpec extends Spec {
"sum" in { ctx.run(query[Person].map(p => sum(p.age))).string mustEqual "SELECT SUM(p.age) FROM Person p" }
}
- "work correctly with a filter cause that is BEFORE the aggreation" in {
+ "work correctly with a filter cause that is BEFORE the aggregation" in {
val q = quote {
query[Person].filter(p => p.name == "Joe").map(p => (p.id, max(p.name)))
}
@@ -160,7 +160,7 @@ class AggregationSpec extends Spec {
"SELECT p.x FROM (SELECT MAX(p.age) AS x FROM Person p GROUP BY p.age) AS p WHERE p.x > 1000"
}
- // Disable thte apply-map phase to make sure these work in cases where this reduction is not possible (e.g. where they use infix etc...).
+ // Disable the apply-map phase to make sure these work in cases where this reduction is not possible (e.g. where they use infix etc...).
// Infix has a special case already so want to not use that specifically.
"work with a map(to-leaf).groupByMap.filter - no ApplyMap" in {
implicit val d = new DisablePhase { override type Phase = OptionalPhase.ApplyMap :: HNil }
diff --git a/quill-sql/src/test/scala/io/getquill/context/sql/GroupBySpec.scala b/quill-sql/src/test/scala/io/getquill/context/sql/GroupBySpec.scala
index 64bca45f95..170ed53018 100644
--- a/quill-sql/src/test/scala/io/getquill/context/sql/GroupBySpec.scala
+++ b/quill-sql/src/test/scala/io/getquill/context/sql/GroupBySpec.scala
@@ -21,7 +21,7 @@ class GroupBySpec extends Spec {
.join(query[Country])
.on { case (city, country) => city.countryId == country.id }
.groupBy { case (city, country) => country }
- .map { case (country, citysInCountry) => (country.name, citysInCountry.map(cICn => cICn._1)) }
+ .map { case (country, cityInCountry) => (country.name, cityInCountry.map(cICn => cICn._1)) }
.map { case (country, citiesInCountry) => (country, citiesInCountry.size) }
)
testContext.run(q).string mustEqual
@@ -35,7 +35,7 @@ class GroupBySpec extends Spec {
.join(query[Country])
.on { case (city, country) => city.countryId == country.id }
.groupBy { case (city, country) => country }
- .map { case (country, citysInCountry) => (country.name, citysInCountry.map(cICn => cICn._1)) }
+ .map { case (country, cityInCountry) => (country.name, cityInCountry.map(cICn => cICn._1)) }
.map { case (country, citiesInCountry) => (country, citiesInCountry.size) }
)
testContext.run(q).string mustEqual
@@ -81,8 +81,8 @@ class GroupBySpec extends Spec {
.join(query[Country])
.on { case (city, country) => city.countryCode == country.countryCode }
.groupBy { case (city, country) => country }
- .map { case (country, citysInCountry) =>
- ((country.countryCode, country.language), citysInCountry.map(cICn => cICn._1))
+ .map { case (country, cityInCountry) =>
+ ((country.countryCode, country.language), cityInCountry.map(cICn => cICn._1))
}
.map { case (country, cityCountries) => (country, cityCountries.size) }
)
@@ -143,8 +143,8 @@ class GroupBySpec extends Spec {
.join(query[Country])
.on { case (city, country) => city.countryCode == country.countryCode }
.groupBy { case (city, country) => country }
- .map { case (country, citysInCountry) =>
- ((country.countryCode, country.language), citysInCountry.map(cICn => cICn._1))
+ .map { case (country, cityInCountry) =>
+ ((country.countryCode, country.language), cityInCountry.map(cICn => cICn._1))
}
.map { case (country, cityCountries) => (country, cityCountries.size) }
)
@@ -239,7 +239,7 @@ class GroupBySpec extends Spec {
"SELECT p.* FROM (SELECT MAX(p.age) FROM Person p GROUP BY p.age) AS p WHERE p > 1000"
}
- // Disable thte apply-map phase to make sure these work in cases where this reduction is not possible (e.g. where they use infix etc...).
+ // Disable the apply-map phase to make sure these work in cases where this reduction is not possible (e.g. where they use infix etc...).
// Infix has a special case already so want to not use that specifically.
"work with a map(to-leaf).groupByMap.map.filter - no ApplyMap" in {
implicit val d = new DisablePhase { override type Phase = OptionalPhase.ApplyMap :: HNil }
diff --git a/quill-sql/src/test/scala/io/getquill/context/sql/NestedDistinctSpec.scala b/quill-sql/src/test/scala/io/getquill/context/sql/NestedDistinctSpec.scala
index 1e81e77fd7..b0e8a8cc8a 100644
--- a/quill-sql/src/test/scala/io/getquill/context/sql/NestedDistinctSpec.scala
+++ b/quill-sql/src/test/scala/io/getquill/context/sql/NestedDistinctSpec.scala
@@ -123,12 +123,12 @@ class NestedDistinctSpec extends Spec {
case class SimpleEnt(a: Int, b: String)
case class SimpleEnt2(aa: Int, bb: String)
- val qschem = quote {
+ val qschema = quote {
querySchema[SimpleEnt]("CustomEnt", _.a -> "field_a")
}
val q = quote {
- qschem
+ qschema
.map(e => SimpleEnt(e.a + 1, e.b))
.distinct
.map(e => SimpleEnt2(e.a + 2, e.b))
@@ -141,12 +141,12 @@ class NestedDistinctSpec extends Spec {
case class SimpleEnt(a: Int, b: String)
case class SimpleEnt2(aa: Int, bb: String)
- val qschem = quote {
+ val qschema = quote {
querySchema[SimpleEnt]("CustomEnt", _.a -> "field_a")
}
val q = quote {
- qschem
+ qschema
.map(e => (e.a + 1, sql"foo(${e.b})".as[String]))
.nested
.map(e => (e._1 + 2, sql"bar(${e._2})".as[String]))
@@ -160,12 +160,12 @@ class NestedDistinctSpec extends Spec {
case class SimpleEnt(a: Int, b: String)
case class SimpleEnt2(aa: Int, bb: String)
- val qschem = quote {
+ val qschema = quote {
querySchema[SimpleEnt]("CustomEnt", _.a -> "field_a")
}
val q = quote {
- qschem
+ qschema
.map(e => (e.a + 1, sql"foo(${e.b})".as[String]))
.map(e => (e._1 + 2, sql"bar(${e._2})".as[String]))
}
@@ -213,49 +213,49 @@ class NestedDistinctSpec extends Spec {
ctx.run(q).string mustEqual "SELECT e._1, e._2id AS id, e._2theName AS theName FROM (SELECT p.idP AS _1, p.id AS _2id, p.theName AS _2theName FROM Parent p) AS e"
}
- "can be propogated across query with naming intact and then used further" in {
+ "can be propagated across query with naming intact and then used further" in {
val q = quote {
query[Parent].map(p => p.emb).distinct.map(e => (e.name, e.id)).distinct.map(tup => (tup._1, tup._2)).distinct
}
ctx.run(q).string mustEqual "SELECT DISTINCT p._1theName AS _1, p._1id AS _2 FROM (SELECT DISTINCT p.id AS _1id, p.theName AS _1theName FROM Parent p) AS p"
}
- "can be propogated across query with naming intact and then used further - nested" in {
+ "can be propagated across query with naming intact and then used further - nested" in {
val q = quote {
query[Parent].map(p => p.emb).nested.map(e => (e.name, e.id)).nested.map(tup => (tup._1, tup._2)).nested
}
ctx.run(q).string mustEqual "SELECT x._1, x._2 FROM (SELECT tup._1, tup._2 FROM (SELECT e.theName AS _1, e.id AS _2 FROM (SELECT p.id, p.theName FROM Parent p) AS e) AS tup) AS x"
}
- "can be propogated across query with naming intact - returned as single property" in {
+ "can be propagated across query with naming intact - returned as single property" in {
val q = quote {
query[Parent].map(p => p.emb).distinct.map(e => (e.name))
}
ctx.run(q).string mustEqual "SELECT p._1theName AS theName FROM (SELECT DISTINCT p.id AS _1id, p.theName AS _1theName FROM Parent p) AS p"
}
- "can be propogated across query with naming intact - and the immediately returned" in {
+ "can be propagated across query with naming intact - and the immediately returned" in {
val q = quote {
query[Parent].map(p => p.emb).nested.map(e => e)
}
ctx.run(q).string mustEqual "SELECT x.id, x.theName FROM (SELECT p.id, p.theName FROM Parent p) AS x"
}
- "can be propogated across distinct with naming intact - and the immediately returned" in {
+ "can be propagated across distinct with naming intact - and the immediately returned" in {
val q = quote {
query[Parent].map(p => p.emb).distinct.map(e => e)
}
ctx.run(q).string mustEqual "SELECT DISTINCT p.id, p.theName FROM Parent p"
}
- "can be propogated across query with naming intact and then re-wrapped in case class" in {
+ "can be propagated across query with naming intact and then re-wrapped in case class" in {
val q = quote {
query[Parent].map(p => p.emb).distinct.map(e => Parent(1, e))
}
ctx.run(q).string mustEqual "SELECT 1 AS idP, p._1id AS id, p._1theName AS theName FROM (SELECT DISTINCT p.id AS _1id, p.theName AS _1theName FROM Parent p) AS p"
}
- "can be propogated across query with naming intact and then re-wrapped in tuple" in {
+ "can be propagated across query with naming intact and then re-wrapped in tuple" in {
val q = quote {
query[Parent].map(p => p.emb).nested.map(e => Parent(1, e))
}
diff --git a/quill-sql/src/test/scala/io/getquill/context/sql/SqlQueryMacroSpec.scala b/quill-sql/src/test/scala/io/getquill/context/sql/SqlQueryMacroSpec.scala
index bfcfd77ce3..c42cb3df1b 100644
--- a/quill-sql/src/test/scala/io/getquill/context/sql/SqlQueryMacroSpec.scala
+++ b/quill-sql/src/test/scala/io/getquill/context/sql/SqlQueryMacroSpec.scala
@@ -37,7 +37,7 @@ class SqlQueryMacroSpec extends Spec {
mirror.string mustEqual "SELECT x.s, x.i, x.l, x.o FROM TestEntity t, TestEntity2 x"
}
}
- "with bindigns" - {
+ "with bindings" - {
"one" in {
val q = quote {
qr1.filter(t => t.s != lift("s"))
diff --git a/quill-sql/src/test/scala/io/getquill/context/sql/SqlQuerySpec.scala b/quill-sql/src/test/scala/io/getquill/context/sql/SqlQuerySpec.scala
index 651ae66a65..98b7f9f01d 100644
--- a/quill-sql/src/test/scala/io/getquill/context/sql/SqlQuerySpec.scala
+++ b/quill-sql/src/test/scala/io/getquill/context/sql/SqlQuerySpec.scala
@@ -588,7 +588,7 @@ class SqlQuerySpec extends Spec {
"SELECT 1 FROM (SELECT DISTINCT t.i AS _1 FROM TestEntity t) AS t" // hel
}
- "with map uppsercase" in {
+ "with map uppercase" in {
import testContextUpper._
val q = quote {
qr1.map(t => t.i).distinct.map(t => 1)
diff --git a/quill-sql/src/test/scala/io/getquill/context/sql/base/CaseClassQuerySpec.scala b/quill-sql/src/test/scala/io/getquill/context/sql/base/CaseClassQuerySpec.scala
index 8812950d9a..08f2a8e863 100644
--- a/quill-sql/src/test/scala/io/getquill/context/sql/base/CaseClassQuerySpec.scala
+++ b/quill-sql/src/test/scala/io/getquill/context/sql/base/CaseClassQuerySpec.scala
@@ -77,7 +77,7 @@ trait CaseClassQuerySpec extends Spec {
query[Contact].filter(p => p.firstName == person.firstName && person.lastName == person.lastName)
}
- val `Ex 3 Inline Record Usage exepected result` = List(
+ val `Ex 3 Inline Record Usage expected result` = List(
new Contact("Alex", "Jones", 60, 2, "foo")
)
diff --git a/quill-sql/src/test/scala/io/getquill/context/sql/idiom/OffsetWithoutLimitWorkaroundSpec.scala b/quill-sql/src/test/scala/io/getquill/context/sql/idiom/OffsetWithoutLimitWorkaroundSpec.scala
index 2ff120528d..5f985452d5 100644
--- a/quill-sql/src/test/scala/io/getquill/context/sql/idiom/OffsetWithoutLimitWorkaroundSpec.scala
+++ b/quill-sql/src/test/scala/io/getquill/context/sql/idiom/OffsetWithoutLimitWorkaroundSpec.scala
@@ -18,7 +18,7 @@ class OffsetWithoutLimitWorkaroundSpec extends Spec {
}
import ctx._
- "creates a synthectic limit" in {
+ "creates a synthetic limit" in {
val q = quote {
qr1.drop(1)
}
diff --git a/quill-sql/src/test/scala/io/getquill/context/sql/idiom/SqlIdiomNamingSpec.scala b/quill-sql/src/test/scala/io/getquill/context/sql/idiom/SqlIdiomNamingSpec.scala
index 9cba415350..9da01af6e3 100644
--- a/quill-sql/src/test/scala/io/getquill/context/sql/idiom/SqlIdiomNamingSpec.scala
+++ b/quill-sql/src/test/scala/io/getquill/context/sql/idiom/SqlIdiomNamingSpec.scala
@@ -35,7 +35,7 @@ class SqlIdiomNamingSpec extends Spec {
db.run(query[SomeEntity]).string mustEqual
"SELECT x.some_column AS someColumn FROM some_entity x"
}
- "mutiple transformations" in {
+ "multiple transformations" in {
val db = new SqlMirrorContext(MirrorSqlDialect, NamingStrategy(SnakeCase, UpperCase, Escape))
import db._
db.run(query[SomeEntity]).string mustEqual
diff --git a/quill-sql/src/test/scala/io/getquill/context/sql/norm/RenamePropertiesOverrideSpec.scala b/quill-sql/src/test/scala/io/getquill/context/sql/norm/RenamePropertiesOverrideSpec.scala
index cd8d4815ee..a8208310dd 100644
--- a/quill-sql/src/test/scala/io/getquill/context/sql/norm/RenamePropertiesOverrideSpec.scala
+++ b/quill-sql/src/test/scala/io/getquill/context/sql/norm/RenamePropertiesOverrideSpec.scala
@@ -249,7 +249,7 @@ class RenamePropertiesOverrideSpec extends Spec {
}
"join" - {
- "both sidess" in {
+ "both sides" in {
val q = quote {
e.leftJoin(e).on((a, b) => a.s == b.s).map(t => (t._1.s, t._2.map(_.s)))
}
@@ -346,7 +346,7 @@ class RenamePropertiesOverrideSpec extends Spec {
}
}
- "respects the schema definition for embeddeds" - {
+ "respects the schema definition for embedded" - {
"query" - {
"without schema" in {
case class B(c: Int)
@@ -364,7 +364,7 @@ class RenamePropertiesOverrideSpec extends Spec {
"SELECT x.bC FROM A x"
}
}
- "query for Option embeddeds" - {
+ "query for Option embedded" - {
"without schema" in {
case class B(c1: Int, c2: Int)
case class A(b: Option[B])
diff --git a/quill-sql/src/test/scala/io/getquill/context/sql/norm/RenamePropertiesSpec.scala b/quill-sql/src/test/scala/io/getquill/context/sql/norm/RenamePropertiesSpec.scala
index ccba215a46..3bc8f448aa 100644
--- a/quill-sql/src/test/scala/io/getquill/context/sql/norm/RenamePropertiesSpec.scala
+++ b/quill-sql/src/test/scala/io/getquill/context/sql/norm/RenamePropertiesSpec.scala
@@ -392,7 +392,7 @@ class RenamePropertiesSpec extends Spec {
}
}
- "respects the schema definition for embeddeds" - {
+ "respects the schema definition for embedded" - {
"query" - {
"without schema" in {
case class B(c: Int)
@@ -410,7 +410,7 @@ class RenamePropertiesSpec extends Spec {
"SELECT x.bC FROM A x"
}
}
- "query for Option embeddeds" - {
+ "query for Option embedded" - {
"without schema" in {
case class B(c1: Int, c2: Int)
case class A(b: Option[B])
diff --git a/quill-sql/src/test/scala/io/getquill/context/sql/norm/SheathLeafClausesSpec.scala b/quill-sql/src/test/scala/io/getquill/context/sql/norm/SheathLeafClausesSpec.scala
index 4420f9ccb9..7a15aa0f5a 100644
--- a/quill-sql/src/test/scala/io/getquill/context/sql/norm/SheathLeafClausesSpec.scala
+++ b/quill-sql/src/test/scala/io/getquill/context/sql/norm/SheathLeafClausesSpec.scala
@@ -114,7 +114,7 @@ class SheathLeafClausesSpec extends Spec {
.join(query[Person].concatMap(t => t.firstName.split(" ")))
.on { case (a, b) => a == b }
)
- // TODO star idenfiers should not have aliases
+ // TODO star identifiers should not have aliases
ctx.run(q).string mustEqual "SELECT x01.*, x11.* FROM (SELECT UNNEST(SPLIT(p.first_name, ' ')) AS x FROM person p) AS x01 INNER JOIN (SELECT UNNEST(SPLIT(t.first_name, ' ')) AS x FROM person t) AS x11 ON x01.x = x11.x"
}
diff --git a/quill-sql/src/test/scala/io/getquill/quat/QuatRunSpec.scala b/quill-sql/src/test/scala/io/getquill/quat/QuatRunSpec.scala
index 6a9b6b5a0c..8b1648ee6e 100644
--- a/quill-sql/src/test/scala/io/getquill/quat/QuatRunSpec.scala
+++ b/quill-sql/src/test/scala/io/getquill/quat/QuatRunSpec.scala
@@ -34,7 +34,7 @@ class QuatRunSpec extends Spec {
result.string mustEqual "SELECT x.name, x.age FROM MyPerson x APPEND FOO"
}
- "should support query-ops function - multile var" in {
+ "should support query-ops function - multiple var" in {
def appendFooFun[Q <: Query[_]] = quote((q: Q, i: Int) => sql"$q APPEND $i FOO".transparent.pure.as[Q])
val q = quote(appendFooFun(query[MyPerson], 123))
q.ast.quat mustEqual Quat.Generic // Is it unknown, how should the reducing work from an infix with multiple vars?
diff --git a/quill-sql/src/test/sql/postgres-doobie-schema.sql b/quill-sql/src/test/sql/postgres-doobie-schema.sql
index 3573fe9fba..a19e666077 100644
--- a/quill-sql/src/test/sql/postgres-doobie-schema.sql
+++ b/quill-sql/src/test/sql/postgres-doobie-schema.sql
@@ -1,6 +1,6 @@
--
-- The sample data used in the world database is Copyright Statistics
--- Finland, http://www.stat.fi/worldinfigures.
+-- Finland, https://www.stat.fi/worldinfigures.
--
CREATE TABLE IF NOT EXISTS city (