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.

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

support mysql dialect INET_xxxx #5075

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,10 @@ class MySqlTypeResolver(
"date_add", "date_sub" -> IntermediateType(TEXT)
"now" -> IntermediateType(TEXT)
"char_length", "character_length" -> IntermediateType(INTEGER).nullableIf(resolvedType(exprList[0]).javaType.isNullable)
"inet_aton" -> IntermediateType(TEXT)
"inet_ntoa" -> IntermediateType(TEXT)
"inet6_aton" -> IntermediateType(TEXT)
"inet6_ntoa" -> IntermediateType(TEXT)
else -> null
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
plugins {
alias(libs.plugins.kotlin.jvm)
alias(libs.plugins.sqldelight)
}

sqldelight {
databases {
customDialect {
packageName = "app.cash.sqldelight.customdialect"
dialect(project(":dialect"))
}
}
}

dependencies {
implementation libs.mysqlJdbc
implementation "app.cash.sqldelight:jdbc-driver:${app.cash.sqldelight.VersionKt.VERSION}"
implementation libs.truth
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
plugins {
id("org.jetbrains.kotlin.jvm")
}

dependencies {
api "app.cash.sqldelight:mysql-dialect:${app.cash.sqldelight.VersionKt.VERSION}"
compileOnly "app.cash.sqldelight:compiler-env:${app.cash.sqldelight.VersionKt.VERSION}"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package foo

import app.cash.sqldelight.dialect.api.IntermediateType
import app.cash.sqldelight.dialect.api.PrimitiveType.TEXT
import app.cash.sqldelight.dialect.api.SqlDelightDialect
import app.cash.sqldelight.dialect.api.TypeResolver
import app.cash.sqldelight.dialects.mysql.MySqlDialect
import app.cash.sqldelight.dialects.mysql.MySqlTypeResolver
import com.alecstrong.sql.psi.core.psi.SqlFunctionExpr

class FooDialect : SqlDelightDialect by MySqlDialect() {
override fun typeResolver(parentResolver: TypeResolver) = CustomResolver(MySqlTypeResolver(parentResolver))

class CustomResolver(private val parentResolver: TypeResolver) : TypeResolver by parentResolver {
override fun functionType(functionExpr: SqlFunctionExpr): IntermediateType? {
return when (functionExpr.functionName.text.lowercase()) {
"inet_aton" -> IntermediateType(TEXT)
"inet_ntoa" -> IntermediateType(TEXT)
"inet6_aton" -> IntermediateType(TEXT)
"inet6_ntoa" -> IntermediateType(TEXT)
else -> parentResolver.functionType(functionExpr)
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
foo.FooDialect
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
pluginManagement {
includeBuild("../build-logic-tests")
}

plugins {
id("sqldelightTests")
}

rootProject.name = 'custom-mysql-dialect'

include(":dialect")
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
CREATE TABLE IF NOT EXISTS inetXxx
(
id INT AUTO_INCREMENT
PRIMARY KEY,
ip INT(4) UNSIGNED NOT NULL
) CHARSET = utf8mb4;

selectForTestINET_NTOA:
SELECT id, INET_NTOA(ip) AS ip
FROM inetXxx;

insertOneForTestINET_ATON {
INSERT INTO inetXxx (ip)
VALUES (INET_ATON(?));
SELECT LAST_INSERT_ID();
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import app.cash.sqldelight.Query
import app.cash.sqldelight.driver.jdbc.JdbcDriver
import org.junit.Test
import schema.InetxxxQueries
import java.sql.Connection

class Testing {
val fakeDriver = object : JdbcDriver() {
override fun getConnection() = TODO()
override fun closeConnection(connection: Connection) = Unit
override fun addListener(vararg queryKeys: String, listener: Query.Listener) = Unit
override fun removeListener(vararg queryKeys: String, listener: Query.Listener) = Unit
override fun notifyListeners(vararg queryKeys: String) = Unit
}

@Test fun convertAddressToNumerical() {
InetxxxQueries(fakeDriver).insertOneForTestINET_ATON("127.0.0.1")
}

@Test fun convertNumericalToAddresses() {
InetxxxQueries(fakeDriver).selectForTestINET_NTOA().executeAsList()
}
}