Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove typing need for coalesce #26

Merged
merged 1 commit into from
Nov 18, 2022
Merged

remove typing need for coalesce #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions Sources/PSQLKit/Expressions/CoalesceExpression.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// Copyright © 2022 hiimtmac

import Foundation
import PostgresKit
import SQLKit

public protocol Coalescable: BaseSQLExpression {}
Expand All @@ -20,7 +19,7 @@ public struct CoalesceExpression<T> where
) where
T0: Coalescable & TypeEquatable,
T1: Coalescable & TypeEquatable,
T.CompareType == T0.CompareType,
T == T0.CompareType,
T0.CompareType == T1.CompareType
{
self.values = [
Expand All @@ -37,7 +36,7 @@ public struct CoalesceExpression<T> where
T0: Coalescable & TypeEquatable,
T1: Coalescable & TypeEquatable,
T2: Coalescable & TypeEquatable,
T.CompareType == T0.CompareType,
T == T0.CompareType,
T0.CompareType == T1.CompareType,
T1.CompareType == T2.CompareType
{
Expand All @@ -58,7 +57,7 @@ public struct CoalesceExpression<T> where
T1: Coalescable & TypeEquatable,
T2: Coalescable & TypeEquatable,
T3: Coalescable & TypeEquatable,
T.CompareType == T0.CompareType,
T == T0.CompareType,
T0.CompareType == T1.CompareType,
T1.CompareType == T2.CompareType,
T2.CompareType == T3.CompareType
Expand All @@ -83,7 +82,7 @@ public struct CoalesceExpression<T> where
T2: Coalescable & TypeEquatable,
T3: Coalescable & TypeEquatable,
T4: Coalescable & TypeEquatable,
T.CompareType == T0.CompareType,
T == T0.CompareType,
T0.CompareType == T1.CompareType,
T1.CompareType == T2.CompareType,
T2.CompareType == T3.CompareType,
Expand Down
39 changes: 17 additions & 22 deletions Sources/PSQLKit/Expressions/ConcatenateExpression.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,56 +91,51 @@ extension ConcatenateExpression: TypeEquatable {
public typealias CompareType = String
}

extension ConcatenateExpression: SelectSQLExpression {
public var selectSqlExpression: SQLExpression {
_Select(values: self.values)
extension ConcatenateExpression: BaseSQLExpression {
public var baseSqlExpression: SQLExpression {
_Base(values: self.values)
}

private struct _Select: SQLExpression {
private struct _Base: SQLExpression {
let values: [SQLExpression]

func serialize(to serializer: inout SQLSerializer) {
serializer.write("CONCAT")
serializer.write("(")
SQLList(self.values).serialize(to: &serializer)
serializer.write(")")
serializer.write("::")
PostgresColumnType.text.serialize(to: &serializer)
}
}
}

extension ConcatenateExpression: GroupBySQLExpression {
public var groupBySqlExpression: SQLExpression {
_GroupBy(values: self.values)
extension ConcatenateExpression: SelectSQLExpression {
public var selectSqlExpression: SQLExpression {
_Select(values: self.values)
}

private struct _GroupBy: SQLExpression {
private struct _Select: SQLExpression {
let values: [SQLExpression]

func serialize(to serializer: inout SQLSerializer) {
serializer.write("CONCAT")
serializer.write("(")
SQLList(self.values).serialize(to: &serializer)
serializer.write(")")
serializer.write("::")
PostgresColumnType.text.serialize(to: &serializer)
}
}
}

extension ConcatenateExpression: CompareSQLExpression {
public var compareSqlExpression: SQLExpression {
_Compare(values: self.values)
extension ConcatenateExpression: GroupBySQLExpression {
public var groupBySqlExpression: SQLExpression {
_Base(values: self.values)
}
}

private struct _Compare: SQLExpression {
let values: [SQLExpression]

func serialize(to serializer: inout SQLSerializer) {
serializer.write("CONCAT")
serializer.write("(")
SQLList(self.values).serialize(to: &serializer)
serializer.write(")")
}
extension ConcatenateExpression: CompareSQLExpression {
public var compareSqlExpression: SQLExpression {
_Base(values: self.values)
}
}

Expand Down
36 changes: 18 additions & 18 deletions Tests/PSQLKitTests/ExpressionTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,20 +150,20 @@ final class ExpressionTests: PSQLTestCase {

func testCoalesce() {
SELECT {
COALESCE<String>(f.$name, f.$name, f.$name, f.$name, "hello").as("cool")
COALESCE<String>(f.$name, f.$name, f.$name, "hello").as("cool")
COALESCE<String>(f.$name, f.$name, "hello").as("cool")
COALESCE<String>(f.$name, "hello").as("cool")
COALESCE<String>(f.$name, COALESCE<String>(f.$name, "hello"))
COALESCE(f.$name, f.$name, f.$name, f.$name, "hello").as("cool")
COALESCE(f.$name, f.$name, f.$name, "hello").as("cool")
COALESCE(f.$name, f.$name, "hello").as("cool")
COALESCE(f.$name, "hello").as("cool")
COALESCE(f.$name, COALESCE(f.$name, "hello"))
}
.serialize(to: &fluentSerializer)

SELECT {
COALESCE<String>(p.$name, p.$name, p.$name, p.$name, "hello").as("cool")
COALESCE<String>(p.$name, p.$name, p.$name, "hello").as("cool")
COALESCE<String>(p.$name, p.$name, "hello").as("cool")
COALESCE<String>(p.$name, "hello").as("cool")
COALESCE<String>(p.$name, COALESCE<String>(f.$name, "hello"))
COALESCE(p.$name, p.$name, p.$name, p.$name, "hello").as("cool")
COALESCE(p.$name, p.$name, p.$name, "hello").as("cool")
COALESCE(p.$name, p.$name, "hello").as("cool")
COALESCE(p.$name, "hello").as("cool")
COALESCE(p.$name, COALESCE(f.$name, "hello"))
}
.serialize(to: &psqlkitSerializer)

Expand Down Expand Up @@ -191,15 +191,15 @@ final class ExpressionTests: PSQLTestCase {

func testNestedJsonExtract() {
SELECT {
COALESCE<String>(
COALESCE(
JSONB_EXTRACT_PATH_TEXT(f.$pet, \.$name),
JSONB_EXTRACT_PATH_TEXT(f.$pet, \.$type)
)
}
.serialize(to: &fluentSerializer)

SELECT {
COALESCE<String>(
COALESCE(
JSONB_EXTRACT_PATH_TEXT(p.$pet, \.$name),
JSONB_EXTRACT_PATH_TEXT(p.$pet, \.$type)
)
Expand All @@ -215,14 +215,14 @@ final class ExpressionTests: PSQLTestCase {
let date = DateComponents(calendar: .current, year: 2021, month: 01, day: 21).date!

WHERE {
COALESCE<String>(f.$name, "tmac") == "taylor"
COALESCE<PSQLDate>(f.$birthday, date.psqlDate) >< PSQLRange(from: date.psqlDate, to: date.psqlDate)
COALESCE(f.$name, "tmac") == "taylor"
COALESCE(f.$birthday, date.psqlDate) >< PSQLRange(from: date.psqlDate, to: date.psqlDate)
}
.serialize(to: &fluentSerializer)

WHERE {
COALESCE<String>(p.$name, "tmac") == "taylor"
COALESCE<PSQLDate>(p.$birthday, date.psqlDate) >< PSQLRange(from: date.psqlDate, to: date.psqlDate)
COALESCE(p.$name, "tmac") == "taylor"
COALESCE(p.$birthday, date.psqlDate) >< PSQLRange(from: date.psqlDate, to: date.psqlDate)
}
.serialize(to: &psqlkitSerializer)

Expand Down Expand Up @@ -577,12 +577,12 @@ final class ExpressionTests: PSQLTestCase {

func testConcateWithCoalesce() {
SELECT {
CONCAT(COALESCE<String>(f.$name, "hi"), " there")
CONCAT(COALESCE(f.$name, "hi"), " there")
}
.serialize(to: &fluentSerializer)

SELECT {
CONCAT(COALESCE<String>(p.$name, "hi"), " there")
CONCAT(COALESCE(p.$name, "hi"), " there")
}
.serialize(to: &psqlkitSerializer)

Expand Down
2 changes: 1 addition & 1 deletion Tests/PSQLKitTests/ReadmeTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ final class ReadmeTests: PSQLTestCase {
MAX(m.$craters)
COUNT(m.$craters).as("crater_count")
SUM(m.$craters)
COALESCE<Int>(m.$craters, 5).as("unwrapped_craters")
COALESCE(m.$craters, 5).as("unwrapped_craters")
CONCAT(m.$name, " is a cool planet").as("annotated")
GENERATE_SERIES(from: 1, to: 5, interval: 1)
}
Expand Down