From 028d80bd06cfe31dbd5e576f0f82a938bca52d34 Mon Sep 17 00:00:00 2001 From: Julien Lengrand-Lambert Date: Mon, 9 Mar 2020 21:11:44 +0100 Subject: [PATCH] Removing dead code. --- src/main/kotlin/dsl/TitleRatings.kt | 6 ++---- src/main/kotlin/dsl/Titles.kt | 33 +---------------------------- 2 files changed, 3 insertions(+), 36 deletions(-) diff --git a/src/main/kotlin/dsl/TitleRatings.kt b/src/main/kotlin/dsl/TitleRatings.kt index 4b2a7d7..4bbe8c9 100644 --- a/src/main/kotlin/dsl/TitleRatings.kt +++ b/src/main/kotlin/dsl/TitleRatings.kt @@ -2,14 +2,12 @@ package dsl import org.jetbrains.exposed.sql.Column import org.jetbrains.exposed.sql.Table -import org.jetbrains.exposed.sql.insert -import org.jetbrains.exposed.sql.insertIgnore -import tsv.Reader.NO_DATA object TitleRatings : Table(){ - val tconst : Column = varchar("tconst", 10)//.uniqueIndex() + val tconst : Column = varchar("tconst", 10).uniqueIndex() val averageRating : Column = float("averageRating").nullable() val numVotes : Column = integer("numVotes").nullable() override val primaryKey = PrimaryKey(tconst, name = "tconst") + } \ No newline at end of file diff --git a/src/main/kotlin/dsl/Titles.kt b/src/main/kotlin/dsl/Titles.kt index c8e3dd4..92e62b2 100644 --- a/src/main/kotlin/dsl/Titles.kt +++ b/src/main/kotlin/dsl/Titles.kt @@ -1,12 +1,7 @@ package dsl -import org.jetbrains.exposed.dao.IntEntity -import org.jetbrains.exposed.dao.IntEntityClass -import org.jetbrains.exposed.dao.id.EntityID import org.jetbrains.exposed.dao.id.IntIdTable import org.jetbrains.exposed.sql.Column -import org.jetbrains.exposed.sql.insert -import tsv.Reader.NO_DATA object Titles : IntIdTable(){ val tconst : Column = varchar("tconst", 10).uniqueIndex() @@ -19,31 +14,5 @@ object Titles : IntIdTable(){ val runtimeMinutes : Column = long("runtimeMinutes").nullable() val genres : Column = varchar("genres", 50) // Own Table? - fun insertFromListString(values : List){ - Titles.insert { - it[tconst] = values[0] - it[titleType] = values[1] - it[primaryTitle] = values[2] - it[originalTitle] = values[3] - it[isAdult] = values[4].toBoolean() - it[startYear] = if (values[5] != NO_DATA) values[5].toInt() else null - it[endYear] = if (values[6] != NO_DATA) values[6].toInt() else null - it[runtimeMinutes] = if (values[7] != NO_DATA) values[7].toLong() else null - it[genres] = values[8] - } - } -} - -class Title(id: EntityID) : IntEntity(id) { - companion object : IntEntityClass(Titles) - - var tconst by Titles.tconst - var titleType by Titles.titleType - var primaryTitle by Titles.primaryTitle - var originalTitle by Titles.originalTitle - var isAdult by Titles.isAdult - var startYear by Titles.startYear - var endYear by Titles.endYear - var runtimeMinutes by Titles.runtimeMinutes - var genres by Titles.genres + override val primaryKey = PrimaryKey(tconst, name = "tconst") } \ No newline at end of file