diff options
author | Paul Phillips <paulp@improving.org> | 2011-01-12 02:49:08 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2011-01-12 02:49:08 +0000 |
commit | 5bada810b4c7eda186aa40b94a78326520b3fa92 (patch) | |
tree | eee2227bf7f53a6b04e9732d887961b403975ab5 /src/dbc | |
parent | 566fefb05abe31e90f765d1fb0a89b264302d9ce (diff) | |
download | scala-5bada810b4c7eda186aa40b94a78326520b3fa92.tar.gz scala-5bada810b4c7eda186aa40b94a78326520b3fa92.tar.bz2 scala-5bada810b4c7eda186aa40b94a78326520b3fa92.zip |
Imported sbt.Process into trunk, in the guise o...
Imported sbt.Process into trunk, in the guise of package
scala.sys.process. It is largely indistinguishable from the version in
sbt, at least from the outside.
Also, I renamed package system to sys. I wanted to do that from the
beginning and the desire has only grown since then. Sometimes a short
identifier is just critical to usability: with a function like error("")
called from hundreds of places, the difference between system.error and
sys.error is too big. sys.error and sys.exit have good vibes (at least
as good as the vibes can be for functions which error and exit.)
Note: this is just the first cut. I need to check this in to finish
fixing partest. I will be going over it with a comb and writing
documentation which will leave you enchanted, as well as removing other
bits which are now redundant or inferior. No review.
Diffstat (limited to 'src/dbc')
-rw-r--r-- | src/dbc/scala/dbc/datatype/Factory.scala | 10 | ||||
-rw-r--r-- | src/dbc/scala/dbc/datatype/Unknown.scala | 2 | ||||
-rw-r--r-- | src/dbc/scala/dbc/result/Relation.scala | 2 | ||||
-rw-r--r-- | src/dbc/scala/dbc/statement/Select.scala | 4 | ||||
-rw-r--r-- | src/dbc/scala/dbc/statement/expression/SetFunction.scala | 2 | ||||
-rw-r--r-- | src/dbc/scala/dbc/value/Unknown.scala | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/src/dbc/scala/dbc/datatype/Factory.scala b/src/dbc/scala/dbc/datatype/Factory.scala index a5e69d5471..9eb8d25b26 100644 --- a/src/dbc/scala/dbc/datatype/Factory.scala +++ b/src/dbc/scala/dbc/datatype/Factory.scala @@ -234,17 +234,17 @@ object Factory { } /* Unsupported data types. */ case REF | ARRAY | STRUCT => - system.error ("I don't support composite data types yet."); + sys.error ("I don't support composite data types yet."); case DATALINK | DISTINCT | JAVA_OBJECT | NULL => - system.error ("I won't support strange data types."); + sys.error ("I won't support strange data types."); /* Unsupported binary string data types. */ case BINARY | BLOB | LONGVARBINARY | VARBINARY => - system.error ("I don't support binary string data types yet."); + sys.error ("I don't support binary string data types yet."); /* Unsupported date and time data types. */ case DATE | TIME | TIMESTAMP => - system.error ("I don't support date and time data types yet."); + sys.error ("I don't support date and time data types yet."); /* Default case */ - case x => system.error ("I don't know about this ("+metadata.getColumnTypeName(index)+") JDBC type.") + case x => sys.error ("I don't know about this ("+metadata.getColumnTypeName(index)+") JDBC type.") } } } diff --git a/src/dbc/scala/dbc/datatype/Unknown.scala b/src/dbc/scala/dbc/datatype/Unknown.scala index 21afaea22d..9a509251fb 100644 --- a/src/dbc/scala/dbc/datatype/Unknown.scala +++ b/src/dbc/scala/dbc/datatype/Unknown.scala @@ -29,6 +29,6 @@ class Unknown extends DataType { /** A SQL-99 compliant string representation of the type. */ override def sqlString: java.lang.String = - system.error("The 'UNKNOWN' data type cannot be represented."); + sys.error("The 'UNKNOWN' data type cannot be represented."); } diff --git a/src/dbc/scala/dbc/result/Relation.scala b/src/dbc/scala/dbc/result/Relation.scala index 0427269ffd..3dab6f4810 100644 --- a/src/dbc/scala/dbc/result/Relation.scala +++ b/src/dbc/scala/dbc/result/Relation.scala @@ -75,7 +75,7 @@ abstract class Relation extends AnyRef with Iterable[Tuple] { resultNext = result.next() newTuple } - else system.error("next on empty iterator") + else sys.error("next on empty iterator") } } diff --git a/src/dbc/scala/dbc/statement/Select.scala b/src/dbc/scala/dbc/statement/Select.scala index 07d7d26c6f..74b05ed2a1 100644 --- a/src/dbc/scala/dbc/statement/Select.scala +++ b/src/dbc/scala/dbc/statement/Select.scala @@ -67,7 +67,7 @@ abstract class Select extends Relation { ((name:String, dc:DerivedColumn) => name + ", " + dc.sqlString)) }) + (fromClause match { - case Nil => system.error("Empty from clause is not allowed") + case Nil => sys.error("Empty from clause is not allowed") case _ => (" FROM " + fromClause.tail.foldLeft(fromClause.head.sqlInnerString) ((name:String, rel:Relation) => name + ", " + rel.sqlInnerString)) }) + @@ -78,7 +78,7 @@ abstract class Select extends Relation { (groupByClause match { case None => "" case Some(gbl) => gbl match { - case Nil => system.error("Empty group by clause is not allowed") + case Nil => sys.error("Empty group by clause is not allowed") case _ => (" GROUP BY " + gbl.tail.foldLeft(gbl.head.sqlInnerString) diff --git a/src/dbc/scala/dbc/statement/expression/SetFunction.scala b/src/dbc/scala/dbc/statement/expression/SetFunction.scala index 48a675a405..334e6bf1ed 100644 --- a/src/dbc/scala/dbc/statement/expression/SetFunction.scala +++ b/src/dbc/scala/dbc/statement/expression/SetFunction.scala @@ -35,6 +35,6 @@ object SetFunction { ); } abstract class Binary extends SetFunction { - def sqlString = system.error("Binary set function is not supported yet."); + def sqlString = sys.error("Binary set function is not supported yet."); } } diff --git a/src/dbc/scala/dbc/value/Unknown.scala b/src/dbc/scala/dbc/value/Unknown.scala index 2c56bbf36e..2cb791566f 100644 --- a/src/dbc/scala/dbc/value/Unknown.scala +++ b/src/dbc/scala/dbc/value/Unknown.scala @@ -16,7 +16,7 @@ abstract class Unknown extends Value { val dataType: datatype.Unknown; - def sqlString = system.error("An 'ANY' value cannot be represented."); + def sqlString = sys.error("An 'ANY' value cannot be represented."); } |