Author: david
Date: Wed Feb 23 13:45:35 2011
New Revision: 8995

Log:
Change keymap column names to source_table and target_table

Modified:
   trunk/config/schema.yml
   trunk/data/sql/lib.model.schema.sql
   trunk/lib/model/map/KeymapTableMap.php
   trunk/lib/model/om/BaseKeymap.php

Modified: trunk/config/schema.yml
==============================================================================
--- trunk/config/schema.yml     Wed Feb 23 00:02:58 2011        (r8994)
+++ trunk/config/schema.yml     Wed Feb 23 13:45:35 2011        (r8995)
@@ -151,8 +151,8 @@
   keymap:
     source_id: integer
     target_id: integer 
-    source_name: longvarchar
-    target_name: longvarchar
+    source_table: longvarchar
+    target_table: longvarchar
 
   map:
     created_at:

Modified: trunk/data/sql/lib.model.schema.sql
==============================================================================
--- trunk/data/sql/lib.model.schema.sql Wed Feb 23 00:02:58 2011        (r8994)
+++ trunk/data/sql/lib.model.schema.sql Wed Feb 23 13:45:35 2011        (r8995)
@@ -453,8 +453,8 @@
 (
        `source_id` INTEGER,
        `target_id` INTEGER,
-       `source_name` TEXT,
-       `target_name` TEXT,
+       `source_table` TEXT,
+       `target_table` TEXT,
        `id` INTEGER  NOT NULL AUTO_INCREMENT,
        `serial_number` INTEGER default 0 NOT NULL,
        PRIMARY KEY (`id`)

Modified: trunk/lib/model/map/KeymapTableMap.php
==============================================================================
--- trunk/lib/model/map/KeymapTableMap.php      Wed Feb 23 00:02:58 2011        
(r8994)
+++ trunk/lib/model/map/KeymapTableMap.php      Wed Feb 23 13:45:35 2011        
(r8995)
@@ -38,8 +38,8 @@
                // columns
                $this->addColumn('SOURCE_ID', 'sourceId', 'INTEGER', false, 
null, null);
                $this->addColumn('TARGET_ID', 'targetId', 'INTEGER', false, 
null, null);
-               $this->addColumn('SOURCE_NAME', 'sourceName', 'LONGVARCHAR', 
false, null, null);
-               $this->addColumn('TARGET_NAME', 'targetName', 'LONGVARCHAR', 
false, null, null);
+               $this->addColumn('SOURCE_TABLE', 'sourceTable', 'LONGVARCHAR', 
false, null, null);
+               $this->addColumn('TARGET_TABLE', 'targetTable', 'LONGVARCHAR', 
false, null, null);
                $this->addPrimaryKey('ID', 'id', 'INTEGER', true, null, null);
                $this->addColumn('SERIAL_NUMBER', 'serialNumber', 'INTEGER', 
true, null, 0);
                // validators

Modified: trunk/lib/model/om/BaseKeymap.php
==============================================================================
--- trunk/lib/model/om/BaseKeymap.php   Wed Feb 23 00:02:58 2011        (r8994)
+++ trunk/lib/model/om/BaseKeymap.php   Wed Feb 23 13:45:35 2011        (r8995)
@@ -9,8 +9,8 @@
 
     SOURCE_ID = 'keymap.SOURCE_ID',
     TARGET_ID = 'keymap.TARGET_ID',
-    SOURCE_NAME = 'keymap.SOURCE_NAME',
-    TARGET_NAME = 'keymap.TARGET_NAME',
+    SOURCE_TABLE = 'keymap.SOURCE_TABLE',
+    TARGET_TABLE = 'keymap.TARGET_TABLE',
     ID = 'keymap.ID',
     SERIAL_NUMBER = 'keymap.SERIAL_NUMBER';
 
@@ -18,8 +18,8 @@
   {
     $criteria->addSelectColumn(QubitKeymap::SOURCE_ID);
     $criteria->addSelectColumn(QubitKeymap::TARGET_ID);
-    $criteria->addSelectColumn(QubitKeymap::SOURCE_NAME);
-    $criteria->addSelectColumn(QubitKeymap::TARGET_NAME);
+    $criteria->addSelectColumn(QubitKeymap::SOURCE_TABLE);
+    $criteria->addSelectColumn(QubitKeymap::TARGET_TABLE);
     $criteria->addSelectColumn(QubitKeymap::ID);
     $criteria->addSelectColumn(QubitKeymap::SERIAL_NUMBER);
 

-- 
You received this message because you are subscribed to the Google Groups 
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/qubit-commits?hl=en.

Reply via email to