pull/217/head
Maxence Lange 2018-12-12 08:50:54 -01:00
rodzic 87252d92bb
commit c1e387c08f
4 zmienionych plików z 17 dodań i 25 usunięć

Wyświetl plik

@ -64,11 +64,6 @@ class CacheActorsRequest extends CacheActorsRequestBuilder {
* @param Person $actor * @param Person $actor
*/ */
public function save(Person $actor) { public function save(Person $actor) {
$source = $actor->getSource();
if (strlen($source) >= CoreRequestBuilder::SOURCE_LENGTH) {
$source = 'too_big';
}
$qb = $this->getCacheActorsInsertSql(); $qb = $this->getCacheActorsInsertSql();
$qb->setValue('id', $qb->createNamedParameter($actor->getId())) $qb->setValue('id', $qb->createNamedParameter($actor->getId()))
->setValue('account', $qb->createNamedParameter($actor->getAccount())) ->setValue('account', $qb->createNamedParameter($actor->getAccount()))
@ -87,7 +82,7 @@ class CacheActorsRequest extends CacheActorsRequestBuilder {
->setValue('name', $qb->createNamedParameter($actor->getName())) ->setValue('name', $qb->createNamedParameter($actor->getName()))
->setValue('summary', $qb->createNamedParameter($actor->getSummary())) ->setValue('summary', $qb->createNamedParameter($actor->getSummary()))
->setValue('public_key', $qb->createNamedParameter($actor->getPublicKey())) ->setValue('public_key', $qb->createNamedParameter($actor->getPublicKey()))
->setValue('source', $qb->createNamedParameter($source)) ->setValue('source', $qb->createNamedParameter($actor->getSource()))
->setValue('details', $qb->createNamedParameter(json_encode($actor->getDetails()))) ->setValue('details', $qb->createNamedParameter(json_encode($actor->getDetails())))
->setValue( ->setValue(
'creation', 'creation',

Wyświetl plik

@ -64,9 +64,6 @@ class CoreRequestBuilder {
const TABLE_CACHE_DOCUMENTS = 'social_cache_documents'; const TABLE_CACHE_DOCUMENTS = 'social_cache_documents';
const SOURCE_LENGTH = 10000;
/** @var IDBConnection */ /** @var IDBConnection */
protected $dbConnection; protected $dbConnection;

Wyświetl plik

@ -66,11 +66,6 @@ class NotesRequest extends NotesRequestBuilder {
$dTime = new DateTime(); $dTime = new DateTime();
$dTime->setTimestamp($note->getPublishedTime()); $dTime->setTimestamp($note->getPublishedTime());
$source = $note->getSource();
if (strlen($source) >= CoreRequestBuilder::SOURCE_LENGTH) {
$source = 'too_big';
}
$qb = $this->getNotesInsertSql(); $qb = $this->getNotesInsertSql();
$qb->setValue('id', $qb->createNamedParameter($note->getId())) $qb->setValue('id', $qb->createNamedParameter($note->getId()))
->setValue('type', $qb->createNamedParameter($note->getType())) ->setValue('type', $qb->createNamedParameter($note->getType()))
@ -98,7 +93,7 @@ class NotesRequest extends NotesRequestBuilder {
) )
->setValue('attributed_to', $qb->createNamedParameter($note->getAttributedTo())) ->setValue('attributed_to', $qb->createNamedParameter($note->getAttributedTo()))
->setValue('in_reply_to', $qb->createNamedParameter($note->getInReplyTo())) ->setValue('in_reply_to', $qb->createNamedParameter($note->getInReplyTo()))
->setValue('source', $qb->createNamedParameter($source)) ->setValue('source', $qb->createNamedParameter($note->getSource()))
->setValue( ->setValue(
'instances', $qb->createNamedParameter( 'instances', $qb->createNamedParameter(
json_encode($note->getInstancePaths(), JSON_UNESCAPED_SLASHES) json_encode($note->getInstancePaths(), JSON_UNESCAPED_SLASHES)

Wyświetl plik

@ -32,6 +32,9 @@ namespace OCA\Social\Migration;
use Closure; use Closure;
use Doctrine\DBAL\DBALException;
use Doctrine\DBAL\Schema\SchemaException;
use Doctrine\DBAL\Types\Type;
use OCA\Social\Db\CoreRequestBuilder; use OCA\Social\Db\CoreRequestBuilder;
use OCP\DB\ISchemaWrapper; use OCP\DB\ISchemaWrapper;
use OCP\Migration\IOutput; use OCP\Migration\IOutput;
@ -39,11 +42,11 @@ use OCP\Migration\SimpleMigrationStep;
/** /**
* Class Version0001Date20181208185242 * Class Version0001Date20181211222142
* *
* @package OCA\Social\Migration * @package OCA\Social\Migration
*/ */
class Version0001Date20181208185242 extends SimpleMigrationStep { class Version0001Date20181211222142 extends SimpleMigrationStep {
/** /**
@ -52,7 +55,8 @@ class Version0001Date20181208185242 extends SimpleMigrationStep {
* @param array $options * @param array $options
* *
* @return ISchemaWrapper * @return ISchemaWrapper
* @throws \Doctrine\DBAL\Schema\SchemaException * @throws SchemaException
* @throws DBALException
*/ */
public function changeSchema(IOutput $output, Closure $schemaClosure, array $options public function changeSchema(IOutput $output, Closure $schemaClosure, array $options
): ISchemaWrapper { ): ISchemaWrapper {
@ -62,27 +66,28 @@ class Version0001Date20181208185242 extends SimpleMigrationStep {
$table = $schema->getTable(CoreRequestBuilder::TABLE_CACHE_ACTORS); $table = $schema->getTable(CoreRequestBuilder::TABLE_CACHE_ACTORS);
$table->changeColumn( $table->changeColumn(
'source', [ 'source', [
'notnull' => true, 'notnull' => false,
'length' => CoreRequestBuilder::SOURCE_LENGTH, 'type' => Type::getType(Type::TEXT)
] ]
); );
$table = $schema->getTable(CoreRequestBuilder::TABLE_SERVER_NOTES); $table = $schema->getTable(CoreRequestBuilder::TABLE_SERVER_NOTES);
$table->changeColumn( $table->changeColumn(
'source', [ 'source', [
'notnull' => true, 'notnull' => false,
'length' => CoreRequestBuilder::SOURCE_LENGTH, 'type' => Type::getType(Type::TEXT)
] ]
); );
$table = $schema->getTable(CoreRequestBuilder::TABLE_REQUEST_QUEUE); $table = $schema->getTable(CoreRequestBuilder::TABLE_REQUEST_QUEUE);
$table->changeColumn( $table->changeColumn(
'activity', [ 'activity', [
'notnull' => true, 'notnull' => false,
'length' => CoreRequestBuilder::SOURCE_LENGTH, 'type' => Type::getType(Type::TEXT)
] ]
); );
return $schema; return $schema;
} }
} }