sql #32: mv blocking.*.structList to .structs 'cause Lazily.structs()…

… gives Iterator, not a list
Miha-x64 · Mar 14, 2020 · 0299de6 · 0299de6
1 parent f47a1ba
commit 0299de6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/sql/src/main/kotlin/net/aquadc/persistence/sql/blocking/Blocking.kt b/sql/src/main/kotlin/net/aquadc/persistence/sql/blocking/Blocking.kt
@@ -47,7 +47,7 @@ object Eagerly {
     inline fun <CUR : AutoCloseable, SCH : Schema<SCH>> struct(table: Table<SCH, *, *>, bindBy: BindBy): Fetch<Blocking<CUR>, StructSnapshot<SCH>> =
             FetchStructEagerly(table, bindBy)
 
-    inline fun <CUR : AutoCloseable, SCH : Schema<SCH>> structList(table: Table<SCH, *, *>, bindBy: BindBy): Fetch<Blocking<CUR>, List<StructSnapshot<SCH>>> =
+    inline fun <CUR : AutoCloseable, SCH : Schema<SCH>> structs(table: Table<SCH, *, *>, bindBy: BindBy): Fetch<Blocking<CUR>, List<StructSnapshot<SCH>>> =
             FetchStructListEagerly(table, bindBy)
 }
 
@@ -67,7 +67,7 @@ object Lazily {
     inline fun <CUR : AutoCloseable, SCH : Schema<SCH>> struct(table: Table<SCH, *, *>, bindBy: BindBy): Fetch<Blocking<CUR>, Lazy<StructSnapshot<SCH>>> =
             FetchStructLazily(table, bindBy)
 
-    inline fun <CUR : AutoCloseable, SCH : Schema<SCH>> structList(table: Table<SCH, *, *>, bindBy: BindBy): Fetch<Blocking<CUR>, CloseableIterator<TemporaryStruct<SCH>>> =
+    inline fun <CUR : AutoCloseable, SCH : Schema<SCH>> structs(table: Table<SCH, *, *>, bindBy: BindBy): Fetch<Blocking<CUR>, CloseableIterator<TemporaryStruct<SCH>>> =
             FetchStructListLazily<CUR, SCH>(table, bindBy)
 
     inline fun cellByteStream(): Fetch<Blocking<ResultSet>, InputStream> =

diff --git a/sql/src/test/kotlin/net/aquadc/persistence/sql/TemplatesTest.kt b/sql/src/test/kotlin/net/aquadc/persistence/sql/TemplatesTest.kt
@@ -101,7 +101,7 @@ open class TemplatesTest {
 
             val userContacts = session.query(
                     USERS_BY_NAME_AND_EMAIL_START, string, string,
-                    structList<CUR, Tuple<Struct<Tuple<String, DataType.Simple<String>, String, DataType.Simple<String>>>, Tuple<String, DataType.Simple<String>, String, DataType.Simple<String>>, Struct<Tuple<String, DataType.Simple<String>, Long, DataType.Simple<Long>>>, Tuple<String, DataType.Simple<String>, Long, DataType.Simple<Long>>>>(joined, BindBy.Name)
+                    structs<CUR, Tuple<Struct<Tuple<String, DataType.Simple<String>, String, DataType.Simple<String>>>, Tuple<String, DataType.Simple<String>, String, DataType.Simple<String>>, Struct<Tuple<String, DataType.Simple<String>, Long, DataType.Simple<Long>>>, Tuple<String, DataType.Simple<String>, Long, DataType.Simple<Long>>>>(joined, BindBy.Name)
             )
             val contacts = userContacts("John", "john")
             assertEquals(listOf(expectedJohn), contacts)
@@ -116,7 +116,7 @@ open class TemplatesTest {
 
             val userContacts = session.query(
                     USERS_BY_NAME_AND_EMAIL_START, string, string,
-                    structList<CUR, Tuple<Struct<Tuple<String, DataType.Simple<String>, String, DataType.Simple<String>>>, Tuple<String, DataType.Simple<String>, String, DataType.Simple<String>>, Struct<Tuple<String, DataType.Simple<String>, Long, DataType.Simple<Long>>>, Tuple<String, DataType.Simple<String>, Long, DataType.Simple<Long>>>>(joined, BindBy.Name)
+                    structs<CUR, Tuple<Struct<Tuple<String, DataType.Simple<String>, String, DataType.Simple<String>>>, Tuple<String, DataType.Simple<String>, String, DataType.Simple<String>>, Struct<Tuple<String, DataType.Simple<String>, Long, DataType.Simple<Long>>>, Tuple<String, DataType.Simple<String>, Long, DataType.Simple<Long>>>>(joined, BindBy.Name)
             )
             val iter = userContacts("John", "john") // don't collect TemporaryStructs!
             assertTrue(iter.hasNext())