Changeset 12632

Timestamp:

Aug 13, 2009, 5:40:55 PM (13 years ago)

Author:

ebihara

Message:

#3943:changed some table definitions for member level oauth consumer and oauth tokens

Location:

OpenPNE3/trunk

Files:

• config/doctrine/schema.yml (modified) (4 diffs)
• data/migrations/3.1.2/016_add_oauth_column.php (modified) (1 diff)
• data/migrations/3.1.2/017_add_oauth_column_for_member.php (added)
• lib/filter/doctrine/OAuthMemberTokenFormFilter.class.php (added)
• lib/form/doctrine/OAuthMemberTokenForm.class.php (added)
• lib/migration/opMigrationDiff.class.php (modified) (1 diff)
• lib/model/doctrine/OAuthAbstractToken.class.php (added)
• lib/model/doctrine/OAuthAbstractTokenTable.class.php (added)
• lib/model/doctrine/OAuthMemberToken.class.php (added)
• lib/model/doctrine/OAuthMemberTokenTable.class.php (added)
• lib/task/openpneGenerateMigrationsTask.class.php (modified) (1 diff)

OpenPNE3/trunk/config/doctrine/schema.yml

@@ -357 +357 @@
     file_id: { type: integer(4), comment: "Image file id of this consumer" }
     using_apis: { type: array, comment: "API list that this consumer uses" }
-  relations:
+    member_id: { type: integer(4), notnull: false, comment: "Member id" }
+  relations:
+    Member: { local: member_id, foreign: id, onDelete: cascade }
     Image: { class: File, local: file_id, foreign: id, onDelete: set null }
   indexes:
@@ -369 +371 @@
     comment: "Saves informations of OAuth Consumer"
 
-OAuthAdminToken:
+OAuthAbstractToken:
+  abstract: true
   columns:
     id: { type: integer(4), primary: true, autoincrement: true, comment: "Serial number" }
@@ -379 +382 @@
     callback_url: { type: string, comment: "Callback url" }
     verifier: { type: string, comment: "Token verifier" }
-  relations:
-    Consumer: { class: OAuthConsumerInformation, local: oauth_consumer_id, foreign: id, onDelete: cascade }
   indexes:
     key_secret_UNIQUE:
       fields: [key_string, secret]
       type: unique
+
+OAuthAdminToken:
+  inheritance:
+    extends: OAuthAbstractToken
+    type: concrete
+  relations:
+    Consumer: { class: OAuthConsumerInformation, local: oauth_consumer_id, foreign: id, onDelete: cascade }
   options:
     type: INNODB
@@ -390 +398 @@
     charset: utf8
     comment: "Saves administration tokens of OAuth"
+
+OAuthMemberToken:
+  inheritance:
+    extends: OAuthAbstractToken
+    type: concrete
+  columns:
+    member_id: { type: integer(4), notnull: true, comment: "Member id" }
+  relations:
+    Consumer: { class: OAuthConsumerInformation, local: oauth_consumer_id, foreign: id, onDelete: cascade }
+    Member: { local: member_id, foreign: id, onDelete: cascade }
+  options:
+    type: INNODB
+    collate: utf8_unicode_ci
+    charset: utf8
+    comment: "Saves memebr tokens of OAuth"
 
 Banner:

OpenPNE3/trunk/data/migrations/3.1.2/016_add_oauth_column.php

@@ -1 @@
-
-
 <?php
 

OpenPNE3/trunk/lib/migration/opMigrationDiff.class.php

@@ -23 +23 @@
     foreach ($models as $key => $model)
     {
+      $classRef = new ReflectionClass($model);
+      if ($classRef->isAbstract())
+      {
+        continue;
+      }
+
       $table = Doctrine::getTable($model);
       if ($table->getTableName() !== $this->_migration->getTableName())
       {
         $info[$model] = $table->getExportableFormat();
-
         foreach ($table->getTemplates() as $name => $template)
         {

OpenPNE3/trunk/lib/task/openpneGenerateMigrationsTask.class.php

@@ -57 +57 @@
       }
 
+      $normalModelName = str_replace('Base', '', basename($model, '.class.php'));
+      $normalModelRefClass = new ReflectionClass($normalModelName);
+      if ($normalModelRefClass && $normalModelRefClass->isAbstract())
+      {
+        continue;
+      }
+
       $content = file_get_contents($model);
       $content = str_replace('abstract class Base', 'class ToPrfx', $content);