LightPIT: comparison src/main/kotlin/de/uapcore/lightpit/dao/PostgresDataAccessObject.kt

-:da975b1f188d
+:87328572e36f
 setInt(4, id)
 }
 executeUpdate()
 }
 }
 //</editor-fold>
 //<editor-fold desc="Version">
 //language=SQL
-private val versionQuery = "select versionid, project, name, node, ordinal, status from lpit_version"
+private val versionQuery = "select versionid, project, name, node, ordinal, status, release, eol from lpit_version"
 private fun ResultSet.extractVersion() =
 Version(getInt("versionid"), getInt("project")).apply {
 name = getString("name")
 node = getString("node")
 ordinal = getInt("ordinal")
+release = getDate("release")
+eol = getDate("eol")
 status = getEnum("status")
 }
 override fun listVersions(project: Project): List<Version> =
 withStatement("$versionQuery where project = ? order by ordinal desc, lower(name) desc") {
 summary as (
 select versionid, phase, isresolved, total
 from lpit_version v
 left join issues using (versionid)
 )
-select v.versionid, project, name, node, ordinal, status,
+select v.versionid, project, name, node, ordinal, status, release, eol,
 ro.total as resolved_open, ra.total as resolved_active, rd.total as resolved_done,
 ao.total as affected_open, aa.total as affected_active, ad.total as affected_done
 from lpit_version v
 left join summary ro on ro.versionid = v.versionid and ro.phase = 0 and ro.isresolved
 left join summary ra on ra.versionid = v.versionid and ra.phase = 1 and ra.isresolved
 setString(2, node)
 querySingle { it.extractVersion() }
 }
 override fun insertVersion(version: Version) {
-withStatement("insert into lpit_version (name, node, ordinal, status, project) values (?, ?, ?, ?::version_status, ?)") {
+withStatement("insert into lpit_version (name, node, ordinal, status, project, release, eol) values (?, ?, ?, ?::version_status, ?, ?, ?)") {
 with(version) {
 setStringSafe(1, name)
 setStringSafe(2, node)
 setInt(3, ordinal)
 setEnum(4, status)
 setInt(5, version.projectid)
+setDateOrNull(6, version.release)
+setDateOrNull(7, version.eol)
 }
 executeUpdate()
 }
 }
 override fun updateVersion(version: Version) {
-withStatement("update lpit_version set name = ?, node = ?, ordinal = ?, status = ?::version_status where versionid = ?") {
+withStatement("update lpit_version set name = ?, node = ?, ordinal = ?, status = ?::version_status, release=?,eol=? where versionid = ?") {
 with(version) {
 setStringSafe(1, name)
 setStringSafe(2, node)
 setInt(3, ordinal)
 setEnum(4, status)
-setInt(5, id)
+setDateOrNull(5, version.release)
-}
+setDateOrNull(6, version.eol)
-executeUpdate()
+setInt(7, id)
 }
-}
+executeUpdate()
-//</editor-fold>
+}
+}
+//</editor-fold>
 //<editor-fold desc="Component">
 //language=SQL
 private val componentQuery =
 """
 setInt(col, component.id)
 executeUpdate()
 }
 }
 //</editor-fold>
 //<editor-fold desc="Project">
 //language=SQL
 private val projectQuery =
 """
 select projectid, name, node, ordinal, description, repourl,
 }
 summary
 }
 }
 //</editor-fold>
 //<editor-fold desc="Issue">
 //language=SQL
 private val issueQuery =
 """
 select issueid,
 updated = getTimestamp("updated")
 eta = getDate("eta")
 }
 //language=SQL
-fun versionQuery(table: String) =
+val queryAffected =
 """
-select versionid, project, name, status, ordinal, node
+$versionQuery join lpit_issue_affected_version using (versionid)
-from lpit_version join $table using (versionid)
+where issueid = ? order by ordinal, name
-where issueid = ?
-order by ordinal, name
 """.trimIndent()
-issue.affectedVersions = withStatement(versionQuery("lpit_issue_affected_version")) {
+//language=SQL
+val queryResolved =
+"""
+$versionQuery join lpit_issue_resolved_version using (versionid)
+where issueid = ? order by ordinal, name
+""".trimIndent()
+issue.affectedVersions = withStatement(queryAffected) {
 setInt(1, issue.id)
 queryAll { it.extractVersion() }
 }
-issue.resolvedVersions = withStatement(versionQuery("lpit_issue_resolved_version")) {
+issue.resolvedVersions = withStatement(queryResolved) {
 setInt(1, issue.id)
 queryAll { it.extractVersion() }
 }
 return issue
 }
 executeUpdate()
 }
 insertVersionInfo(issue.id, issue)
 }
 //</editor-fold>
 //<editor-fold desc="IssueComment">
 private fun ResultSet.extractIssueComment() =
 IssueComment(getInt("commentid"), getInt("issueid")).apply {
 created = getTimestamp("created")
 updated = getTimestamp("updated")
 executeUpdate()
 updateIssueDate.executeUpdate()
 }
 }
 }
 //</editor-fold>
 }

Mercurial > hg > LightPIT / file comparison

comparison: src/main/kotlin/de/uapcore/lightpit/dao/PostgresDataAccessObject.kt

src/main/kotlin/de/uapcore/lightpit/dao/PostgresDataAccessObject.kt