From 2ea48920fd60e343a3a5e59e81c816e8c17d1110 Mon Sep 17 00:00:00 2001 From: extempore Date: Tue, 15 Mar 2011 05:55:38 +0000 Subject: [PATCH] Deprecated scala.dbc. Wish there was a better way to deprecate a package than deprecating every individual thing. (There isn't, is there?) Closes #4313, no review. git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@24462 5e8d7ff9-d8ef-0310-90f0-a4852d11357a --- src/compiler/scala/tools/nsc/interpreter/ILoop.scala | 2 +- src/dbc/scala/dbc/DataType.scala | 4 ++-- src/dbc/scala/dbc/Database.scala | 2 +- src/dbc/scala/dbc/Syntax.scala | 2 +- src/dbc/scala/dbc/Utilities.scala | 2 +- src/dbc/scala/dbc/Value.scala | 2 +- src/dbc/scala/dbc/Vendor.scala | 2 +- src/dbc/scala/dbc/datatype/ApproximateNumeric.scala | 2 +- src/dbc/scala/dbc/datatype/Boolean.scala | 2 +- src/dbc/scala/dbc/datatype/Character.scala | 2 +- src/dbc/scala/dbc/datatype/CharacterLargeObject.scala | 2 +- src/dbc/scala/dbc/datatype/CharacterString.scala | 2 +- src/dbc/scala/dbc/datatype/CharacterVarying.scala | 2 +- src/dbc/scala/dbc/datatype/ExactNumeric.scala | 2 +- src/dbc/scala/dbc/datatype/Factory.scala | 2 +- src/dbc/scala/dbc/datatype/Numeric.scala | 2 +- src/dbc/scala/dbc/datatype/String.scala | 2 +- src/dbc/scala/dbc/datatype/Unknown.scala | 2 +- src/dbc/scala/dbc/exception/IncompatibleSchema.scala | 2 +- src/dbc/scala/dbc/exception/UnsupportedFeature.scala | 2 +- src/dbc/scala/dbc/package.scala | 6 ++++++ src/dbc/scala/dbc/result/Field.scala | 4 ++-- src/dbc/scala/dbc/result/FieldMetadata.scala | 2 +- src/dbc/scala/dbc/result/Relation.scala | 2 +- src/dbc/scala/dbc/result/Status.scala | 2 +- src/dbc/scala/dbc/result/Tuple.scala | 2 +- src/dbc/scala/dbc/statement/AccessMode.scala | 4 ++-- src/dbc/scala/dbc/statement/DerivedColumn.scala | 2 +- src/dbc/scala/dbc/statement/Expression.scala | 2 +- src/dbc/scala/dbc/statement/Insert.scala | 2 +- src/dbc/scala/dbc/statement/InsertionData.scala | 8 ++++---- src/dbc/scala/dbc/statement/IsolationLevel.scala | 4 ++-- src/dbc/scala/dbc/statement/JoinType.scala | 4 ++-- src/dbc/scala/dbc/statement/Jointure.scala | 2 +- src/dbc/scala/dbc/statement/Relation.scala | 2 +- src/dbc/scala/dbc/statement/Select.scala | 2 +- src/dbc/scala/dbc/statement/SetClause.scala | 2 +- src/dbc/scala/dbc/statement/SetQuantifier.scala | 4 ++-- src/dbc/scala/dbc/statement/Statement.scala | 2 +- src/dbc/scala/dbc/statement/Status.scala | 2 +- src/dbc/scala/dbc/statement/Table.scala | 2 +- src/dbc/scala/dbc/statement/Transaction.scala | 2 +- src/dbc/scala/dbc/statement/Update.scala | 2 +- src/dbc/scala/dbc/statement/expression/Aggregate.scala | 2 +- .../scala/dbc/statement/expression/BinaryOperator.scala | 2 +- src/dbc/scala/dbc/statement/expression/Constant.scala | 2 +- src/dbc/scala/dbc/statement/expression/Field.scala | 2 +- src/dbc/scala/dbc/statement/expression/FunctionCall.scala | 2 +- src/dbc/scala/dbc/statement/expression/Select.scala | 2 +- src/dbc/scala/dbc/statement/expression/SetFunction.scala | 4 ++-- src/dbc/scala/dbc/statement/expression/TypeCast.scala | 2 +- .../scala/dbc/statement/expression/UnaryOperator.scala | 2 +- src/dbc/scala/dbc/syntax/DataTypeUtil.scala | 2 +- src/dbc/scala/dbc/syntax/Database.scala | 2 +- src/dbc/scala/dbc/syntax/Statement.scala | 2 +- src/dbc/scala/dbc/syntax/StatementExpression.scala | 4 ++-- src/dbc/scala/dbc/value/ApproximateNumeric.scala | 4 ++-- src/dbc/scala/dbc/value/Boolean.scala | 4 ++-- src/dbc/scala/dbc/value/Character.scala | 4 ++-- src/dbc/scala/dbc/value/CharacterLargeObject.scala | 4 ++-- src/dbc/scala/dbc/value/CharacterVarying.scala | 4 ++-- src/dbc/scala/dbc/value/Conversion.scala | 3 +-- src/dbc/scala/dbc/value/ExactNumeric.scala | 4 ++-- src/dbc/scala/dbc/value/Factory.scala | 2 +- src/dbc/scala/dbc/value/Unknown.scala | 4 ++-- src/dbc/scala/dbc/vendor/PostgreSQL.scala | 2 +- 66 files changed, 89 insertions(+), 84 deletions(-) create mode 100644 src/dbc/scala/dbc/package.scala diff --git a/src/compiler/scala/tools/nsc/interpreter/ILoop.scala b/src/compiler/scala/tools/nsc/interpreter/ILoop.scala index 0ec2a183c..2f3338aeb 100644 --- a/src/compiler/scala/tools/nsc/interpreter/ILoop.scala +++ b/src/compiler/scala/tools/nsc/interpreter/ILoop.scala @@ -424,7 +424,7 @@ class ILoop(in0: Option[BufferedReader], protected val out: PrintWriter) */ def loop() { def readOneLine() = { - out.flush + out.flush() in readLine prompt } // return false if repl should exit diff --git a/src/dbc/scala/dbc/DataType.scala b/src/dbc/scala/dbc/DataType.scala index f5e7b06aa..eaa7a82b5 100644 --- a/src/dbc/scala/dbc/DataType.scala +++ b/src/dbc/scala/dbc/DataType.scala @@ -14,7 +14,7 @@ package scala.dbc; /** An ISO-9075:2003 (SQL) data type. Mappings between SQL types and * database specific types should be provided by the database driver. */ -abstract class DataType { +@deprecated(DbcIsDeprecated) abstract class DataType { /** Tests whether this datatype is equivalent to another. Usually, two * types are defined as equivalent if they are equal. Two types can be @@ -50,7 +50,7 @@ abstract class DataType { } -object DataType { +@deprecated(DbcIsDeprecated) object DataType { type Id = Int; diff --git a/src/dbc/scala/dbc/Database.scala b/src/dbc/scala/dbc/Database.scala index 3864bc290..aa69f1f28 100644 --- a/src/dbc/scala/dbc/Database.scala +++ b/src/dbc/scala/dbc/Database.scala @@ -18,7 +18,7 @@ import java.sql._ * * @author Gilles Dubochet */ -case class Database(dbms: Vendor) { +@deprecated(DbcIsDeprecated) case class Database(dbms: Vendor) { class Closed extends Exception {} diff --git a/src/dbc/scala/dbc/Syntax.scala b/src/dbc/scala/dbc/Syntax.scala index a4b4e3644..3ebe76969 100644 --- a/src/dbc/scala/dbc/Syntax.scala +++ b/src/dbc/scala/dbc/Syntax.scala @@ -17,7 +17,7 @@ import java.math.{BigDecimal, BigInteger}; /** This class .. * */ -object Syntax { +@deprecated(DbcIsDeprecated) object Syntax { import syntax.DataTypeUtil; diff --git a/src/dbc/scala/dbc/Utilities.scala b/src/dbc/scala/dbc/Utilities.scala index b9112ee72..d0f1300cb 100644 --- a/src/dbc/scala/dbc/Utilities.scala +++ b/src/dbc/scala/dbc/Utilities.scala @@ -15,7 +15,7 @@ package scala.dbc; * This object's members must be visible in an expression to use value * auto-conversion. */ -object Utilities { +@deprecated(DbcIsDeprecated) object Utilities { implicit def constantToValue (obj: statement.expression.Constant): Value = obj.constantValue; diff --git a/src/dbc/scala/dbc/Value.scala b/src/dbc/scala/dbc/Value.scala index 2a0c4fc3e..284ac7dfb 100644 --- a/src/dbc/scala/dbc/Value.scala +++ b/src/dbc/scala/dbc/Value.scala @@ -12,7 +12,7 @@ package scala.dbc; /** A SQL-99 value of any type. */ -abstract class Value { +@deprecated(DbcIsDeprecated) abstract class Value { /** The SQL-99 type of the value. */ val dataType: DataType; diff --git a/src/dbc/scala/dbc/Vendor.scala b/src/dbc/scala/dbc/Vendor.scala index 25a2d7f4f..3b586f82b 100644 --- a/src/dbc/scala/dbc/Vendor.scala +++ b/src/dbc/scala/dbc/Vendor.scala @@ -16,7 +16,7 @@ import java.sql.{Connection, Driver}; /** This class .. */ -abstract class Vendor { +@deprecated(DbcIsDeprecated) abstract class Vendor { def nativeDriverClass: Class[_]; def uri: java.net.URI; diff --git a/src/dbc/scala/dbc/datatype/ApproximateNumeric.scala b/src/dbc/scala/dbc/datatype/ApproximateNumeric.scala index 68023e01c..1be836039 100644 --- a/src/dbc/scala/dbc/datatype/ApproximateNumeric.scala +++ b/src/dbc/scala/dbc/datatype/ApproximateNumeric.scala @@ -15,7 +15,7 @@ package datatype; /** A type category for all SQL types that store varying-precision * numbers. */ -abstract class ApproximateNumeric[Type] ( +@deprecated(DbcIsDeprecated) abstract class ApproximateNumeric[Type] ( override val nativeTypeId: DataType.Id ) extends datatype.Numeric[Type](nativeTypeId) { diff --git a/src/dbc/scala/dbc/datatype/Boolean.scala b/src/dbc/scala/dbc/datatype/Boolean.scala index dadc75b8b..d53d52bc3 100644 --- a/src/dbc/scala/dbc/datatype/Boolean.scala +++ b/src/dbc/scala/dbc/datatype/Boolean.scala @@ -13,7 +13,7 @@ package datatype; /** The SQL type for a truth value. */ -class Boolean extends DataType { +@deprecated(DbcIsDeprecated) class Boolean extends DataType { def isEquivalent (datatype:DataType) = datatype match { case dt:Boolean => true diff --git a/src/dbc/scala/dbc/datatype/Character.scala b/src/dbc/scala/dbc/datatype/Character.scala index 16afdf31b..be2459c58 100644 --- a/src/dbc/scala/dbc/datatype/Character.scala +++ b/src/dbc/scala/dbc/datatype/Character.scala @@ -15,7 +15,7 @@ package datatype; /** A SQL type for a string of characters of arbitrary length with * arbitrary character set. */ -abstract class Character extends CharacterString { +@deprecated(DbcIsDeprecated) abstract class Character extends CharacterString { def isEquivalent(datatype: DataType) = datatype match { case dt: Character => diff --git a/src/dbc/scala/dbc/datatype/CharacterLargeObject.scala b/src/dbc/scala/dbc/datatype/CharacterLargeObject.scala index f1b33cdb2..db661448a 100644 --- a/src/dbc/scala/dbc/datatype/CharacterLargeObject.scala +++ b/src/dbc/scala/dbc/datatype/CharacterLargeObject.scala @@ -14,7 +14,7 @@ package datatype; /** A SQL type for an unbounded length string of characters with arbitrary * character set. */ -class CharacterLargeObject extends CharacterString { +@deprecated(DbcIsDeprecated) class CharacterLargeObject extends CharacterString { def isEquivalent (datatype:DataType) = datatype match { case dt:CharacterLargeObject => { diff --git a/src/dbc/scala/dbc/datatype/CharacterString.scala b/src/dbc/scala/dbc/datatype/CharacterString.scala index 450cfc04d..32426f08b 100644 --- a/src/dbc/scala/dbc/datatype/CharacterString.scala +++ b/src/dbc/scala/dbc/datatype/CharacterString.scala @@ -13,7 +13,7 @@ package datatype; /** A type category for all SQL types that store strings of characters. */ -abstract class CharacterString extends String { +@deprecated(DbcIsDeprecated) abstract class CharacterString extends String { type NativeType = java.lang.String; val nativeTypeId = DataType.STRING; diff --git a/src/dbc/scala/dbc/datatype/CharacterVarying.scala b/src/dbc/scala/dbc/datatype/CharacterVarying.scala index 5585dd93a..95175fa4a 100644 --- a/src/dbc/scala/dbc/datatype/CharacterVarying.scala +++ b/src/dbc/scala/dbc/datatype/CharacterVarying.scala @@ -15,7 +15,7 @@ package datatype; /** A SQL type for a varying length string of characters with arbitrary * maximal length and arbitrary character set. */ -abstract class CharacterVarying extends CharacterString { +@deprecated(DbcIsDeprecated) abstract class CharacterVarying extends CharacterString { def isEquivalent(datatype: DataType) = datatype match { case dt: CharacterVarying => diff --git a/src/dbc/scala/dbc/datatype/ExactNumeric.scala b/src/dbc/scala/dbc/datatype/ExactNumeric.scala index f9fe4f8d8..049470560 100644 --- a/src/dbc/scala/dbc/datatype/ExactNumeric.scala +++ b/src/dbc/scala/dbc/datatype/ExactNumeric.scala @@ -15,7 +15,7 @@ package datatype; /** A type category for all SQL types that store constant-precision * numbers. */ -abstract class ExactNumeric[Type]( +@deprecated(DbcIsDeprecated) abstract class ExactNumeric[Type]( override val nativeTypeId: DataType.Id ) extends datatype.Numeric[Type](nativeTypeId) { diff --git a/src/dbc/scala/dbc/datatype/Factory.scala b/src/dbc/scala/dbc/datatype/Factory.scala index 06e224348..72a0ee13d 100644 --- a/src/dbc/scala/dbc/datatype/Factory.scala +++ b/src/dbc/scala/dbc/datatype/Factory.scala @@ -16,7 +16,7 @@ import java.sql.Types._; import java.math.BigInteger; import java.math.BigDecimal; -object Factory { +@deprecated(DbcIsDeprecated) object Factory { final val java_lang_Integer_SIZE = 32; final val java_lang_Long_SIZE = 64; diff --git a/src/dbc/scala/dbc/datatype/Numeric.scala b/src/dbc/scala/dbc/datatype/Numeric.scala index e6abf32a5..c5a3482a7 100644 --- a/src/dbc/scala/dbc/datatype/Numeric.scala +++ b/src/dbc/scala/dbc/datatype/Numeric.scala @@ -13,7 +13,7 @@ package datatype; /** A type category for all SQL types that store numbers. */ -abstract class Numeric[Type](_nativeTypeId: DataType.Id) extends DataType { +@deprecated(DbcIsDeprecated) abstract class Numeric[Type](_nativeTypeId: DataType.Id) extends DataType { type NativeType = Type; val nativeTypeId = _nativeTypeId; diff --git a/src/dbc/scala/dbc/datatype/String.scala b/src/dbc/scala/dbc/datatype/String.scala index 1254936de..8ce0220db 100644 --- a/src/dbc/scala/dbc/datatype/String.scala +++ b/src/dbc/scala/dbc/datatype/String.scala @@ -14,7 +14,7 @@ package datatype; /** A type category for all SQL types that store strings of elements. */ -abstract class String extends DataType { +@deprecated(DbcIsDeprecated) abstract class String extends DataType { /** The maximal possible length of the string defined in characters. * This is an implementation-specific value. diff --git a/src/dbc/scala/dbc/datatype/Unknown.scala b/src/dbc/scala/dbc/datatype/Unknown.scala index 364da2213..7ab4e72ba 100644 --- a/src/dbc/scala/dbc/datatype/Unknown.scala +++ b/src/dbc/scala/dbc/datatype/Unknown.scala @@ -13,7 +13,7 @@ package datatype; /** The SQL type for a truth value. */ -class Unknown extends DataType { +@deprecated(DbcIsDeprecated) class Unknown extends DataType { def isEquivalent(datatype: DataType) = datatype match { case dt: Unknown => diff --git a/src/dbc/scala/dbc/exception/IncompatibleSchema.scala b/src/dbc/scala/dbc/exception/IncompatibleSchema.scala index f7c7ec7d1..4e21daba0 100644 --- a/src/dbc/scala/dbc/exception/IncompatibleSchema.scala +++ b/src/dbc/scala/dbc/exception/IncompatibleSchema.scala @@ -13,7 +13,7 @@ package exception /** A type category for all SQL types that store constant-precision numbers. */ -case class IncompatibleSchema ( +@deprecated(DbcIsDeprecated) case class IncompatibleSchema ( expectedSchema: List[DataType], foundSchema: List[DataType] ) extends Exception; diff --git a/src/dbc/scala/dbc/exception/UnsupportedFeature.scala b/src/dbc/scala/dbc/exception/UnsupportedFeature.scala index 340228d0a..1f286c5bb 100644 --- a/src/dbc/scala/dbc/exception/UnsupportedFeature.scala +++ b/src/dbc/scala/dbc/exception/UnsupportedFeature.scala @@ -13,4 +13,4 @@ package exception /** A type category for all SQL types that store constant-precision numbers. */ -case class UnsupportedFeature (msg: String) extends Exception; +@deprecated(DbcIsDeprecated) case class UnsupportedFeature (msg: String) extends Exception; diff --git a/src/dbc/scala/dbc/package.scala b/src/dbc/scala/dbc/package.scala new file mode 100644 index 000000000..b1552e11d --- /dev/null +++ b/src/dbc/scala/dbc/package.scala @@ -0,0 +1,6 @@ +package scala + +package object dbc { + final val DbcIsDeprecated = + "scala.dbc will be removed after version 2.9. Use an active sql library such as scalaquery instead." +} \ No newline at end of file diff --git a/src/dbc/scala/dbc/result/Field.scala b/src/dbc/scala/dbc/result/Field.scala index 3143c6131..08acbf010 100644 --- a/src/dbc/scala/dbc/result/Field.scala +++ b/src/dbc/scala/dbc/result/Field.scala @@ -16,7 +16,7 @@ import scala.dbc.datatype._ import scala.dbc.value._ /** An ISO-9075:2003 (SQL) table field. */ -abstract class Field { +@deprecated(DbcIsDeprecated) abstract class Field { /** The content (value) of the field. The type of this value is undefined, * transformation into a useful type will be done by an automatic view @@ -56,7 +56,7 @@ abstract class Field { } -object Field { +@deprecated(DbcIsDeprecated) object Field { implicit def fieldToValue (field: Field): Value = field.content diff --git a/src/dbc/scala/dbc/result/FieldMetadata.scala b/src/dbc/scala/dbc/result/FieldMetadata.scala index 4fd7a66f2..f0ec7cf9e 100644 --- a/src/dbc/scala/dbc/result/FieldMetadata.scala +++ b/src/dbc/scala/dbc/result/FieldMetadata.scala @@ -15,7 +15,7 @@ package result /** The class FieldMetadata provides informations attached to * a field about its content and its relationship to the originating database. */ -abstract class FieldMetadata { +@deprecated(DbcIsDeprecated) abstract class FieldMetadata { /** The name of the field. */ def name: String diff --git a/src/dbc/scala/dbc/result/Relation.scala b/src/dbc/scala/dbc/result/Relation.scala index e399f405e..0fc9a65ea 100644 --- a/src/dbc/scala/dbc/result/Relation.scala +++ b/src/dbc/scala/dbc/result/Relation.scala @@ -14,7 +14,7 @@ package result /** An ISO-9075:2003 (SQL) table. This is equivalent to a relation in the * relational model. */ -abstract class Relation extends AnyRef with Iterable[Tuple] { +@deprecated(DbcIsDeprecated) abstract class Relation extends AnyRef with Iterable[Tuple] { /** The statement that generated this relation. */ def statement: scala.dbc.statement.Relation diff --git a/src/dbc/scala/dbc/result/Status.scala b/src/dbc/scala/dbc/result/Status.scala index 7803fb16d..274a2a745 100644 --- a/src/dbc/scala/dbc/result/Status.scala +++ b/src/dbc/scala/dbc/result/Status.scala @@ -15,7 +15,7 @@ package result; import scala.dbc.datatype._; /** An object containing the status of a query */ -abstract class Status[ResultType] { +@deprecated(DbcIsDeprecated) abstract class Status[ResultType] { /** The statement that generated this status result. */ def statement: scala.dbc.statement.Statement; diff --git a/src/dbc/scala/dbc/result/Tuple.scala b/src/dbc/scala/dbc/result/Tuple.scala index 213fed2e8..ebd2b098f 100644 --- a/src/dbc/scala/dbc/result/Tuple.scala +++ b/src/dbc/scala/dbc/result/Tuple.scala @@ -13,7 +13,7 @@ package result; /** An ISO-9075:2003 (SQL) table row. This is equivalent to a tuple in the relational model. */ -abstract class Tuple { +@deprecated(DbcIsDeprecated) abstract class Tuple { /** All the fields contained in the tuple. */ def fields: List[Field]; diff --git a/src/dbc/scala/dbc/statement/AccessMode.scala b/src/dbc/scala/dbc/statement/AccessMode.scala index 99213eb97..35c76981e 100644 --- a/src/dbc/scala/dbc/statement/AccessMode.scala +++ b/src/dbc/scala/dbc/statement/AccessMode.scala @@ -12,11 +12,11 @@ package scala.dbc package statement -abstract class AccessMode { +@deprecated(DbcIsDeprecated) abstract class AccessMode { def sqlString: String } -object AccessMode { +@deprecated(DbcIsDeprecated) object AccessMode { case object ReadOnly extends AccessMode { def sqlString = "READ ONLY" } diff --git a/src/dbc/scala/dbc/statement/DerivedColumn.scala b/src/dbc/scala/dbc/statement/DerivedColumn.scala index d19ce6fa8..e0a8b3059 100644 --- a/src/dbc/scala/dbc/statement/DerivedColumn.scala +++ b/src/dbc/scala/dbc/statement/DerivedColumn.scala @@ -12,7 +12,7 @@ package scala.dbc package statement -abstract class DerivedColumn { +@deprecated(DbcIsDeprecated) abstract class DerivedColumn { /** The value for the column. This value can be of any type but must be * calculated from fields that appear in a relation that takes part diff --git a/src/dbc/scala/dbc/statement/Expression.scala b/src/dbc/scala/dbc/statement/Expression.scala index fa371dccb..73362be8d 100644 --- a/src/dbc/scala/dbc/statement/Expression.scala +++ b/src/dbc/scala/dbc/statement/Expression.scala @@ -13,7 +13,7 @@ package statement /** An expression that calculates some value from fields. */ -abstract class Expression extends Relation { +@deprecated(DbcIsDeprecated) abstract class Expression extends Relation { def fieldTypes: List[DataType] = Nil diff --git a/src/dbc/scala/dbc/statement/Insert.scala b/src/dbc/scala/dbc/statement/Insert.scala index b232a44a2..f2f06e27e 100644 --- a/src/dbc/scala/dbc/statement/Insert.scala +++ b/src/dbc/scala/dbc/statement/Insert.scala @@ -15,7 +15,7 @@ package statement import scala.dbc.statement.expression._ /** An insertion of values into a table. */ -case class Insert(insertionTarget: String, insertionData: InsertionData) +@deprecated(DbcIsDeprecated) case class Insert(insertionTarget: String, insertionData: InsertionData) extends Status { /** A SQL-99 compliant string representation of the select statement. */ diff --git a/src/dbc/scala/dbc/statement/InsertionData.scala b/src/dbc/scala/dbc/statement/InsertionData.scala index c7742c974..9ba729b64 100644 --- a/src/dbc/scala/dbc/statement/InsertionData.scala +++ b/src/dbc/scala/dbc/statement/InsertionData.scala @@ -15,17 +15,17 @@ package statement import scala.dbc.statement.expression._ /** Data to be inserted into a table in an Insert. */ -abstract class InsertionData { +@deprecated(DbcIsDeprecated) abstract class InsertionData { def sqlString: String } -object InsertionData { +@deprecated(DbcIsDeprecated) object InsertionData { /** Insertion of data resulting from a query on the database. */ - case class Subquery(query: Relation) extends InsertionData { + @deprecated(DbcIsDeprecated) case class Subquery(query: Relation) extends InsertionData { def sqlString = query.sqlString } /** Insertion of data as explicitly defined values. */ - case class Constructor( + @deprecated(DbcIsDeprecated) case class Constructor( columnNames: Option[List[String]], columnValues: List[Expression] ) extends InsertionData { diff --git a/src/dbc/scala/dbc/statement/IsolationLevel.scala b/src/dbc/scala/dbc/statement/IsolationLevel.scala index 80aeca142..218539331 100644 --- a/src/dbc/scala/dbc/statement/IsolationLevel.scala +++ b/src/dbc/scala/dbc/statement/IsolationLevel.scala @@ -12,11 +12,11 @@ package scala.dbc package statement -abstract class IsolationLevel { +@deprecated(DbcIsDeprecated) abstract class IsolationLevel { def sqlString: String } -object IsolationLevel { +@deprecated(DbcIsDeprecated) object IsolationLevel { case object ReadUncommitted extends IsolationLevel { def sqlString = "ISOLATION LEVEL READ UNCOMMITTED" } diff --git a/src/dbc/scala/dbc/statement/JoinType.scala b/src/dbc/scala/dbc/statement/JoinType.scala index 172233463..68e616886 100644 --- a/src/dbc/scala/dbc/statement/JoinType.scala +++ b/src/dbc/scala/dbc/statement/JoinType.scala @@ -13,12 +13,12 @@ package statement /** A join behaviour in a Jointure. */ -abstract class JoinType { +@deprecated(DbcIsDeprecated) abstract class JoinType { /** A SQL-99 string representation of the join behaviour. */ def sqlString: String } -object JoinType { +@deprecated(DbcIsDeprecated) object JoinType { /** A join behaviour where a joined tuple is created only when a * corresponding tuple exists in both original relations. diff --git a/src/dbc/scala/dbc/statement/Jointure.scala b/src/dbc/scala/dbc/statement/Jointure.scala index a10db7d52..2f517687f 100644 --- a/src/dbc/scala/dbc/statement/Jointure.scala +++ b/src/dbc/scala/dbc/statement/Jointure.scala @@ -13,7 +13,7 @@ package statement /** A jointure between two relations. */ -abstract class Jointure extends Relation { +@deprecated(DbcIsDeprecated) abstract class Jointure extends Relation { /** The relation on the left part of the join. */ def leftRelation: Relation diff --git a/src/dbc/scala/dbc/statement/Relation.scala b/src/dbc/scala/dbc/statement/Relation.scala index 1d7486cb6..4fdf9d55e 100644 --- a/src/dbc/scala/dbc/statement/Relation.scala +++ b/src/dbc/scala/dbc/statement/Relation.scala @@ -13,7 +13,7 @@ package statement; /** A statement that returns a relation. */ -abstract class Relation extends Statement { +@deprecated(DbcIsDeprecated) abstract class Relation extends Statement { def isCompatibleType: (DataType,DataType)=>Boolean = ((dt,wdt)=>dt.isSubtypeOf(wdt)); diff --git a/src/dbc/scala/dbc/statement/Select.scala b/src/dbc/scala/dbc/statement/Select.scala index bc7b6cdbf..acd3a8b73 100644 --- a/src/dbc/scala/dbc/statement/Select.scala +++ b/src/dbc/scala/dbc/statement/Select.scala @@ -15,7 +15,7 @@ package statement /** A statement that when executed on a database will return a relation. * The returned relation will be a subset of a table in the database or * a jointure between such subsets. */ -abstract class Select extends Relation { +@deprecated(DbcIsDeprecated) abstract class Select extends Relation { /** Defines if duplicated tuples should be removed from the returned * relation.

Compatibility notice

Some DBMS (PostgreSQL) allow diff --git a/src/dbc/scala/dbc/statement/SetClause.scala b/src/dbc/scala/dbc/statement/SetClause.scala index 0af344274..4818fdda2 100644 --- a/src/dbc/scala/dbc/statement/SetClause.scala +++ b/src/dbc/scala/dbc/statement/SetClause.scala @@ -15,7 +15,7 @@ package statement import scala.dbc.statement.expression._ /** Data to be inserted into a table in an Insert. */ -case class SetClause(name: String, expr: Expression) { +@deprecated(DbcIsDeprecated) case class SetClause(name: String, expr: Expression) { val value: Pair[String,Expression] = (name, expr) def sqlString: String = value._1 + " = " + value._2.sqlInnerString } diff --git a/src/dbc/scala/dbc/statement/SetQuantifier.scala b/src/dbc/scala/dbc/statement/SetQuantifier.scala index 74d37fb69..62245d74f 100644 --- a/src/dbc/scala/dbc/statement/SetQuantifier.scala +++ b/src/dbc/scala/dbc/statement/SetQuantifier.scala @@ -13,12 +13,12 @@ package statement /** A set quantifier that defines the collection type of a relation. */ -abstract class SetQuantifier { +@deprecated(DbcIsDeprecated) abstract class SetQuantifier { /** A SQL-99 compliant string representation of the set quantifier. */ def sqlString: String } -object SetQuantifier { +@deprecated(DbcIsDeprecated) object SetQuantifier { /** A set quantifier that defines a relation as being a bag. That means * that duplicates are allowed. diff --git a/src/dbc/scala/dbc/statement/Statement.scala b/src/dbc/scala/dbc/statement/Statement.scala index 658317be1..ad69f5b11 100644 --- a/src/dbc/scala/dbc/statement/Statement.scala +++ b/src/dbc/scala/dbc/statement/Statement.scala @@ -13,4 +13,4 @@ package statement /** An ISO-9075:2003 (SQL) statement. */ -abstract class Statement +@deprecated(DbcIsDeprecated) abstract class Statement diff --git a/src/dbc/scala/dbc/statement/Status.scala b/src/dbc/scala/dbc/statement/Status.scala index 397326a18..e1f358077 100644 --- a/src/dbc/scala/dbc/statement/Status.scala +++ b/src/dbc/scala/dbc/statement/Status.scala @@ -15,7 +15,7 @@ import scala.dbc.Database import scala.dbc.result /** A statement that changes the status of the database. */ -abstract class Status extends Statement { +@deprecated(DbcIsDeprecated) abstract class Status extends Statement { /** A SQL-99 compliant string representation of the statement. */ def sqlString: String diff --git a/src/dbc/scala/dbc/statement/Table.scala b/src/dbc/scala/dbc/statement/Table.scala index 3c2905af6..a1e6a6bbb 100644 --- a/src/dbc/scala/dbc/statement/Table.scala +++ b/src/dbc/scala/dbc/statement/Table.scala @@ -15,7 +15,7 @@ package statement /** A reference to a table in the database. * @author Gilles Dubochet * @version 1.0 */ -abstract class Table extends Relation { +@deprecated(DbcIsDeprecated) abstract class Table extends Relation { /** The name of the table in the database. */ def tableName: String diff --git a/src/dbc/scala/dbc/statement/Transaction.scala b/src/dbc/scala/dbc/statement/Transaction.scala index b59d50d03..9e1d86036 100644 --- a/src/dbc/scala/dbc/statement/Transaction.scala +++ b/src/dbc/scala/dbc/statement/Transaction.scala @@ -13,7 +13,7 @@ package statement; /** A statement that changes the status of the database. */ -case class Transaction [ResultType] ( +@deprecated(DbcIsDeprecated) case class Transaction [ResultType] ( transactionBody: (scala.dbc.Database=>ResultType), accessMode: Option[AccessMode], isolationLevel: Option[IsolationLevel] diff --git a/src/dbc/scala/dbc/statement/Update.scala b/src/dbc/scala/dbc/statement/Update.scala index f9c5b7c56..7ae6bd397 100644 --- a/src/dbc/scala/dbc/statement/Update.scala +++ b/src/dbc/scala/dbc/statement/Update.scala @@ -15,7 +15,7 @@ package statement; import scala.dbc.statement.expression._; /** An update of the state of a table. */ -case class Update ( +@deprecated(DbcIsDeprecated) case class Update ( updateTarget: String, setClauses: List[SetClause], whereClause: Option[Expression] diff --git a/src/dbc/scala/dbc/statement/expression/Aggregate.scala b/src/dbc/scala/dbc/statement/expression/Aggregate.scala index a25b00723..02a888f10 100644 --- a/src/dbc/scala/dbc/statement/expression/Aggregate.scala +++ b/src/dbc/scala/dbc/statement/expression/Aggregate.scala @@ -13,7 +13,7 @@ package statement package expression -abstract class Aggregate extends Expression { +@deprecated(DbcIsDeprecated) abstract class Aggregate extends Expression { def aggregateName: String; diff --git a/src/dbc/scala/dbc/statement/expression/BinaryOperator.scala b/src/dbc/scala/dbc/statement/expression/BinaryOperator.scala index 1176dc695..5b1cb6bf6 100644 --- a/src/dbc/scala/dbc/statement/expression/BinaryOperator.scala +++ b/src/dbc/scala/dbc/statement/expression/BinaryOperator.scala @@ -13,7 +13,7 @@ package statement package expression; -abstract class BinaryOperator extends Expression { +@deprecated(DbcIsDeprecated) abstract class BinaryOperator extends Expression { /** The name of the operator. */ def operator: String; diff --git a/src/dbc/scala/dbc/statement/expression/Constant.scala b/src/dbc/scala/dbc/statement/expression/Constant.scala index 7b3564a8d..c3b1f46dd 100644 --- a/src/dbc/scala/dbc/statement/expression/Constant.scala +++ b/src/dbc/scala/dbc/statement/expression/Constant.scala @@ -13,7 +13,7 @@ package statement package expression; -abstract class Constant extends Expression { +@deprecated(DbcIsDeprecated) abstract class Constant extends Expression { /** A SQL-99 compliant string representation of the relation sub- * statement. This only has a meaning inside another statement. */ def sqlInnerString: String = constantValue.sqlString; diff --git a/src/dbc/scala/dbc/statement/expression/Field.scala b/src/dbc/scala/dbc/statement/expression/Field.scala index 8f4a89259..eee849a66 100644 --- a/src/dbc/scala/dbc/statement/expression/Field.scala +++ b/src/dbc/scala/dbc/statement/expression/Field.scala @@ -13,7 +13,7 @@ package statement package expression; -abstract class Field extends Expression { +@deprecated(DbcIsDeprecated) abstract class Field extends Expression { /** The name of the schema in the database where the field is located. */ def schemaName: Option[String] = None; diff --git a/src/dbc/scala/dbc/statement/expression/FunctionCall.scala b/src/dbc/scala/dbc/statement/expression/FunctionCall.scala index 214fbdfa5..2cbbd5214 100644 --- a/src/dbc/scala/dbc/statement/expression/FunctionCall.scala +++ b/src/dbc/scala/dbc/statement/expression/FunctionCall.scala @@ -13,7 +13,7 @@ package statement package expression; -case class FunctionCall ( +@deprecated(DbcIsDeprecated) case class FunctionCall ( functionName: String, arguments: List[Expression] ) extends Expression { diff --git a/src/dbc/scala/dbc/statement/expression/Select.scala b/src/dbc/scala/dbc/statement/expression/Select.scala index 6c1cc6716..14f333bfd 100644 --- a/src/dbc/scala/dbc/statement/expression/Select.scala +++ b/src/dbc/scala/dbc/statement/expression/Select.scala @@ -13,7 +13,7 @@ package statement package expression; -abstract class Select extends Expression { +@deprecated(DbcIsDeprecated) abstract class Select extends Expression { /** The actual select statement */ def selectStatement: statement.Select; diff --git a/src/dbc/scala/dbc/statement/expression/SetFunction.scala b/src/dbc/scala/dbc/statement/expression/SetFunction.scala index 4f13c47b8..07bd94ada 100644 --- a/src/dbc/scala/dbc/statement/expression/SetFunction.scala +++ b/src/dbc/scala/dbc/statement/expression/SetFunction.scala @@ -13,12 +13,12 @@ package statement package expression; -abstract class SetFunction { +@deprecated(DbcIsDeprecated) abstract class SetFunction { /** A SQL-99 compliant string representation of the set quantifier. */ def sqlString: String; } -object SetFunction { +@deprecated(DbcIsDeprecated) object SetFunction { abstract class Asterisk extends SetFunction { def sqlString = "(*)"; } diff --git a/src/dbc/scala/dbc/statement/expression/TypeCast.scala b/src/dbc/scala/dbc/statement/expression/TypeCast.scala index 5f1f16da7..148afc0b3 100644 --- a/src/dbc/scala/dbc/statement/expression/TypeCast.scala +++ b/src/dbc/scala/dbc/statement/expression/TypeCast.scala @@ -13,7 +13,7 @@ package statement package expression; -case class TypeCast ( +@deprecated(DbcIsDeprecated) case class TypeCast ( expression: Expression, castType: DataType ) extends Expression { diff --git a/src/dbc/scala/dbc/statement/expression/UnaryOperator.scala b/src/dbc/scala/dbc/statement/expression/UnaryOperator.scala index a2cbb675e..086cd1ac0 100644 --- a/src/dbc/scala/dbc/statement/expression/UnaryOperator.scala +++ b/src/dbc/scala/dbc/statement/expression/UnaryOperator.scala @@ -13,7 +13,7 @@ package statement package expression; -abstract class UnaryOperator extends Expression { +@deprecated(DbcIsDeprecated) abstract class UnaryOperator extends Expression { /** The name of the operator */ def operator: String; diff --git a/src/dbc/scala/dbc/syntax/DataTypeUtil.scala b/src/dbc/scala/dbc/syntax/DataTypeUtil.scala index a988e0cdf..2db9e5815 100644 --- a/src/dbc/scala/dbc/syntax/DataTypeUtil.scala +++ b/src/dbc/scala/dbc/syntax/DataTypeUtil.scala @@ -15,7 +15,7 @@ package syntax; import java.math.BigDecimal; import java.math.BigInteger; -object DataTypeUtil { +@deprecated(DbcIsDeprecated) object DataTypeUtil { final val java_lang_Integer_SIZE = 32; final val java_lang_Long_SIZE = 64; diff --git a/src/dbc/scala/dbc/syntax/Database.scala b/src/dbc/scala/dbc/syntax/Database.scala index 5a352a812..779de663a 100644 --- a/src/dbc/scala/dbc/syntax/Database.scala +++ b/src/dbc/scala/dbc/syntax/Database.scala @@ -14,7 +14,7 @@ package syntax; import java.net.URI; -object Database { +@deprecated(DbcIsDeprecated) object Database { def database (server:String, username:String, password:String): dbc.Database = { val uri = new URI(server); diff --git a/src/dbc/scala/dbc/syntax/Statement.scala b/src/dbc/scala/dbc/syntax/Statement.scala index cb13d7537..ef6d2c9e0 100644 --- a/src/dbc/scala/dbc/syntax/Statement.scala +++ b/src/dbc/scala/dbc/syntax/Statement.scala @@ -31,7 +31,7 @@ FIXED: */ -object Statement { +@deprecated(DbcIsDeprecated) object Statement { // SELECT ZYGOTE ... diff --git a/src/dbc/scala/dbc/syntax/StatementExpression.scala b/src/dbc/scala/dbc/syntax/StatementExpression.scala index fd6ef8eb8..68179f20a 100644 --- a/src/dbc/scala/dbc/syntax/StatementExpression.scala +++ b/src/dbc/scala/dbc/syntax/StatementExpression.scala @@ -15,7 +15,7 @@ package syntax; import java.math.BigDecimal; import java.math.BigInteger; -abstract class StatementExpression { +@deprecated(DbcIsDeprecated) abstract class StatementExpression { def toStatement: statement.Expression; @@ -171,7 +171,7 @@ abstract class StatementExpression { } -object StatementExpression { +@deprecated(DbcIsDeprecated) object StatementExpression { def not (se:StatementExpression): StatementExpression = new StatementExpression { val toStatement = new statement.expression.UnaryOperator { diff --git a/src/dbc/scala/dbc/value/ApproximateNumeric.scala b/src/dbc/scala/dbc/value/ApproximateNumeric.scala index 9d6d804c4..b88abdc73 100644 --- a/src/dbc/scala/dbc/value/ApproximateNumeric.scala +++ b/src/dbc/scala/dbc/value/ApproximateNumeric.scala @@ -12,7 +12,7 @@ package scala.dbc package value; -abstract class ApproximateNumeric [Type] extends Value { +@deprecated(DbcIsDeprecated) abstract class ApproximateNumeric [Type] extends Value { val dataType: datatype.ApproximateNumeric[Type]; @@ -20,7 +20,7 @@ abstract class ApproximateNumeric [Type] extends Value { } -object ApproximateNumeric { +@deprecated(DbcIsDeprecated) object ApproximateNumeric { implicit def approximateNumericToFloar (obj:value.ApproximateNumeric[Float]): Float = obj.nativeValue; implicit def approximateNumericToDouble (obj:value.ApproximateNumeric[Double]): Double = obj.nativeValue; diff --git a/src/dbc/scala/dbc/value/Boolean.scala b/src/dbc/scala/dbc/value/Boolean.scala index 0ce545b59..b7d1fdac0 100644 --- a/src/dbc/scala/dbc/value/Boolean.scala +++ b/src/dbc/scala/dbc/value/Boolean.scala @@ -12,7 +12,7 @@ package scala.dbc package value; -abstract class Boolean extends Value { +@deprecated(DbcIsDeprecated) abstract class Boolean extends Value { val dataType: datatype.Boolean; @@ -20,7 +20,7 @@ abstract class Boolean extends Value { } -object Boolean { +@deprecated(DbcIsDeprecated) object Boolean { implicit def booleanToBoolean (obj:value.Boolean): scala.Boolean = obj.nativeValue; diff --git a/src/dbc/scala/dbc/value/Character.scala b/src/dbc/scala/dbc/value/Character.scala index 39e16b39b..94379dcf5 100644 --- a/src/dbc/scala/dbc/value/Character.scala +++ b/src/dbc/scala/dbc/value/Character.scala @@ -13,7 +13,7 @@ package value; /** A SQL-99 value of type character string. */ -abstract class Character extends Value { +@deprecated(DbcIsDeprecated) abstract class Character extends Value { override val dataType: datatype.Character; @@ -27,7 +27,7 @@ abstract class Character extends Value { /** An object offering transformation methods (views) on the value. * This object must be visible in an expression to use value auto- * conversion. */ -object Character { +@deprecated(DbcIsDeprecated) object Character { /** A character string value as a native string. */ implicit def characterToString (obj:value.Character): String = obj.nativeValue; diff --git a/src/dbc/scala/dbc/value/CharacterLargeObject.scala b/src/dbc/scala/dbc/value/CharacterLargeObject.scala index 364b0df58..a1d0446c2 100644 --- a/src/dbc/scala/dbc/value/CharacterLargeObject.scala +++ b/src/dbc/scala/dbc/value/CharacterLargeObject.scala @@ -13,7 +13,7 @@ package value; /** A SQL-99 value of type character large object. */ -abstract class CharacterLargeObject extends Value { +@deprecated(DbcIsDeprecated) abstract class CharacterLargeObject extends Value { override val dataType: datatype.CharacterLargeObject; @@ -27,7 +27,7 @@ abstract class CharacterLargeObject extends Value { /** An object offering transformation methods (views) on the value. * This object must be visible in an expression to use value auto- * conversion. */ -object CharacterLargeObject { +@deprecated(DbcIsDeprecated) object CharacterLargeObject { /** A character large object value as a native string. */ implicit def characterLargeObjectToString (obj:value.CharacterLargeObject): String = obj.nativeValue; diff --git a/src/dbc/scala/dbc/value/CharacterVarying.scala b/src/dbc/scala/dbc/value/CharacterVarying.scala index af400a35e..f48e56ec0 100644 --- a/src/dbc/scala/dbc/value/CharacterVarying.scala +++ b/src/dbc/scala/dbc/value/CharacterVarying.scala @@ -13,7 +13,7 @@ package value; /** A SQL-99 value of type character varying string. */ -abstract class CharacterVarying extends Value { +@deprecated(DbcIsDeprecated) abstract class CharacterVarying extends Value { override val dataType: datatype.CharacterVarying; @@ -27,7 +27,7 @@ abstract class CharacterVarying extends Value { /** An object offering transformation methods (views) on the value. * This object must be visible in an expression to use value auto- * conversion. */ -object CharacterVarying { +@deprecated(DbcIsDeprecated) object CharacterVarying { /** A character varying string value as a native string. */ implicit def characterVaryingToString (obj:value.CharacterVarying): String = obj.nativeValue; diff --git a/src/dbc/scala/dbc/value/Conversion.scala b/src/dbc/scala/dbc/value/Conversion.scala index 272c84dd5..062bb388d 100644 --- a/src/dbc/scala/dbc/value/Conversion.scala +++ b/src/dbc/scala/dbc/value/Conversion.scala @@ -11,10 +11,9 @@ package scala.dbc package value; - import java.math._; -object Conversion { +@deprecated(DbcIsDeprecated) object Conversion { class Illegal (msg:String) extends Exception(msg); diff --git a/src/dbc/scala/dbc/value/ExactNumeric.scala b/src/dbc/scala/dbc/value/ExactNumeric.scala index 81c7deaac..12e894967 100644 --- a/src/dbc/scala/dbc/value/ExactNumeric.scala +++ b/src/dbc/scala/dbc/value/ExactNumeric.scala @@ -15,7 +15,7 @@ package value; import java.math.BigInteger; import java.math.BigDecimal; -abstract class ExactNumeric [Type] extends Value { +@deprecated(DbcIsDeprecated) abstract class ExactNumeric [Type] extends Value { val dataType: datatype.ExactNumeric[Type]; @@ -23,7 +23,7 @@ abstract class ExactNumeric [Type] extends Value { } -object ExactNumeric { +@deprecated(DbcIsDeprecated) object ExactNumeric { implicit def exactNumericToByte (obj:value.ExactNumeric[Byte]): Byte = obj.nativeValue; implicit def exactNumericToShort (obj:value.ExactNumeric[Short]): Short = obj.nativeValue; diff --git a/src/dbc/scala/dbc/value/Factory.scala b/src/dbc/scala/dbc/value/Factory.scala index 3e2d0e882..9a1b56b78 100644 --- a/src/dbc/scala/dbc/value/Factory.scala +++ b/src/dbc/scala/dbc/value/Factory.scala @@ -15,7 +15,7 @@ package value; import java.math.BigInteger; import java.math.BigDecimal; -object Factory { +@deprecated(DbcIsDeprecated) object Factory { def create (result: java.sql.ResultSet, index: Int, expectedDataType: DataType): Value = { expectedDataType.nativeTypeId match { diff --git a/src/dbc/scala/dbc/value/Unknown.scala b/src/dbc/scala/dbc/value/Unknown.scala index 728014033..3d7fe2210 100644 --- a/src/dbc/scala/dbc/value/Unknown.scala +++ b/src/dbc/scala/dbc/value/Unknown.scala @@ -12,7 +12,7 @@ package scala.dbc package value; -abstract class Unknown extends Value { +@deprecated(DbcIsDeprecated) abstract class Unknown extends Value { val dataType: datatype.Unknown; @@ -20,7 +20,7 @@ abstract class Unknown extends Value { } -object UnknownType { +@deprecated(DbcIsDeprecated) object UnknownType { def view (obj:value.Unknown): AnyRef = obj.nativeValue; diff --git a/src/dbc/scala/dbc/vendor/PostgreSQL.scala b/src/dbc/scala/dbc/vendor/PostgreSQL.scala index 45343b5a5..f9ab9cb34 100644 --- a/src/dbc/scala/dbc/vendor/PostgreSQL.scala +++ b/src/dbc/scala/dbc/vendor/PostgreSQL.scala @@ -14,7 +14,7 @@ package vendor; import compat.Platform -abstract class PostgreSQL extends Vendor { +@deprecated(DbcIsDeprecated) abstract class PostgreSQL extends Vendor { def uri:java.net.URI; def user:String;