From 4bf0288fbb7fa56ca32e838de5dbeca7eb1d339d Mon Sep 17 00:00:00 2001 From: Everett Sochowski Date: Fri, 27 Feb 2015 15:32:55 +0100 Subject: [PATCH] Replace clobs with varchars --- .../MappedBankBranchesProvider.scala | 25 ++++++++++--------- .../MappedCustomerInfoProvider.scala | 11 ++++---- .../MappedCustomerMessageProvider.scala | 10 ++++---- .../scala/code/metrics/MappedMetrics.scala | 3 ++- .../scala/code/model/MappedTransaction.scala | 4 +-- 5 files changed, 28 insertions(+), 25 deletions(-) diff --git a/src/main/scala/code/bankbranches/MappedBankBranchesProvider.scala b/src/main/scala/code/bankbranches/MappedBankBranchesProvider.scala index 7606497db..7af640424 100644 --- a/src/main/scala/code/bankbranches/MappedBankBranchesProvider.scala +++ b/src/main/scala/code/bankbranches/MappedBankBranchesProvider.scala @@ -2,6 +2,7 @@ package code.bankbranches import code.bankbranches.BankBranches.{DataLicense, BankBranchId, Address, BankBranch} import code.model.BankId +import code.util.DefaultStringField import net.liftweb.mapper._ object MappedBankBranchesProvider extends BankBranchesProvider { @@ -16,19 +17,19 @@ class MappedBankBranch extends BankBranch with LongKeyedMapper[MappedBankBranch] override def getSingleton = MappedBankBranch - object mBankId extends MappedText(this) - object mName extends MappedText(this) + object mBankId extends DefaultStringField(this) + object mName extends DefaultStringField(this) - object mBranchId extends MappedText(this) + object mBranchId extends DefaultStringField(this) - object mLine1 extends MappedText(this) - object mLine2 extends MappedText(this) - object mLine3 extends MappedText(this) - object mLine4 extends MappedText(this) - object mLine5 extends MappedText(this) + object mLine1 extends DefaultStringField(this) + object mLine2 extends DefaultStringField(this) + object mLine3 extends DefaultStringField(this) + object mLine4 extends DefaultStringField(this) + object mLine5 extends DefaultStringField(this) object mCountryCode extends MappedString(this, 2) - object mPostCode extends MappedText(this) + object mPostCode extends DefaultStringField(this) override def branchId: BankBranchId = BankBranchId(mBranchId.get) @@ -52,9 +53,9 @@ object MappedBankBranch extends MappedBankBranch with LongKeyedMetaMapper[Mapped class MappedDataLicense extends DataLicense with LongKeyedMapper[MappedDataLicense] with IdPK { override def getSingleton = MappedDataLicense - object mBankId extends MappedText(this) - object mName extends MappedText(this) - object mUrl extends MappedText(this) + object mBankId extends DefaultStringField(this) + object mName extends DefaultStringField(this) + object mUrl extends DefaultStringField(this) override def name: String = mName.get override def url: String = mUrl.get diff --git a/src/main/scala/code/customerinfo/MappedCustomerInfoProvider.scala b/src/main/scala/code/customerinfo/MappedCustomerInfoProvider.scala index 0fdbe686e..421207366 100644 --- a/src/main/scala/code/customerinfo/MappedCustomerInfoProvider.scala +++ b/src/main/scala/code/customerinfo/MappedCustomerInfoProvider.scala @@ -4,6 +4,7 @@ import java.util.Date import code.model.{BankId, User} import code.model.dataAccess.APIUser +import code.util.DefaultStringField import net.liftweb.common.Box import net.liftweb.mapper._ @@ -27,13 +28,13 @@ class MappedCustomerInfo extends CustomerInfo with LongKeyedMapper[MappedCustome def getSingleton = MappedCustomerInfo object mUser extends MappedLongForeignKey(this, APIUser) - object mBank extends MappedText(this) + object mBank extends DefaultStringField(this) - object mNumber extends MappedText(this) - object mMobileNumber extends MappedText(this) - object mLegalName extends MappedText(this) + object mNumber extends DefaultStringField(this) + object mMobileNumber extends DefaultStringField(this) + object mLegalName extends DefaultStringField(this) object mEmail extends MappedEmail(this, 200) - object mFaceImageUrl extends MappedText(this) + object mFaceImageUrl extends DefaultStringField(this) object mFaceImageTime extends MappedDateTime(this) override def number: String = mNumber.get diff --git a/src/main/scala/code/customerinfo/MappedCustomerMessageProvider.scala b/src/main/scala/code/customerinfo/MappedCustomerMessageProvider.scala index b5d90e59b..1fda89122 100644 --- a/src/main/scala/code/customerinfo/MappedCustomerMessageProvider.scala +++ b/src/main/scala/code/customerinfo/MappedCustomerMessageProvider.scala @@ -4,7 +4,7 @@ import java.util.Date import code.model.{BankId, User} import code.model.dataAccess.APIUser -import code.util.MappedUUID +import code.util.{DefaultStringField, MappedUUID} import net.liftweb.mapper._ object MappedCustomerMessageProvider extends CustomerMessageProvider { @@ -33,11 +33,11 @@ class MappedCustomerMessage extends CustomerMessage def getSingleton = MappedCustomerMessage object user extends MappedLongForeignKey(this, APIUser) - object bank extends MappedText(this) + object bank extends DefaultStringField(this) - object mFromPerson extends MappedText(this) - object mFromDepartment extends MappedText(this) - object mMessage extends MappedText(this) + object mFromPerson extends DefaultStringField(this) + object mFromDepartment extends DefaultStringField(this) + object mMessage extends DefaultStringField(this) object mMessageId extends MappedUUID(this) diff --git a/src/main/scala/code/metrics/MappedMetrics.scala b/src/main/scala/code/metrics/MappedMetrics.scala index 75eb89ada..e4ea85537 100644 --- a/src/main/scala/code/metrics/MappedMetrics.scala +++ b/src/main/scala/code/metrics/MappedMetrics.scala @@ -2,6 +2,7 @@ package code.metrics import java.util.Date +import code.util.DefaultStringField import net.liftweb.mapper._ object MappedMetrics extends APIMetrics { @@ -25,7 +26,7 @@ object MappedMetrics extends APIMetrics { class MappedMetric extends APIMetric with LongKeyedMapper[MappedMetric] with IdPK { override def getSingleton = MappedMetric - object url extends MappedText(this) + object url extends DefaultStringField(this) object date extends MappedDateTime(this) diff --git a/src/main/scala/code/model/MappedTransaction.scala b/src/main/scala/code/model/MappedTransaction.scala index e04350617..118616267 100644 --- a/src/main/scala/code/model/MappedTransaction.scala +++ b/src/main/scala/code/model/MappedTransaction.scala @@ -4,7 +4,7 @@ import java.util.UUID import code.bankconnectors.Connector import code.metadata.counterparties.Counterparties -import code.util.{Helper, MappedUUID} +import code.util.{DefaultStringField, Helper, MappedUUID} import net.liftweb.common.{Logger, Box} import net.liftweb.mapper._ @@ -32,7 +32,7 @@ class MappedTransaction extends LongKeyedMapper[MappedTransaction] with IdPK wit object tStartDate extends MappedDateTime(this) object tFinishDate extends MappedDateTime(this) - object description extends MappedText(this) + object description extends DefaultStringField(this) object counterpartyAccountNumber extends MappedString(this, 60) object counterpartyAccountHolder extends MappedString(this, 100)