init.php @@ -64,18 +64,48 @@ # add one or more has_many relations to the object, usually run inside the # setup method function has_many($what, $options) { + $table = Inflector::tableize($what); + $default_options = array( + "class_name" => Inflector::classify($table), + "primary_key" => "id", + "foreign_key" => Inflector::singularize($this->_base_class) . "_id", + "dependent" => "nullify", + "uniq" => false + "select" => "*", + "validate" => true + ); + $options = array_merge($default_options, $options); $this->_has_many = array_merge($this->_has_many, array($what => $options)); } # add one or more has_one relations to the object, usually run inside the # setup method function has_one($what, $options) { + $table = Inflector::tableize($what); + $default_options = array( + "class_name" => Inflector::classify($table), + "primary_key" => "id", + "foreign_key" => Inflector::singularize($this->_base_class) . "_id", + "dependent" => "nullify", + "select" => "*", + "validate" => true + ); + $options = array_merge($default_options, $options); $this->_has_one = array_merge($this->_has_one, array($what => $options)); } # add one or more belongs_to relations to the object, usually run inside the # setup method function belongs_to($what, $options) { + $table = Inflector::tableize($what); + $default_options = array( + "class_name" => Inflector::classify($table), + "foreign_key" => Inflector::singularize($table) . "_id", + "polymorphic" => false, + "select" => "*", + "validate" => false + ); + $options = array_merge($default_options, $options); $this->_belongs_to = array_merge($this->_belongs_to, array($what => $options)); } lib/AdoDBRecord.class.php @@ -18,6 +18,7 @@ require_once("BaseImplementer.class.php"); require_once("Tools.module.php"); + require_once("Inflector.class.php"); # class to polymorphically implement AdoDBRecord functionality # This makes use of PHP's behaviour to always pass the $this variable @@ -87,6 +88,7 @@ # as an instance or array of instances of $class function &find($arguments) { $conditions = array(); + # TODO preset from scoped options $where = $order = $limit = $offset = NULL; $options = array(); @@ -141,6 +143,7 @@ } # parse conditions + # TODO join with scoped conditions $parsed_conditions = array(); $parsed_params = array(); AdoDBRecord_Tools::parse_conditions($conditions, $parsed_conditions, $parsed_params); lib/AdoDBRecord/Base.class.php @@ -10,7 +10,8 @@ # # This file holds some tools for initialization and configuration - require_once("../lib/Singleton.class.php"); + require_once("Singleton.class.php"); + require_once("Inflector.class.php"); # Helper function to return a global database connection to AdoDB function &_adodb_conn() { @@ -96,22 +97,22 @@ # check if the named property is part of a has_many association function is_has_many_property($name) { - return array_key_exists($property, $this->_has_many); + return array_key_exists($name, $this->_has_many); } # check if the named property is part of a has_one association function is_has_one_property($name) { - return array_key_exists($property, $this->_has_one); + return array_key_exists($name, $this->_has_one); } # check if the named property is part of a has_many association function is_belongs_to_property($name) { - return array_key_exists($property, $this->_belongs_to); + return array_key_exists($name, $this->_belongs_to); } # check if the named property is part of any association function is_association_property($name) { - return is_belongs_to_property($name) || is_has_many_property($name) || is_has_one_property($name) + return is_belongs_to_property($name) || is_has_many_property($name) || is_has_one_property($name); } } -?> +?> \ No newline at end of file lib/AdoDBRecord/Tools.module.php @@ -60,6 +60,22 @@ return strtolower($string); } + # converts underscores to camel case + function camelize($string, $first_letter_in_uppercase = true) { + if ($first_letter_in_uppercase) + { + $string = preg_replace_callback('/\/(.?)/', create_function('$m', 'return "::" . strtoupper($m[1]);'), $string); + return preg_replace_callback('/(?:^|_)(.)/', create_function('$m', 'return strtoupper($m[1]);'), $string); + } + else + return strtolower($string[0]) . Inflector::camelize(substr($string, 1)); + } + + # converts table name to class name + function classify($string) { + return str_replace('::', '_', Inflector::camelize(Inflector::singularize(preg_replace('/^.*\./', '', $string)))); + } + # converts class name to table name function tableize($string) { return Inflector::pluralize(Inflector::underscore($string)); lib/Inflector.class.php 1bf2ebce4629e65141964575c39c517834320993 Kai Krakow kk@netactive.de http://github.com/kakra/adodbrecord/commit/4300b571dfc6f77d696ae63bc3665b9d8914ae46 4300b571dfc6f77d696ae63bc3665b9d8914ae46 2009-01-28T09:17:47-08:00 2009-01-28T09:17:47-08:00 Create inflectors needed for associations This creates inflector methods to derive the class name from a camel_cased name which is needed for creating the association options. Also added an init.php for easier loading of the library. It sets some defaults and changes the include path correctly. Using the new inflector methods the default options of associations are now set. Next step is doing the wrappers (marked relevant code parts with TODO). f1cda6dbefb665ef0afa57f405639bb0790cd496 Kai Krakow kk@netactive.de