sproutcore 1.10.3.1 → 1.11.0.rc1

data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/theming.js

@@ -3,11 +3,6 @@ sc_require("views/view");
 SC.View.reopen(
   /** @scope SC.View.prototype */ {
 
-  init: function(original) {
-    original();
-    this._lastTheme = this.get('theme');
-  }.enhance(),
-
   // ..........................................................
   // THEME SUPPORT
   //
@@ -225,30 +220,6 @@ SC.View.reopen(
     }
   },
 
-  applyAttributesToContext: function(original, context) {
-    var theme = this.get('theme');
-    var themeClassNames = theme.classNames, idx, len = themeClassNames.length;
-
-    for (idx = 0; idx < len; idx++) {
-      context.addClass(themeClassNames[idx]);
-    }
-
-    original(context);
-
-    var renderDelegate = this.get('renderDelegate');
-    if (renderDelegate && renderDelegate.className) {
-      context.addClass(renderDelegate.className);
-    }
-
-    // @if(debug)
-    if (renderDelegate && renderDelegate.name) {
-      SC.Logger.error("Render delegates now use 'className' instead of 'name'.");
-      SC.Logger.error("Name '%@' will be ignored.", renderDelegate.name);
-    }
-    // @endif
-  }.enhance(),
-
-
   /**
     Invokes a method on the render delegate, if one is present and it implements
     that method.

data/lib/frameworks/sproutcore/frameworks/datastore/mixins/relationship_support.js

@@ -98,7 +98,7 @@ SC.RelationshipSupport = {
   _srs_inverseDidRelinquishRelationships: function (recordType, ids, attr, inverseId) {
     ids.forEach(function (id) {
       this._srs_inverseDidRelinquishRelationship(recordType, id, attr, inverseId);
-    },this);
+    }, this);
   },
 
   /** @private
@@ -115,9 +115,18 @@ SC.RelationshipSupport = {
 
     if (SC.instanceOf(proto[key], SC.SingleAttribute)) {
       delete dataHash[key];
-    } else if (SC.instanceOf(proto[key], SC.ManyAttribute)
-               && SC.typeOf(dataHash[key]) === SC.T_ARRAY) {
+    } else if (SC.instanceOf(proto[key], SC.ManyAttribute) &&
+        SC.typeOf(dataHash[key]) === SC.T_ARRAY) {
+
       dataHash[key].removeObject(relativeID);
+
+      // If there is a materialized record with a ManyArray we have to clear the
+      // internal cache of the ManyArray. Otherwise calling `objectAt` on the
+      // Many Array will retrieve the cached record.
+      var record = this.records[storeKey];
+      if (record) {
+        record.get(key)._records = null;
+      }
     }
 
     this.pushRetrieve(recordType, id, dataHash, undefined, true);
@@ -132,7 +141,7 @@ SC.RelationshipSupport = {
   _srs_inverseDidAddRelationships: function (recordType, ids, attr, inverseId) {
     ids.forEach(function (id) {
       this._srs_inverseDidAddRelationship(recordType, id, attr, inverseId);
-    },this);
+    }, this);
   },
 
 
@@ -246,7 +255,7 @@ SC.RelationshipSupport = {
         // update old relationships
         existingIDs = [currentHash[keyValue] || null].flatten().compact().uniq();
         this._srs_inverseDidRelinquishRelationships(inverseType, existingIDs, toAttr, id);
-    });
+      });
 
     return original(recordType, id, storeKey);
   }.enhance(),
@@ -275,22 +284,25 @@ SC.RelationshipSupport = {
           @param {String} keyValue - the property name in the datahash that defines this foreign key relationship
          */
         function (inverseType, currentHash, toAttr, keyValue) {
-          // update old relationships
-          existingIDs = [currentHash[keyValue] || null].flatten().compact().uniq();
 
-          // update new relationships
+          // Find the new relations.
           inverseIDs = [dataHash[keyValue] || null].flatten().compact().uniq();
 
-          this._srs_inverseDidRelinquishRelationships(inverseType, existingIDs.filter(
+          // Find the old relations.
+          existingIDs = [currentHash[keyValue] || null].flatten().compact().uniq();
+          existingIDs = existingIDs.filter(
             function (el) {
               return inverseIDs.indexOf(el) === -1;
-            }), toAttr, id);
+            });
 
+          // Update the relationships.
+          this._srs_inverseDidRelinquishRelationships(inverseType, existingIDs, toAttr, id);
           this._srs_inverseDidAddRelationships(inverseType, inverseIDs, toAttr, id);
         });
     }
 
     storeKey = storeKey || recordType.storeKeyFor(id);
+
     return original(recordType, id, dataHash, storeKey);
   }.enhance()
 };

data/lib/frameworks/sproutcore/frameworks/datastore/models/children_attribute.js

@@ -33,76 +33,82 @@ SC.ChildrenAttribute = SC.ChildAttribute.extend(
   //
 
   /**  @private - adapted for to many relationship */
-  toType: function(record, key, value) {
+  toType: function (record, key, value) {
     var attrKey   = this.get('key') || key,
         arrayKey  = SC.keyFor('__kidsArray__', SC.guidFor(this)),
         ret       = record[arrayKey],
-        recordType  = this.get('typeClass'), rel;
+        recordType  = this.get('typeClass'),
+        rel;
 
-    // lazily create a ManyArray one time.  after that always return the
+    // lazily create a ChildArray one time.  after that always return the
     // same object.
     if (!ret) {
       ret = SC.ChildArray.create({
-        record:         record,
-        propertyName:   attrKey,
+        record: record,
+        propertyName: attrKey,
         defaultRecordType: recordType
       });
 
-      record[arrayKey] = ret ; // save on record
+      record[arrayKey] = ret; // cache on record
+
+      // Make sure the child array gets notified of changes to the parent record.
       rel = record.get('relationships');
       if (!rel) record.set('relationships', rel = []);
-      rel.push(ret); // make sure we get notified of changes...
+      rel.push(ret);
     }
 
     return ret;
   },
 
   // Default fromType is just returning itself
-  fromType: function(record, key, value){
+  fromType: function (record, key, value) {
     var sk, store,
         arrayKey = SC.keyFor('__kidsArray__', SC.guidFor(this)),
         ret = record[arrayKey];
+
     if (record) {
       record.writeAttribute(key, value);
+
+      // If the SC.ChildArray already exists, indicate that its backing content has changed.
       if (ret) ret = ret.recordPropertyDidChange();
     }
 
     return ret;
-  },
+  }
 
-  /**
+  /** UNUSED. This seems to have no effect on SC.ChildArray usage. Kept here for quick reference.
     The core handler.  Called from the property.
     @param {SC.Record} record the record instance
     @param {String} key the key used to access this attribute on the record
     @param {Object} value the property value if called as a setter
     @returns {Object} property value
   */
-  call: function(record, key, value) {
-    var attrKey = this.get('key') || key, cRef,
-        cacheKey = SC.keyFor('__kid__', SC.guidFor(this));
-    if (value !== undefined) {
-      value = this.fromType(record, key, value) ; // convert to attribute.
-    } else {
-      value = record.readAttribute(attrKey);
-      if (SC.none(value) && (value = this.get('defaultValue'))) {
-        if (typeof value === SC.T_FUNCTION) {
-          value = this.defaultValue(record, key, this);
-          // write default value so it doesn't have to be executed again
-          if (record.attributes()) {
-            // Check for an array
-            if (value instanceof Array) {
-              // Instantiate the construct and replace all of the content.
-              value = this.toType(record, key, value).replace(0, value.length, value);
-            } else {
-              record.writeAttribute(attrKey, value, true);
-            }
-          }
-        }
-      } else value = this.toType(record, key, value);
-    }
-
-    return value ;
-  }
+  // call: function(record, key, value) {
+  //   var attrKey = this.get('key') || key, cRef,
+  //       cacheKey = SC.keyFor('__kid__', SC.guidFor(this));
+  //   if (value !== undefined) {
+  //     value = this.fromType(record, key, value) ; // convert to attribute.
+  //   } else {
+  //     value = record.readAttribute(attrKey);
+  //     if (SC.none(value) && (value = this.get('defaultValue'))) {
+  //       if (typeof value === SC.T_FUNCTION) {
+  //         value = this.defaultValue(record, key, this);
+  //         // write default value so it doesn't have to be executed again
+  //         if (record.attributes()) {
+  //           // Check for an array
+  //           if (value instanceof Array) {
+  //             // Instantiate the construct and replace all of the content.
+  //             value = this.toType(record, key, value).replace(0, value.length, value);
+  //           } else {
+  //             record.writeAttribute(attrKey, value, true);
+  //           }
+  //         }
+  //       }
+  //     } else value = this.toType(record, key, value);
+  //   }
+
+  //   return value ;
+  // }
 
 });
 

data/lib/frameworks/sproutcore/frameworks/datastore/models/many_attribute.js

@@ -14,8 +14,13 @@ sc_require('system/many_array');
   ManyAttribute is a subclass of `RecordAttribute` and handles to-many
   relationships.
 
-  When setting ( `.set()` ) the value of a `toMany` attribute, make sure
-  to pass in an array of `SC.Record` objects.
+  Relationships in the client are meant to mirror the relationships that
+  the real data has in the remote data store on the server. For example,
+  if a `Parent` record on the server has an array of `Child` ids, then it is
+  appropriate for the `MyApp.Parent` model in the SproutCore app to have a `toMany`
+  relationship to the `MyApp.Child` in the app. In this way, changes to the
+  relationship in the client will best match how the data should be committed
+  to the server.
 
   There are many ways you can configure a `ManyAttribute`:
 
@@ -27,6 +32,25 @@ sc_require('system/many_array');
         through: 'taggings' // set a relationship this goes through
       });
 
+  Note: When setting ( `.set()` ) the value of a `toMany` attribute, make sure
+  to pass in an array of `SC.Record` objects.
+
+  ## Using new Records in Relationships
+
+  Because relationships are based on `id`, new records created in the client
+  (that don't have an `id`) are typically not able to be assigned to a
+  relationship until after they have been committed to the server. However,
+  because it's unwieldy to manually update relationships after the real `id` is
+  known, `SC.ManyAttribute` through `SC.ManyArray`, allows new records to be added
+  that don't yet have an `id`.
+
+  As long as the `supportNewRecords` property is true, adding records without an
+  `id `to the relationship will assign unique temporary ids to the new records.
+
+  *Note:* You must update the relationship after the new records are successfully
+  committed and have real ids. This is done by calling `updateNewRecordId()`
+  on the many array. In the future this should be automatic.
+
   @extends SC.RecordAttribute
   @since SproutCore 1.0
 */
@@ -63,6 +87,31 @@ SC.ManyAttribute = SC.RecordAttribute.extend(
   */
   orderBy: null,
 
+  /**
+    Determines whether the new record support of `SC.ManyArray` should be
+    enabled or not.
+
+    Normally, all records in the relationship should already have been previously
+    committed to a remote data store and have an actual `id`. However, with
+    `supportNewRecords` set to true, adding records without an `id `to the
+    relationship will assign unique temporary ids to the new records.
+
+    *Note:* You must update the relationship after the new records are successfully
+    committed and have real ids. This is done by calling `updateNewRecordId()`
+    on the many array. In the future this should be automatic.
+
+    If you wish to turn this off, SC.ManyArray will throw an exception if you
+    add a record without an id to the relationship. If you use temporary `id`s
+    for new record, you will need to manually update the relationship, but
+    run the risk of committing inverse records with temporary `id`s in their
+    datahashes.
+
+    @type Boolean
+    @default true
+    @since SproutCore 1.11.0
+  */
+  supportNewRecords: true,
+
   // ..........................................................
   // LOW-LEVEL METHODS
   //
@@ -70,6 +119,7 @@ SC.ManyAttribute = SC.RecordAttribute.extend(
   /**  @private - adapted for to many relationship */
   toType: function(record, key, value) {
     var type      = this.get('typeClass'),
+        supportNewRecords = this.get('supportNewRecords'),
         attrKey   = this.get('key') || key,
         arrayKey  = SC.keyFor('__manyArray__', SC.guidFor(this)),
         ret       = record[arrayKey],
@@ -82,7 +132,8 @@ SC.ManyAttribute = SC.RecordAttribute.extend(
         recordType:    type,
         record:        record,
         propertyName:  attrKey,
-        manyAttribute: this
+        manyAttribute: this,
+        supportNewRecords: supportNewRecords
       });
 
       record[arrayKey] = ret ; // save on record

data/lib/frameworks/sproutcore/frameworks/datastore/models/record.js

@@ -33,6 +33,72 @@ sc_require('system/query');
   You can bulk update attributes from the server using the
   `updateAttributes()` method.
 
+  # Polymorphic Records
+
+  SC.Record also supports polymorphism, which allows subclasses of a record type to share a common
+  identity. Polymorphism is similar to inheritance (i.e. a polymorphic subclass inherits its parents
+  properties), but differs in that polymorphic subclasses can be considered to be "equal" to each
+  other and their superclass. This means that any memmber of the polymorphic class group should be
+  able to stand in for any other member.
+
+  These examples may help identify the difference. First, let's look at the classic inheritance
+  model,
+
+    // This is the "root" class. All subclasses of MyApp.Person will be unique from MyApp.Person.
+    MyApp.Person = SC.Record.extend({});
+
+    // As a subclass, MyApp.Female inherits from a MyApp.Person, but is not "equal" to it.
+    MyApp.Female = MyApp.Person.extend({
+      isFemale: true
+    });
+
+    // As a subclass, MyApp.Male inherits from a MyApp.Person, but is not "equal" to it.
+    MyApp.Male = MyApp.Person.extend({
+      isMale: true
+    });
+
+    // Load two unique records into the store.
+    MyApp.store.createRecord(MyApp.Female, { guid: '1' });
+    MyApp.store.createRecord(MyApp.Male, { guid: '2' });
+
+    // Now we can see that these records are isolated from each other.
+    var female = MyApp.store.find(MyApp.Person, '1'); // Returns an SC.Record.EMPTY record.
+    var male = MyApp.store.find(MyApp.Person, '2'); // Returns an SC.Record.EMPTY record.
+
+    // These records are MyApp.Person only.
+    SC.kindOf(female, MyApp.Female); // false
+    SC.kindOf(male, MyApp.Male); // false
+
+  Next, let's make MyApp.Person a polymorphic class,
+
+    // This is the "root" polymorphic class. All subclasses of MyApp.Person will be able to stand-in as a MyApp.Person.
+    MyApp.Person = SC.Record.extend({
+      isPolymorphic: true
+    });
+
+    // As a polymorphic subclass, MyApp.Female is "equal" to a MyApp.Person.
+    MyApp.Female = MyApp.Person.extend({
+      isFemale: true
+    });
+
+    // As a polymorphic subclass, MyApp.Male is "equal" to a MyApp.Person.
+    MyApp.Male = MyApp.Person.extend({
+      isMale: true
+    });
+
+    // Load two unique records into the store.
+    MyApp.store.createRecord(MyApp.Female, { guid: '1' });
+    MyApp.store.createRecord(MyApp.Male, { guid: '2' });
+
+    // Now we can see that these records are in fact "equal" to each other. Which means that if we
+    // search for "people", we will get "males" & "females".
+    var female = MyApp.store.find(MyApp.Person, '1'); // Returns record.
+    var male = MyApp.store.find(MyApp.Person, '2'); // Returns record.
+
+    // These records are MyApp.Person as well as their unique subclass.
+    SC.kindOf(female, MyApp.Female); // true
+    SC.kindOf(male, MyApp.Male); // true
+
   @extends SC.Object
   @see SC.RecordAttribute
   @since SproutCore 1.0
@@ -84,27 +150,10 @@ SC.Record = SC.Object.extend(
   */
   isRecord: YES,
 
-  /**
-    If you have nested records
-
-    @type Boolean
-    @default NO
-  */
-  isParentRecord: NO,
-
-  // ...............................
-  // PROPERTIES
+  // ----------------------------------------------------------------------------------------------
+  // Properties
   //
 
-  /**
-    This is the primary key used to distinguish records.  If the keys
-    match, the records are assumed to be identical.
-
-    @type String
-    @default 'guid'
-  */
-  primaryKey: 'guid',
-
   /**
     Returns the id for the record instance.  The id is used to uniquely
     identify this record instance from all others of the same type.  If you
@@ -124,6 +173,23 @@ SC.Record = SC.Object.extend(
     }
   }.property('storeKey').cacheable(),
 
+  /**
+    If you have nested records
+
+    @type Boolean
+    @default NO
+  */
+  isParentRecord: NO,
+
+  /**
+    This is the primary key used to distinguish records.  If the keys
+    match, the records are assumed to be identical.
+
+    @type String
+    @default 'guid'
+  */
+  primaryKey: 'guid',
+
   /**
     All records generally have a life cycle as they are created or loaded into
     memory, modified, committed and finally destroyed.  This life cycle is
@@ -197,7 +263,7 @@ SC.Record = SC.Object.extend(
   isEditable: function(key, value) {
     if (value !== undefined) this._screc_isEditable = value;
     if (this.get('status') & SC.Record.READY) return this._screc_isEditable;
-    else return NO ;
+    else return NO;
   }.property('status').cacheable(),
 
   /**
@@ -333,7 +399,7 @@ SC.Record = SC.Object.extend(
       rec.refresh(recordOnly, callback);
     }
 
-    return this ;
+    return this;
   },
 
   /**
@@ -367,7 +433,7 @@ SC.Record = SC.Object.extend(
       rec.destroy(recordOnly);
     }
 
-    return this ;
+    return this;
   },
 
   /**
@@ -397,7 +463,7 @@ SC.Record = SC.Object.extend(
     // status to them.
     this.propagateToAggregates();
 
-    return this ;
+    return this;
   },
 
   toJSON: function(){
@@ -424,7 +490,7 @@ SC.Record = SC.Object.extend(
   */
   beginEditing: function() {
     this._editLevel++;
-    return this ;
+    return this;
   },
 
   /**
@@ -442,7 +508,7 @@ SC.Record = SC.Object.extend(
       this._editLevel = 0;
       this.recordDidChange(key);
     }
-    return this ;
+    return this;
   },
 
   /**
@@ -455,7 +521,7 @@ SC.Record = SC.Object.extend(
   readAttribute: function(key) {
     var store = this.get('store'), storeKey = this.storeKey;
     var attrs = store.readDataHash(storeKey);
-    return attrs ? attrs[key] : undefined ;
+    return attrs ? attrs[key] : undefined;
   },
 
   /**
@@ -496,7 +562,7 @@ SC.Record = SC.Object.extend(
         store.dataHashDidChange(storeKey, null, undefined, key);
       }
     }
-    return this ;
+    return this;
   },
 
   /**
@@ -594,11 +660,13 @@ SC.Record = SC.Object.extend(
         this.notifyPropertyChange('status');
         this.endPropertyChanges();
 
-      } else this.allPropertiesDidChange();
+      } else {
+        this.allPropertiesDidChange();
+      }
 
       // also notify manyArrays
       var manyArrays = this.relationships,
-          loc        = manyArrays ? manyArrays.length : 0 ;
+          loc        = manyArrays ? manyArrays.length : 0;
       while(--loc>=0) manyArrays[loc].recordPropertyDidChange(keys);
     }
   },
@@ -625,17 +693,19 @@ SC.Record = SC.Object.extend(
 
   normalize: function(includeNull) {
     var primaryKey = this.primaryKey,
-        recordId   = this.get('id'),
         store      = this.get('store'),
         storeKey   = this.get('storeKey'),
         keysToKeep = {},
-        key, valueForKey, typeClass, recHash, attrValue, normChild,  isRecord,
+        key, valueForKey, typeClass, recHash, attrValue, isRecord,
         isChild, defaultVal, keyForDataHash, attr;
 
     var dataHash = store.readEditableDataHash(storeKey) || {};
-    dataHash[primaryKey] = recordId;
     recHash = store.readDataHash(storeKey);
 
+    // For now we're going to be agnostic about whether ids should live in the
+    // hash or not.
+    keysToKeep[primaryKey] = YES;
+
     for (key in this) {
       // make sure property is a record attribute.
       valueForKey = this[key];
@@ -656,7 +726,7 @@ SC.Record = SC.Object.extend(
             if(attrValue!==undefined && (attrValue!==null || includeNull)) {
               attr = this[key];
               // if record attribute, make sure we transform with the fromType
-              if(SC.instanceOf(attr, SC.RecordAttribute)) {
+              if(SC.kindOf(attr, SC.RecordAttribute)) {
                 attrValue = attr.fromType(this, key, attrValue);
               }
               dataHash[keyForDataHash] = attrValue;
@@ -768,7 +838,6 @@ SC.Record = SC.Object.extend(
   */
   commitRecord: function(params, recordOnly, callback) {
     var store = this.get('store'), rec, ro,
-        sk = this.get('storeKey'),
         prKey = store.parentStoreKeyExists();
 
     // If we only want to commit this record or it doesn't have a parent record
@@ -780,7 +849,7 @@ SC.Record = SC.Object.extend(
       rec = store.materializeRecord(prKey);
       rec.commitRecord(params, recordOnly, callback);
     }
-    return this ;
+    return this;
   },
 
   // ..........................................................
@@ -808,7 +877,7 @@ SC.Record = SC.Object.extend(
     @dependsOn isError
   */
   errorValue: function() {
-    return this.get('isError') ? SC.val(this.get('errorObject')) : null ;
+    return this.get('isError') ? SC.val(this.get('errorObject')) : null;
   }.property('isError').cacheable(),
 
   /**
@@ -823,7 +892,7 @@ SC.Record = SC.Object.extend(
     if (this.get('isError')) {
       var store = this.get('store');
       return store.readError(this.get('storeKey')) || SC.Record.GENERIC_ERROR;
-    } else return null ;
+    } else return null;
   }.property('isError').cacheable(),
 
   // ...............................
@@ -928,7 +997,7 @@ SC.Record = SC.Object.extend(
      @param {SC.Record} the record that was materialized
     */
   _materializeNestedRecordType: function(value, key){
-    var childNS, recordType, ret;
+    var childNS, recordType;
 
     // Get the record type, first checking the "type" property on the hash.
     if (SC.typeOf(value) === SC.T_HASH) {
@@ -961,7 +1030,7 @@ SC.Record = SC.Object.extend(
     @returns {SC.Record} the nested record created
    */
   createNestedRecord: function(recordType, hash, psk, path) {
-    var store = this.get('store'), id, sk, pk, cr = null;
+    var store = this.get('store'), id, sk, cr = null;
 
     hash = hash || {}; // init if needed
 
@@ -974,7 +1043,7 @@ SC.Record = SC.Object.extend(
     // that we don't keep making new storeKeys for the same child record each
     // time that it is reloaded.
     id = hash[recordType.prototype.primaryKey];
-    if (!id) this.generateIdForChild(cr);
+    if (!id) { id = this.generateIdForChild(cr); }
     if (!id) { id = psk + '.' + path; }
 
     // If there is an id, there may also be a storeKey.  If so, update the
@@ -1002,7 +1071,7 @@ SC.Record = SC.Object.extend(
    */
   generateIdForChild: function(childRecord){}
 
-}) ;
+});
 
 // Class Methods
 SC.Record.mixin( /** @scope SC.Record */ {
@@ -1315,6 +1384,23 @@ SC.Record.mixin( /** @scope SC.Record */ {
   */
   GENERIC_ERROR:       SC.$error("Generic Error"),
 
+  /**
+    If true, then searches for records of this type will return subclass instances. For example:
+
+        Person = SC.Record.extend();
+        Person.isPolymorphic = true;
+
+        Male = Person.extend();
+        Female = Person.extend();
+
+    Using SC.Store#find, or a toOne or toMany relationship on Person will then return records of
+    type Male and Female. Polymorphic record types must have unique GUIDs across all subclasses.
+
+    @type Boolean
+    @default NO
+  */
+  isPolymorphic: NO,
+
   /**
     @private
     The next child key to allocate.  A nextChildKey must always be greater than 0.
@@ -1361,7 +1447,7 @@ SC.Record.mixin( /** @scope SC.Record */ {
     @returns {SC.RecordAttribute} created instance
   */
   fetch: function(recordType, opts) {
-    return SC.FetchedAttribute.attr(recordType, opts) ;
+    return SC.FetchedAttribute.attr(recordType, opts);
   },
 
   /**
@@ -1391,6 +1477,12 @@ SC.Record.mixin( /** @scope SC.Record */ {
     this._throwUnlessRecordTypeDefined(recordType, 'toMany');
 
     if(isNested){
+      //@if(debug)
+      // Let's provide a little developer help for a common misunderstanding.
+      if (!SC.none(opts.inverse)) {
+        SC.error("Developer Error: Nested attributes (toMany and toOne with isNested: YES) may not have an inverse property. Nested attributes shouldn't exist as separate records with IDs and relationships; if they do, it's likely that they should be separate records.\n\nNote that if your API nests separate records for convenient requesting and transport, you should separate them in your data source rather than improperly modeling them with nested attributes.");
+      }
+      //@endif
       attr = SC.ChildrenAttribute.attr(recordType, opts);
     }
     else {
@@ -1420,6 +1512,12 @@ SC.Record.mixin( /** @scope SC.Record */ {
     this._throwUnlessRecordTypeDefined(recordType, 'toOne');
 
     if(isNested){
+      //@if(debug)
+      // Let's provide a little developer help for a common misunderstanding.
+      if (!SC.none(opts.inverse)) {
+        SC.error("Developer Error: Nested attributes (toMany and toOne with isNested: YES) may not have an inverse property. Nested attributes shouldn't exist as separate records with IDs and relationships; if they do, it's likely that they should be separate records.\n\nNote that if your API nests separate records for convenient requesting and transport, you should separate them in your data source rather than improperly modeling them with nested attributes.");
+      }
+      //@endif
       attr = SC.ChildAttribute.attr(recordType, opts);
     }
     else {
@@ -1436,16 +1534,28 @@ SC.Record.mixin( /** @scope SC.Record */ {
   },
 
   /**
-    Returns all storeKeys mapped by Id for this record type.  This method is
-    used mostly by the `SC.Store` and the Record to coordinate.  You will rarely
-    need to call this method yourself.
+    Returns all storeKeys mapped by Id for this record type.  This method is used mostly by the
+    `SC.Store` and the Record to coordinate.  You will rarely need to call this method yourself.
+
+    Note that for polymorpic record classes, all store keys are kept on the top-most polymorphic
+    superclass. This ensures that store key by id requests at any level return only the one unique
+    store key.
 
-    @returns {Hash}
+    @see SC.Record.storeKeysById
   */
   storeKeysById: function() {
-    var key = SC.keyFor('storeKey', SC.guidFor(this)),
-        ret = this[key];
-    if (!ret) ret = this[key] = {};
+    var superclass = this.superclass,
+      key = SC.keyFor('storeKey', SC.guidFor(this)),
+      ret = this[key];
+
+    if (!ret) {
+      if (this.isPolymorphic && superclass.isPolymorphic && superclass !== SC.Record) {
+        ret = this[key] = superclass.storeKeysById();
+      } else {
+        ret = this[key] = {};
+      }
+    }
+
     return ret;
   },
 
@@ -1462,16 +1572,16 @@ SC.Record.mixin( /** @scope SC.Record */ {
   */
   storeKeyFor: function(id) {
     var storeKeys = this.storeKeysById(),
-        ret       = storeKeys[id];
+        ret = storeKeys[id];
 
     if (!ret) {
       ret = SC.Store.generateStoreKey();
-      SC.Store.idsByStoreKey[ret] = id ;
-      SC.Store.recordTypesByStoreKey[ret] = this ;
-      storeKeys[id] = ret ;
+      SC.Store.idsByStoreKey[ret] = id;
+      SC.Store.recordTypesByStoreKey[ret] = this;
+      storeKeys[id] = ret;
     }
 
-    return ret ;
+    return ret;
   },
 
   /**
@@ -1484,9 +1594,9 @@ SC.Record.mixin( /** @scope SC.Record */ {
   */
   storeKeyExists: function(id) {
     var storeKeys = this.storeKeysById(),
-        ret       = storeKeys[id];
+        ret = storeKeys[id];
 
-    return ret ;
+    return ret;
   },
 
   /**
@@ -1500,10 +1610,19 @@ SC.Record.mixin( /** @scope SC.Record */ {
     return store.find(this, id);
   },
 
-  /** @private - enhance extend to notify SC.Query as well. */
+  /** @private - enhance extend to notify SC.Query and ensure polymorphic subclasses are marked as polymorphic as well. */
   extend: function() {
     var ret = SC.Object.extend.apply(this, arguments);
-    if(SC.Query) SC.Query._scq_didDefineRecordType(ret);
-    return ret ;
+
+    if (SC.Query) SC.Query._scq_didDefineRecordType(ret);
+
+    // All subclasses of a polymorphic class, must also be polymorphic.
+    if (ret.prototype.hasOwnProperty('isPolymorphic')) {
+      ret.isPolymorphic = ret.prototype.isPolymorphic;
+      delete ret.prototype.isPolymorphic;
+    }
+
+    return ret;
   }
+
 });