diff --git a/auth-schema-mysql.sql b/auth-schema-mysql.sql index ec4a4a8..74394ff 100644 --- a/auth-schema-mysql.sql +++ b/auth-schema-mysql.sql @@ -18,7 +18,7 @@ CREATE TABLE IF NOT EXISTS `roles_users` ( CREATE TABLE IF NOT EXISTS `users` ( `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, - `email` varchar(127) NOT NULL, + `email` varchar(254) NOT NULL, `username` varchar(32) NOT NULL DEFAULT '', `password` varchar(64) NOT NULL, `logins` int(10) UNSIGNED NOT NULL DEFAULT '0', diff --git a/auth-schema-postgresql.sql b/auth-schema-postgresql.sql index 72f6424..ce82ed1 100644 --- a/auth-schema-postgresql.sql +++ b/auth-schema-postgresql.sql @@ -16,7 +16,7 @@ CREATE TABLE roles_users CREATE TABLE users ( id serial, - email varchar(318) NOT NULL, + email varchar(254) NOT NULL, username varchar(32) NOT NULL, "password" varchar(64) NOT NULL, logins integer NOT NULL DEFAULT 0, diff --git a/classes/kohana/orm.php b/classes/kohana/orm.php index defc60e..048d351 100644 --- a/classes/kohana/orm.php +++ b/classes/kohana/orm.php @@ -1608,11 +1608,6 @@ public function primary_key() return $this->_primary_key; } - public function primary_val() - { - return $this->_primary_val(); - } - public function table_name() { return $this->_table_name;