Removing arbitrary restriction on column names

FreeAllMedia · Aug 18, 2015 · 7426072 · 7426072
1 parent d24563e
commit 7426072
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 18 deletions.
diff --git a/es6/lib/model/index.js b/es6/lib/model/index.js
@@ -299,10 +299,7 @@ export default class Model {
 	}
 
 	[symbols.properties]() {
-		const cleanedProperties = Object.keys(this).filter((key) => {
-			return key !== "database";
-		});
-		return cleanedProperties;
+		return Object.keys(this);
 	}
 
 	[symbols.validations]() {

diff --git a/es6/lib/model/save.js b/es6/lib/model/save.js
@@ -2,7 +2,6 @@ import flowsync from "flowsync";
 import MultiError from "blunder";
 import Datetime from "fleming";
 import symbols from "./symbols";
-import util from "util";
 
 //private methods
 function propagate(callback) {

diff --git a/es6/spec/model.spec.js b/es6/spec/model.spec.js
@@ -14,16 +14,12 @@ import databaseConfig from "./databaseConfig.json";
 let userFixtures = require("./fixtures/users.json");
 
 describe("Model(attributes, options)", () => {
-	/**
-	 * Instantiate Model Examples
-	 */
-
 	let model,
-		user,
-		userAttributes,
-		photo,
-		comment,
-		clock;
+			user,
+			userAttributes,
+			photo,
+			comment,
+			clock;
 
 	beforeEach(() => {
 		clock = sinon.useFakeTimers();
@@ -97,10 +93,6 @@ describe("Model(attributes, options)", () => {
 			it("should return the name of all attributes plus associations on the model", () => {
 				user.properties.should.eql(properties);
 			});
-			it("should not return 'database'", () => {
-				user.database = {};
-				user.properties.should.eql(properties);
-			});
 		});
 
 		describe(".tableName", () => {