diff options
| author | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2005-11-15 17:06:58 +0000 |
|---|---|---|
| committer | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2005-11-15 17:06:58 +0000 |
| commit | d1fbd50cc300c6bc8a1639e0b67bc459133f7dc3 (patch) | |
| tree | bfbc9108581a441caf7a1a43339a08706049c8bd /sources | |
| parent | f4823a2c469e55de0da0e33315a04348f01fccdd (diff) | |
| download | scala-d1fbd50cc300c6bc8a1639e0b67bc459133f7dc3.tar.gz scala-d1fbd50cc300c6bc8a1639e0b67bc459133f7dc3.tar.bz2 scala-d1fbd50cc300c6bc8a1639e0b67bc459133f7dc3.zip | |
Updates some things to make DBC compatible with...
Updates some things to make DBC compatible with NSC: - extends Object
with Blabla instead of with Blabla - override val x instead of x in some
constructors.
Diffstat (limited to 'sources')
| -rw-r--r-- | sources/scala/dbc/Database.scala | 2 | ||||
| -rw-r--r-- | sources/scala/dbc/datatype/ApproximateNumeric.scala | 2 | ||||
| -rw-r--r-- | sources/scala/dbc/datatype/ExactNumeric.scala | 2 | ||||
| -rw-r--r-- | sources/scala/dbc/result/Relation.scala | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sources/scala/dbc/Database.scala b/sources/scala/dbc/Database.scala index 7eb235fa01..2ad538d03e 100644 --- a/sources/scala/dbc/Database.scala +++ b/sources/scala/dbc/Database.scala @@ -72,7 +72,7 @@ case class Database (dbms:Vendor) { def close: Unit = { closing = true; - for (val conn <- availableConnections) conn.close; + for (val conn <- availableConnections) conn.close(); } /** Executes a statement that returns a relation on this database. diff --git a/sources/scala/dbc/datatype/ApproximateNumeric.scala b/sources/scala/dbc/datatype/ApproximateNumeric.scala index be20ed8d72..e0d855ffef 100644 --- a/sources/scala/dbc/datatype/ApproximateNumeric.scala +++ b/sources/scala/dbc/datatype/ApproximateNumeric.scala @@ -11,7 +11,7 @@ package scala.dbc.datatype; /** A type category for all SQL types that store varying-precision * numbers. */ abstract class ApproximateNumeric [Type] ( - nativeTypeId: DataType.Id + override val nativeTypeId: DataType.Id ) extends datatype.Numeric[Type](nativeTypeId) { def isEquivalent (datatype:DataType) = datatype match { diff --git a/sources/scala/dbc/datatype/ExactNumeric.scala b/sources/scala/dbc/datatype/ExactNumeric.scala index b2637f944f..e3e936d5cf 100644 --- a/sources/scala/dbc/datatype/ExactNumeric.scala +++ b/sources/scala/dbc/datatype/ExactNumeric.scala @@ -11,7 +11,7 @@ package scala.dbc.datatype; /** A type category for all SQL types that store constant-precision * numbers. */ abstract class ExactNumeric [Type] ( - nativeTypeId: DataType.Id + override val nativeTypeId: DataType.Id ) extends datatype.Numeric[Type](nativeTypeId) { def isEquivalent (datatype:DataType) = datatype match { diff --git a/sources/scala/dbc/result/Relation.scala b/sources/scala/dbc/result/Relation.scala index ff8a17ea26..006b6dbf07 100644 --- a/sources/scala/dbc/result/Relation.scala +++ b/sources/scala/dbc/result/Relation.scala @@ -10,7 +10,7 @@ package scala.dbc.result; /** An ISO-9075:2003 (SQL) table. This is equivalent to a relation in the * relational model. */ -abstract class Relation with Iterable[Tuple] { +abstract class Relation extends Object with Iterable[Tuple] { /** The statement that generated this relation. */ def statement: scala.dbc.statement.Relation; |