src/Pure/General/sql.scala
changeset 65704 aa9a7a753296
parent 65703 cead65c19f2e
child 65706 595bc96005f9
equal deleted inserted replaced
65703:cead65c19f2e 65704:aa9a7a753296
   426     def set_date(stmt: PreparedStatement, i: Int, date: Date): Unit =
   426     def set_date(stmt: PreparedStatement, i: Int, date: Date): Unit =
   427       if (date == null) stmt.setObject(i, null)
   427       if (date == null) stmt.setObject(i, null)
   428       else stmt.setObject(i, OffsetDateTime.from(date.to_utc.rep))
   428       else stmt.setObject(i, OffsetDateTime.from(date.to_utc.rep))
   429 
   429 
   430     def date(rs: ResultSet, column: SQL.Column): Date =
   430     def date(rs: ResultSet, column: SQL.Column): Date =
   431       Date.instant(rs.getObject(column.name, classOf[OffsetDateTime]).toInstant)
   431     {
       
   432       val obj = rs.getObject(column.name, classOf[OffsetDateTime])
       
   433       if (obj == null) null else Date.instant(obj.toInstant)
       
   434     }
   432 
   435 
   433     def insert_permissive(table: SQL.Table, sql: String = ""): String =
   436     def insert_permissive(table: SQL.Table, sql: String = ""): String =
   434       table.insert_cmd("INSERT",
   437       table.insert_cmd("INSERT",
   435         sql = sql + (if (sql == "") "" else " ") + "ON CONFLICT DO NOTHING")
   438         sql = sql + (if (sql == "") "" else " ") + "ON CONFLICT DO NOTHING")
   436 
   439