Removed useage of deprecated PrimitiveTypeMode object

max-l · max-l · commit a0caa41fd21d · 2012-12-20T18:15:31.000-05:00
diff --git a/src/main/scala/org/squeryl/PrimitiveTypeMode.scala b/src/main/scala/org/squeryl/PrimitiveTypeMode.scala
@@ -29,6 +29,8 @@ import org.squeryl.internals.FieldMapper
     "0.9.6")
 object PrimitiveTypeMode extends PrimitiveTypeMode
 
+private [squeryl] object InternalFieldMapper extends PrimitiveTypeMode
+
 trait PrimitiveTypeMode extends QueryDsl with FieldMapper {
     
   
diff --git a/src/main/scala/org/squeryl/Schema.scala b/src/main/scala/org/squeryl/Schema.scala
@@ -87,7 +87,7 @@ class Schema(implicit val fieldMapper: FieldMapper) {
 
   object NamingConventionTransforms {
     
-    @deprecated("use snakify() instead as of 0.9.5beta")
+    @deprecated("use snakify() instead as of 0.9.5beta","0.9.5")
     def camelCase2underScore(name: String) =
       name.toList.map(c => if(c.isUpper) "_" + c else c).mkString
       
diff --git a/src/main/scala/org/squeryl/dsl/QueryDsl.scala b/src/main/scala/org/squeryl/dsl/QueryDsl.scala
@@ -270,16 +270,16 @@ trait QueryDsl
   implicit def enumComparisonEvidence[A]   = new CanCompare[TEnumValue[A],TEnumValue[A]]
   
   implicit def concatenationConversion[A1,A2,T1,T2](co: ConcatOp[A1,A2,T1,T2]): TypedExpression[String,TString] = 
-    new ConcatOperationNode[String,TString](co.a1, co.a2, PrimitiveTypeMode.stringTEF.createOutMapper)
+    new ConcatOperationNode[String,TString](co.a1, co.a2, InternalFieldMapper.stringTEF.createOutMapper)
     
   implicit def concatenationConversionWithOption1[A1,A2,T1,T2](co: ConcatOp[Option[A1],A2,T1,T2]): TypedExpression[Option[String],TOptionString] = 
-    new ConcatOperationNode[Option[String],TOptionString](co.a1, co.a2, PrimitiveTypeMode.optionStringTEF.createOutMapper)
+    new ConcatOperationNode[Option[String],TOptionString](co.a1, co.a2, InternalFieldMapper.optionStringTEF.createOutMapper)
   
   implicit def concatenationConversionWithOption2[A1,A2,T1,T2](co: ConcatOp[A1,Option[A2],T1,T2]): TypedExpression[Option[String],TOptionString] = 
-    new ConcatOperationNode[Option[String],TOptionString](co.a1, co.a2, PrimitiveTypeMode.optionStringTEF.createOutMapper)
+    new ConcatOperationNode[Option[String],TOptionString](co.a1, co.a2, InternalFieldMapper.optionStringTEF.createOutMapper)
   
   implicit def concatenationConversionWithOption3[A1,A2,T1,T2](co: ConcatOp[Option[A1],Option[A2],T1,T2]): TypedExpression[Option[String],TOptionString] = 
-    new ConcatOperationNode[Option[String],TOptionString](co.a1, co.a2, PrimitiveTypeMode.optionStringTEF.createOutMapper)
+    new ConcatOperationNode[Option[String],TOptionString](co.a1, co.a2, InternalFieldMapper.optionStringTEF.createOutMapper)
   
   class ConcatOperationNode[A,T](e1: ExpressionNode, e2: ExpressionNode, val mapper: OutMapper[A]) extends BinaryOperatorNode(e1,e2, "||", false) with TypedExpression[A,T] {
     override def doWrite(sw: StatementWriter) =
@@ -315,7 +315,7 @@ trait QueryDsl
     )
     with TypedExpression[Long,TLong] {
     
-    def mapper = PrimitiveTypeMode.longTEF.createOutMapper    
+    def mapper = InternalFieldMapper.longTEF.createOutMapper    
     
     override def doWrite(sw: StatementWriter) = {
 
diff --git a/src/main/scala/org/squeryl/logging/BarChartRenderer.scala b/src/main/scala/org/squeryl/logging/BarChartRenderer.scala
@@ -2,7 +2,7 @@ package org.squeryl.logging
 
 import xml.Unparsed
 import java.io.{FileOutputStream, PrintStream}
-import org.squeryl.PrimitiveTypeMode._
+import org.squeryl.InternalFieldMapper._
 
 object BarChartRenderer {
 
diff --git a/src/main/scala/org/squeryl/logging/LocalH2SinkStatisticsListener.scala b/src/main/scala/org/squeryl/logging/LocalH2SinkStatisticsListener.scala
@@ -2,7 +2,7 @@ package org.squeryl.logging
 
 import org.squeryl.Session
 import org.squeryl.adapters.H2Adapter
-import org.squeryl.PrimitiveTypeMode._
+import org.squeryl.InternalFieldMapper._
 
 object LocalH2SinkStatisticsListener {
 
diff --git a/src/main/scala/org/squeryl/logging/StatsSchema.scala b/src/main/scala/org/squeryl/logging/StatsSchema.scala
@@ -18,7 +18,9 @@ package org.squeryl.logging
 import org.squeryl.KeyedEntity
 import org.squeryl.Schema
 import org.squeryl.dsl.CompositeKey2
-import org.squeryl.PrimitiveTypeMode._
+
+object StatsSchemaTypeMode extends org.squeryl.PrimitiveTypeMode
+import StatsSchemaTypeMode._
 
 /**
  * id is a UUID generatted by java.util.UUID
@@ -76,7 +78,7 @@ class StatLine(val statement: Statement, val avgExecTime: Double, val invocation
 object Measure extends Enumeration {
    type Measure = Value
    val AvgExecTime, InvocationCount, CumulativeExecutionTime, AvgResultSetSize = Value
-}
+} 
 
 object StatsSchema extends Schema {
 
diff --git a/src/main/scala/org/squeryl/logging/UsageProfileConsolidator.scala b/src/main/scala/org/squeryl/logging/UsageProfileConsolidator.scala
@@ -17,7 +17,7 @@ package org.squeryl.logging
 
 import org.squeryl.Session
 import org.squeryl.adapters.H2Adapter
-import org.squeryl.PrimitiveTypeMode._
+import org.squeryl.logging.StatsSchemaTypeMode._
 
 
 object UsageProfileConsolidator {
diff --git a/src/test/scala/org/squeryl/dbagnostic/AnnotationTests.scala b/src/test/scala/org/squeryl/dbagnostic/AnnotationTests.scala
@@ -22,7 +22,8 @@ import org.squeryl.Schema
 import java.util.Date
 import org.scalatest.FunSuite
 import org.scalatest.matchers.ShouldMatchers
-import org.squeryl.PrimitiveTypeMode
+import org.squeryl.test.PrimitiveTypeModeForTests
+
 
 @Row("T_TOASTER")
 class Toaster(
@@ -80,9 +81,9 @@ class AnnotationTests extends FunSuite with ShouldMatchers{
     //rudimentaryTests
   }
 
-  class ToastersInc extends Schema()(PrimitiveTypeMode) {
+  class ToastersInc extends Schema()(PrimitiveTypeModeForTests) {
 
-    import org.squeryl.PrimitiveTypeMode._
+    import PrimitiveTypeModeForTests._
     
     val descendantOfKeyedObjects = table[DescendantOfKeyedObject]
 
diff --git a/src/test/scala/org/squeryl/framework/QueryTester.scala b/src/test/scala/org/squeryl/framework/QueryTester.scala
@@ -1,7 +1,7 @@
 package org.squeryl.framework
 
 import org.squeryl.{Session, Query}
-import org.squeryl.PrimitiveTypeMode._
+import org.squeryl.test.PrimitiveTypeModeForTests._
 import org.scalatest.matchers.ShouldMatchers
 
 trait QueryTester { self : ShouldMatchers =>
diff --git a/src/test/scala/org/squeryl/framework/RunTestsInsideTransaction.scala b/src/test/scala/org/squeryl/framework/RunTestsInsideTransaction.scala
@@ -1,7 +1,7 @@
 package org.squeryl.framework
 
 import org.scalatest.{ Reporter, Stopper, Tracker }
-import org.squeryl.PrimitiveTypeMode.transaction
+import org.squeryl.test.PrimitiveTypeModeForTests._
 import org.squeryl.Session
 
 trait RunTestsInsideTransaction extends DbTestBase {
diff --git a/src/test/scala/org/squeryl/framework/SchemaTester.scala b/src/test/scala/org/squeryl/framework/SchemaTester.scala
@@ -3,7 +3,7 @@ package org.squeryl.framework
 import org.scalatest.matchers.ShouldMatchers
 import org.squeryl.{SessionFactory, Session, Schema}
 
-import org.squeryl.PrimitiveTypeMode._
+import org.squeryl.test.PrimitiveTypeModeForTests._
 import org.scalatest._
 import org.scalatest.events.{TestIgnored, Ordinal}
 
diff --git a/src/test/scala/org/squeryl/test/HelpersTest.scala b/src/test/scala/org/squeryl/test/HelpersTest.scala
@@ -3,7 +3,7 @@ package org.squeryl.test
 import org.scalatest.FunSuite
 import org.scalatest.matchers.ShouldMatchers
 import org.squeryl.Schema
-import org.squeryl.PrimitiveTypeMode._
+import org.squeryl.test.PrimitiveTypeModeForTests._
 
 class NamingConventionTransformsTest extends FunSuite with ShouldMatchers {
 
diff --git a/src/test/scala/org/squeryl/test/LeftJoinTest.scala b/src/test/scala/org/squeryl/test/LeftJoinTest.scala
@@ -4,7 +4,7 @@ import org.squeryl.framework._
 
 abstract class LeftJoinTest extends SchemaTester with RunTestsInsideTransaction{
 
- import org.squeryl.PrimitiveTypeMode._
+ import org.squeryl.test.PrimitiveTypeModeForTests._
 
   val schema = LeftJoinSchema
 
@@ -87,7 +87,7 @@ abstract class LeftJoinTest extends SchemaTester with RunTestsInsideTransaction{
 
 
 import org.squeryl.Schema
-import org.squeryl.PrimitiveTypeMode._
+import org.squeryl.test.PrimitiveTypeModeForTests._
 
 object LeftJoinSchema extends Schema {
 
diff --git a/src/test/scala/org/squeryl/test/NestedLeftOuterJoinTest.scala b/src/test/scala/org/squeryl/test/NestedLeftOuterJoinTest.scala
@@ -1,7 +1,7 @@
 package org.squeryl.test
 
 import org.squeryl._
-import org.squeryl.PrimitiveTypeMode._
+import org.squeryl.test.PrimitiveTypeModeForTests._
 import org.squeryl.framework._
 
 object TestSchema extends Schema {
diff --git a/src/test/scala/org/squeryl/test/PrimitiveTypeModeForTests.scala b/src/test/scala/org/squeryl/test/PrimitiveTypeModeForTests.scala
@@ -0,0 +1,3 @@
+package org.squeryl.test
+
+object PrimitiveTypeModeForTests extends org.squeryl.PrimitiveTypeMode
diff --git a/src/test/scala/org/squeryl/test/SubQueryTests.scala b/src/test/scala/org/squeryl/test/SubQueryTests.scala
@@ -5,7 +5,7 @@ import java.util.UUID
 import org.squeryl._
 import dsl.ast.QueryExpressionNode
 import framework.{RunTestsInsideTransaction, SchemaTester}
-import org.squeryl.PrimitiveTypeMode._
+import org.squeryl.test.PrimitiveTypeModeForTests._
 
 object SubQueryTestSchema{
   class Entity(
diff --git a/src/test/scala/org/squeryl/test/TransactionTests.scala b/src/test/scala/org/squeryl/test/TransactionTests.scala
@@ -3,7 +3,7 @@ package org.squeryl.test
 import org.squeryl._
 import org.squeryl.framework._
 
-import org.squeryl.PrimitiveTypeMode._
+import org.squeryl.test.PrimitiveTypeModeForTests._
 
 class Foo(val value: String) extends KeyedEntity[Long] {
   val id: Long = 0
diff --git a/src/test/scala/org/squeryl/test/UuidTests.scala b/src/test/scala/org/squeryl/test/UuidTests.scala
@@ -4,7 +4,7 @@ import org.squeryl._
 import org.squeryl.framework.{SchemaTester, RunTestsInsideTransaction}
 import java.util.UUID
 
-import PrimitiveTypeMode._
+import org.squeryl.test.PrimitiveTypeModeForTests._
 
 object UuidTests {
   class UuidAsProperty extends KeyedEntity[Long] {
diff --git a/src/test/scala/org/squeryl/test/arrays/PrimitiveArrayTest.scala b/src/test/scala/org/squeryl/test/arrays/PrimitiveArrayTest.scala
@@ -1,10 +1,10 @@
 package org.squeryl.test.arrays
 
 import _root_.org.squeryl.framework._
+import org.squeryl.test.PrimitiveTypeModeForTests._
 
 abstract class PrimitiveArrayTest extends SchemaTester with RunTestsInsideTransaction {
 
-  import _root_.org.squeryl.PrimitiveTypeMode._
 
   val schema = PrimitiveArraySchema
 
@@ -71,7 +71,6 @@ abstract class PrimitiveArrayTest extends SchemaTester with RunTestsInsideTransa
 }
 
 import _root_.org.squeryl.Schema
-import _root_.org.squeryl.PrimitiveTypeMode._
 
 object PrimitiveArraySchema extends Schema {
 
diff --git a/src/test/scala/org/squeryl/test/demo/MusicDb.scala b/src/test/scala/org/squeryl/test/demo/MusicDb.scala
@@ -15,7 +15,7 @@ package org.squeryl.test.demo
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************** */
-import org.squeryl.PrimitiveTypeMode._
+import org.squeryl.test.PrimitiveTypeModeForTests._
 import org.squeryl.{Query, Session, KeyedEntity, Schema}
 import org.squeryl.dsl.GroupWithMeasures
 import org.squeryl.framework.{RunTestsInsideTransaction, SchemaTester}
diff --git a/src/test/scala/org/squeryl/test/musicdb/MusicDb.scala b/src/test/scala/org/squeryl/test/musicdb/MusicDb.scala
@@ -24,7 +24,7 @@ import dsl._
 import dsl.ast.{RightHandSideOfIn, BinaryOperatorNodeLogicalBoolean}
 import framework._
 import java.util.{Date, Calendar}
-import org.squeryl.PrimitiveTypeMode._
+import org.squeryl.test.PrimitiveTypeModeForTests._
 
 object Genre extends Enumeration {
   type Genre = Value
@@ -62,7 +62,7 @@ class Song(val title: String, val authorId: Int, val interpretId: Int, val cdId:
 class Cd(var title: String, var mainArtist: Int, var year: Int) extends MusicDbObject {
   override def toString = id+ ":" + title
 }
-import org.squeryl.PrimitiveTypeMode._
+import org.squeryl.test.PrimitiveTypeModeForTests._
 
 class MusicDb extends Schema {
 
@@ -99,7 +99,7 @@ class TestData(schema : MusicDb){
 
 abstract class MusicDbTestRun extends SchemaTester with QueryTester with RunTestsInsideTransaction {
 
-  import org.squeryl.PrimitiveTypeMode._
+  import org.squeryl.test.PrimitiveTypeModeForTests._
 
   val schema = new MusicDb
 
diff --git a/src/test/scala/org/squeryl/test/mutablerelations/SchoolDbMutableRelations.scala b/src/test/scala/org/squeryl/test/mutablerelations/SchoolDbMutableRelations.scala
@@ -1,6 +1,6 @@
 package org.squeryl.test.mutablerelations
 
-import org.squeryl.PrimitiveTypeMode._
+import org.squeryl.test.PrimitiveTypeModeForTests._
 import org.squeryl._
 import org.squeryl.dsl.CompositeKey2
 
diff --git a/src/test/scala/org/squeryl/test/schooldb/SchoolDb.scala b/src/test/scala/org/squeryl/test/schooldb/SchoolDb.scala
@@ -28,10 +28,40 @@ import internals.{FieldMetaData, FieldReferenceLinker}
 import org.scalatest.Suite
 import collection.mutable.ArrayBuffer
 import org.squeryl.internals.StatementWriter
-import org.squeryl.PrimitiveTypeMode._
 import org.squeryl.dsl.ast.ExpressionNode
 
 
+object AppSpecificTypeMode extends org.squeryl.PrimitiveTypeMode {
+  implicit object personKED extends KeyedEntityDef[Student,Int] {
+    def getId(a:Student) = a.id
+    def isPersisted(a:Student) = a.id > 0
+    def idPropertyName = "id"
+  }
+  
+  implicit object schoolDbObjectKED extends KeyedEntityDef[SchoolDbObject,Int] {
+    def getId(a:SchoolDbObject) = a.id
+    def isPersisted(a:SchoolDbObject) = a.id > 0
+    def idPropertyName = "id"
+  }
+  
+  
+  implicit object courseKED extends KeyedEntityDef[Course,Int] {
+    def getId(a:Course) = a.id
+    def isPersisted(a:Course) = a.id > 0
+    def idPropertyName = "id"
+    override def optimisticCounterPropertyName = Some("occVersionNumber")
+  }
+  
+  implicit object course2KED extends KeyedEntityDef[Course2,Int] {
+    def getId(a:Course2) = a.id
+    def isPersisted(a:Course2) = a.id > 0
+    def idPropertyName = "id"
+    override def optimisticCounterPropertyName = Some("occVersionNumber")
+  }  
+}
+
+import AppSpecificTypeMode._
+
 object SingleTestRun extends org.scalatest.Tag("SingleTestRun")
 
 class SchoolDbObject {
@@ -46,9 +76,7 @@ class Student(var name: String, var lastName: String, var age: Option[Int], var
   val id: Int = 0
 
   override def toString = "Student:" + id + ":" + name
-  
-  import org.squeryl.PrimitiveTypeMode._
-  
+
   def dummyKey = compositeKey(age, addressId)
 }
 
@@ -128,36 +156,10 @@ class StringKeyedEntity(val id: String, val tempo: Tempo.Tempo) extends KeyedEnt
 
 class SchoolDb extends Schema {
 
-  implicit object personKED extends KeyedEntityDef[Student,Int] {
-    def getId(a:Student) = a.id
-    def isPersisted(a:Student) = a.id > 0
-    def idPropertyName = "id"
-  }
-  
-  implicit object schoolDbObjectKED extends KeyedEntityDef[SchoolDbObject,Int] {
-    def getId(a:SchoolDbObject) = a.id
-    def isPersisted(a:SchoolDbObject) = a.id > 0
-    def idPropertyName = "id"
-  }
-  
-  
-  implicit object courseKED extends KeyedEntityDef[Course,Int] {
-    def getId(a:Course) = a.id
-    def isPersisted(a:Course) = a.id > 0
-    def idPropertyName = "id"
-    override def optimisticCounterPropertyName = Some("occVersionNumber")
-  }
-  
-  implicit object course2KED extends KeyedEntityDef[Course2,Int] {
-    def getId(a:Course2) = a.id
-    def isPersisted(a:Course2) = a.id > 0
-    def idPropertyName = "id"
-    override def optimisticCounterPropertyName = Some("occVersionNumber")
-  }
+
   
   val courses2 = table[Course2]
 
-  import org.squeryl.PrimitiveTypeMode._
 
 //  override val name = {
 //    if(Session.currentSession.databaseAdapter.isInstanceOf[OracleAdapter])
@@ -321,7 +323,6 @@ class TestInstance(schema : SchoolDb){
 
 abstract class FullOuterJoinTests extends SchoolDbTestBase{
 
-  import org.squeryl.PrimitiveTypeMode._
   import schema._
 
 
@@ -367,7 +368,7 @@ abstract class SchoolDbTestBase extends SchemaTester with QueryTester with RunTe
 
 }
 abstract class SchoolDbTestRun extends SchoolDbTestBase {
-  import org.squeryl.PrimitiveTypeMode._
+
   import schema._
 
   
@@ -1745,8 +1746,6 @@ object Issue14Schema extends Schema{
 
 abstract class Issue14 extends DbTestBase with QueryTester {
 
-  import org.squeryl.PrimitiveTypeMode._
-
 
 
   test("Issue14"){
diff --git a/src/test/scala/org/squeryl/test/schooldb2/SchoolDb2.scala b/src/test/scala/org/squeryl/test/schooldb2/SchoolDb2.scala
