toSqlStr -> renderSql

com-lihaoyi · Dec 11, 2023 · 82c2e91 · 82c2e91
1 parent a884f02
commit 82c2e91
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/docs/design.md b/docs/design.md
@@ -19,7 +19,7 @@ The rough dataflow of how ScalaSql works is given by the following diagram:
            Q |                                       | R
              |                                       |
              v                                       |
-Queryable#{toSqlStr,walkSqlExprs}            Queryable#construct
+Queryable#{renderSql,walkExprs}            Queryable#construct
              |                                       ^
              |                                       |
       SqlStr |                                       | ResultSet

diff --git a/scalasql/core/src/DbApi.scala b/scalasql/core/src/DbApi.scala
@@ -109,7 +109,7 @@ object DbApi {
 
   def unpackQueryable[R, Q](query: Q, qr: Queryable[Q, R], config: Config) = {
     val ctx = Context.Impl(Map(), Map(), config)
-    val flattened = SqlStr.flatten(qr.toSqlStr(query, ctx))
+    val flattened = SqlStr.flatten(qr.renderSql(query, ctx))
     flattened
   }
 

diff --git a/scalasql/core/src/Queryable.scala b/scalasql/core/src/Queryable.scala
@@ -46,7 +46,7 @@ trait Queryable[-Q, R] {
    * Converts the given queryable value into a [[SqlStr]], that can then be executed
    * by the underlying SQL JDBC interface
    */
-  def toSqlStr(q: Q, ctx: Context): SqlStr
+  def renderSql(q: Q, ctx: Context): SqlStr
 
   /**
    * Construct a Scala return value from the [[Queryable.ResultSetIterator]] representing
@@ -87,7 +87,7 @@ object Queryable {
     def walkLabels(): Seq[List[String]]
     def walkLabels(q: Q): Seq[List[String]] = walkLabels()
 
-    def toSqlStr(q: Q, ctx: Context): SqlStr = {
+    def renderSql(q: Q, ctx: Context): SqlStr = {
       ExprsToSql.apply(this.walkLabelsAndExprs(q), ctx, sql"SELECT ")
     }
 

diff --git a/scalasql/query/src/Query.scala b/scalasql/query/src/Query.scala
@@ -69,7 +69,7 @@ object Query {
     override def walkExprs(q: Q) = q.queryWalkExprs()
     override def isSingleRow(q: Q) = q.queryIsSingleRow
 
-    def toSqlStr(q: Q, ctx: Context): SqlStr = q.renderSql(ctx)
+    def renderSql(q: Q, ctx: Context): SqlStr = q.renderSql(ctx)
 
     override def construct(q: Q, args: Queryable.ResultSetIterator): R = q.queryConstruct(args)
   }