select id from table, many

.github/workflows/fsharp.yml

@@ -15,16 +15,16 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: docker-compose
-        run: docker-compose up -d
+      - name: docker compose
+        run: docker compose up -d
         working-directory: testdata/gen
 
       - name: show docker ps
-        run: docker-compose ps
+        run: docker compose ps
         working-directory: testdata/gen
 
       - name: show docker logs
-        run: docker-compose logs
+        run: docker compose logs
         working-directory: testdata/gen
 
       - name: Setup .NET
@@ -60,7 +60,7 @@ jobs:
           echo $DATABASE_URL
           dotnet run
         working-directory: testdata/gen/sqlc_test
-      
+
   #  - name: Test
   #  - name: Test
   #    run: dotnet test --no-build --verbosity normal

templates/query.tmpl

@@ -64,11 +64,15 @@ let {{.MethodName}} (db: NpgsqlConnection) {{if .Arg.Pair}} ({{.Arg.Pair}}) {{-
 {{range .Comments}}//{{.}}
 {{end -}}
 let {{.MethodName}} (db: NpgsqlConnection) {{if .Arg.Pair}} ({{.Arg.Pair}}) {{- end }} =
+  {{- if eq (len .Ret.UniqueFields) 1 }}
+  let reader = fun (read:RowReader) -> read.{{(index .Ret.UniqueFields 0).Type | type2readerFunc }} "{{(index .Ret.UniqueFields 0).Name}}"
+  {{ else }}
   let reader = fun (read:RowReader) -> {
   {{- range $i, $e := .Ret.UniqueFields}}
     {{$e.Name | pascalCase }} = read.{{$e.Type | type2readerFunc }} "{{$e.Name}}"
   {{- end -}}
   }
+  {{ end }}
   db 
   |> Sql.existingConnection
   |> Sql.query {{.ConstantName}}

testdata/gen/auth_user.sql.fs

@@ -136,6 +136,7 @@ let GetAllAuthUsers (db: NpgsqlConnection)  =
     IsStaff = read.bool "is_staff"
     IsActive = read.bool "is_active"
     DateJoined = read.dateTime "date_joined"}
+
   db 
   |> Sql.existingConnection
   |> Sql.query getAllAuthUsers
@@ -377,6 +378,7 @@ let GetUserStats (db: NpgsqlConnection)  (arg: GetUserStatsParams) =
     TotalChatMessages3Days = read.int64 "total_chat_messages_3_days"
     TotalTokenCount3Days = read.int64 "total_token_count_3_days"
     RateLimit = read.int "rate_limit"}
+
   db 
   |> Sql.existingConnection
   |> Sql.query getUserStats
@@ -395,6 +397,60 @@ let GetUserStats (db: NpgsqlConnection)  (arg: GetUserStatsParams) =
 
 
 
+let listAuthUserID = """-- name: ListAuthUserID :many
+SELECT id FROM auth_user
+"""
+
+
+
+
+let ListAuthUserID (db: NpgsqlConnection)  =
+  let reader = fun (read:RowReader) -> read.int "id"
+
+  db 
+  |> Sql.existingConnection
+  |> Sql.query listAuthUserID
+  |> Sql.execute reader
+
+
+
+
+
+
+
+
+
+
+let listAuthUserIDandEmail = """-- name: ListAuthUserIDandEmail :many
+SELECT id, email FROM auth_user
+"""
+
+
+type ListAuthUserIDandEmailRow = {
+  Id: int32;
+  Email: string;
+}
+
+
+let ListAuthUserIDandEmail (db: NpgsqlConnection)  =
+  let reader = fun (read:RowReader) -> {
+    Id = read.int "id"
+    Email = read.string "email"}
+
+  db 
+  |> Sql.existingConnection
+  |> Sql.query listAuthUserIDandEmail
+  |> Sql.execute reader
+
+
+
+
+
+
+
+
+
+
 let listAuthUsers = """-- name: ListAuthUsers :many
 SELECT id, password, last_login, is_superuser, username, first_name, last_name, email, is_staff, is_active, date_joined FROM auth_user ORDER BY id LIMIT @limit OFFSET @offset
 """
@@ -419,6 +475,7 @@ let ListAuthUsers (db: NpgsqlConnection)  (arg: ListAuthUsersParams) =
     IsStaff = read.bool "is_staff"
     IsActive = read.bool "is_active"
     DateJoined = read.dateTime "date_joined"}
+
   db 
   |> Sql.existingConnection
   |> Sql.query listAuthUsers
@@ -443,6 +500,32 @@ let ListAuthUsers (db: NpgsqlConnection)  (arg: ListAuthUsersParams) =
 
 
 
+let totalAuthUsers = """-- name: TotalAuthUsers :one
+SELECT COUNT(*) FROM auth_user
+"""
+
+
+
+let TotalAuthUsers (db: NpgsqlConnection)   =
+
+  let reader = fun (read:RowReader) -> read.int64 "count"
+
+  db
+  |> Sql.existingConnection
+  |> Sql.query totalAuthUsers
+  |> Sql.executeRow reader
+
+
+
+
+
+
+
+
+
+
+
+
 let updateAuthUser = """-- name: UpdateAuthUser :one
 UPDATE auth_user SET first_name = @first_name, last_name= @last_name, last_login = now() 
 WHERE id = @id

testdata/gen/auth_user_management.sql.fs

@@ -139,6 +139,9 @@ let GetRateLimit (db: NpgsqlConnection)  (userId: int32)  =
 
 
 
+
+
+
 
 
 

testdata/gen/chat_jwt_secrets.sql.fs

@@ -199,6 +199,9 @@ let GetJwtSecret (db: NpgsqlConnection)  (name: string)  =
 
 
 
+
+
+
 
 
 

testdata/gen/chat_log.sql.fs

@@ -171,6 +171,8 @@ let DeleteChatLog (db: NpgsqlConnection)  (id: int32)  =
 
 
 
+
+
 
 
 
@@ -188,6 +190,7 @@ let ListChatLogs (db: NpgsqlConnection)  =
     Question = read.string "question"
     Answer = read.string "answer"
     CreatedAt = read.dateTime "created_at"}
+
   db 
   |> Sql.existingConnection
   |> Sql.query listChatLogs
@@ -211,6 +214,7 @@ let ListChatLogs (db: NpgsqlConnection)  =
 
 
 
+
 
 
 let updateChatLog = """-- name: UpdateChatLog :one

testdata/gen/chat_message.sql.fs

@@ -198,6 +198,7 @@ let GetAllChatMessages (db: NpgsqlConnection)  =
     IsPin = read.bool "is_pin"
     TokenCount = read.int "token_count"
     Raw = read.string "raw"}
+
   db 
   |> Sql.existingConnection
   |> Sql.query getAllChatMessages
@@ -394,6 +395,7 @@ let GetChatMessagesBySessionUUID (db: NpgsqlConnection)  (arg: GetChatMessagesBy
     IsPin = read.bool "is_pin"
     TokenCount = read.int "token_count"
     Raw = read.string "raw"}
+
   db 
   |> Sql.existingConnection
   |> Sql.query getChatMessagesBySessionUUID
@@ -581,6 +583,7 @@ let GetLastNChatMessages (db: NpgsqlConnection)  (arg: GetLastNChatMessagesParam
     IsPin = read.bool "is_pin"
     TokenCount = read.int "token_count"
     Raw = read.string "raw"}
+
   db 
   |> Sql.existingConnection
   |> Sql.query getLastNChatMessages
@@ -640,6 +643,7 @@ let GetLatestMessagesBySessionUUID (db: NpgsqlConnection)  (arg: GetLatestMessag
     IsPin = read.bool "is_pin"
     TokenCount = read.int "token_count"
     Raw = read.string "raw"}
+
   db 
   |> Sql.existingConnection
   |> Sql.query getLatestMessagesBySessionUUID
@@ -708,6 +712,9 @@ let HasChatMessagePermission (db: NpgsqlConnection)  (arg: HasChatMessagePermiss
 
 
 
+
+
+
 
 
 

testdata/gen/chat_model.sql.fs

@@ -261,6 +261,8 @@ let GetDefaultChatModel (db: NpgsqlConnection)   =
 
 
 
+
+
 
 
 
@@ -282,6 +284,7 @@ let ListChatModels (db: NpgsqlConnection)  =
     ApiAuthKey = read.string "api_auth_key"
     UserId = read.int "user_id"
     EnablePerModeRatelimit = read.bool "enable_per_mode_ratelimit"}
+
   db 
   |> Sql.existingConnection
   |> Sql.query listChatModels
@@ -317,6 +320,7 @@ let ListSystemChatModels (db: NpgsqlConnection)  =
     ApiAuthKey = read.string "api_auth_key"
     UserId = read.int "user_id"
     EnablePerModeRatelimit = read.bool "enable_per_mode_ratelimit"}
+
   db 
   |> Sql.existingConnection
   |> Sql.query listSystemChatModels
@@ -341,6 +345,7 @@ let ListSystemChatModels (db: NpgsqlConnection)  =
 
 
 
+
 
 
 let updateChatModel = """-- name: UpdateChatModel :one

testdata/gen/chat_prompt.sql.fs

@@ -171,6 +171,7 @@ let GetAllChatPrompts (db: NpgsqlConnection)  =
     UpdatedBy = read.int "updated_by"
     IsDeleted = read.bool "is_deleted"
     TokenCount = read.int "token_count"}
+
   db 
   |> Sql.existingConnection
   |> Sql.query getAllChatPrompts
@@ -303,6 +304,7 @@ let GetChatPromptsBySessionUUID (db: NpgsqlConnection)  (chatSessionUuid: string
     UpdatedBy = read.int "updated_by"
     IsDeleted = read.bool "is_deleted"
     TokenCount = read.int "token_count"}
+
   db 
   |> Sql.existingConnection
   |> Sql.query getChatPromptsBySessionUUID
@@ -343,6 +345,7 @@ let GetChatPromptsByUserID (db: NpgsqlConnection)  (userId: int32) =
     UpdatedBy = read.int "updated_by"
     IsDeleted = read.bool "is_deleted"
     TokenCount = read.int "token_count"}
+
   db 
   |> Sql.existingConnection
   |> Sql.query getChatPromptsByUserID
@@ -383,6 +386,7 @@ let GetChatPromptsBysession_uuid (db: NpgsqlConnection)  (chatSessionUuid: strin
     UpdatedBy = read.int "updated_by"
     IsDeleted = read.bool "is_deleted"
     TokenCount = read.int "token_count"}
+
   db 
   |> Sql.existingConnection
   |> Sql.query getChatPromptsBysession_uuid
@@ -508,6 +512,9 @@ let HasChatPromptPermission (db: NpgsqlConnection)  (arg: HasChatPromptPermissio
 
 
 
+
+
+
 
 
 

testdata/gen/chat_session.sql.fs

@@ -286,6 +286,7 @@ let GetAllChatSessions (db: NpgsqlConnection)  =
     MaxTokens = read.int "max_tokens"
     N = read.int "n"
     Debug = read.bool "debug"}
+
   db 
   |> Sql.existingConnection
   |> Sql.query getAllChatSessions
@@ -469,6 +470,7 @@ let GetChatSessionsByUserID (db: NpgsqlConnection)  (userId: int32) =
     MaxTokens = read.int "max_tokens"
     N = read.int "n"
     Debug = read.bool "debug"}
+
   db 
   |> Sql.existingConnection
   |> Sql.query getChatSessionsByUserID
@@ -548,6 +550,9 @@ let HasChatSessionPermission (db: NpgsqlConnection)  (arg: HasChatSessionPermiss
 
 
 
+
+
+
 
 
 

testdata/gen/chat_snapshot.sql.fs

@@ -117,6 +117,7 @@ let ChatSnapshotMetaByUserID (db: NpgsqlConnection)  (userId: int32) =
     Summary = read.string "summary"
     Tags = read.string "tags"
     CreatedAt = read.dateTime "created_at"}
+
   db 
   |> Sql.existingConnection
   |> Sql.query chatSnapshotMetaByUserID
@@ -157,6 +158,7 @@ let ChatSnapshotSearch (db: NpgsqlConnection)  (arg: ChatSnapshotSearchParams) =
     Uuid = read.string "uuid"
     Title = read.string "title"
     Rank = read.float "rank"}
+
   db 
   |> Sql.existingConnection
   |> Sql.query chatSnapshotSearch
@@ -331,6 +333,8 @@ let DeleteChatSnapshot (db: NpgsqlConnection)  (arg: DeleteChatSnapshotParams)
 
 
 
+
+
 
 
 
@@ -355,6 +359,7 @@ let ListChatSnapshots (db: NpgsqlConnection)  =
     CreatedAt = read.dateTime "created_at"
     Text = read.string "text"
     SearchVector = read.stringOrNone "search_vector"}
+
   db 
   |> Sql.existingConnection
   |> Sql.query listChatSnapshots
@@ -387,6 +392,7 @@ let ListChatSnapshots (db: NpgsqlConnection)  =
 
 
 
+
 
 
 let updateChatSnapshot = """-- name: UpdateChatSnapshot :one