Support for kohana 3.3 #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

nex2hex wants to merge 9 commits into creatoro:3.2/master from nex2hex:3.3/master

README.md

-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,8 @@ IMPORTANT @@
     Jelly requires the following Kohana versions per Git branch:
     * `3.1/develop` and `3.1/master` branches: Kohana 3.1.3+
-    * `3.2/develop` and `3.2/master` branches: Kohana 3.2+
+    * `3.2/develop` and `3.2/master` branches: Kohana 3.2
+    * `3.3/master` branch: Kohana 3.3+
     **Useful stuff**:
@@ Expand Down Expand Up / @@ -58,4 +59,4 @@ Remember: @@
     * **No circular references** — Fields are well-designed to prevent the
       infinite loop problem that sometimes plagues Sprig. It's even possible to
       have same-table child/parent references out of the box without intermediate
-      models.
+      models.

0 classes/jelly.php → classes/Jelly.php

File renamed without changes.

0 classes/jelly/behavior.php → classes/Jelly/Behavior.php

File renamed without changes.

0 classes/jelly/builder.php → classes/Jelly/Builder.php

File renamed without changes.

0 classes/jelly/collection.php → classes/Jelly/Collection.php

File renamed without changes.

classes/jelly/core.php → classes/Jelly/Core.php

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -194,11 +194,11 @@ public static function class_name($model)
  
    	{

    		if ($model instanceof Jelly_Model)

    		{

    			return strtolower(get_class($model));

    			return get_class($model);

    		}

    		else

    		{

    			return strtolower(Jelly::$_model_prefix.$model);

    			return Jelly::get_class_name(Jelly::$_model_prefix.$model);

    		}

    	}

    @@ -256,4 +256,13 @@ public static function behavior_prefix()
  
    		return Jelly::$_behavior_prefix;

    	}

    	public static function get_class_name ($class_name)

    	{

    		$class_name = explode ('_', $class_name);

    		foreach ($class_name as &$name) {

    			$name = UTF8::ucfirst ($name);

    		}

    		return implode ('_', $class_name);

    	}

    } // End Jelly_Core

0 classes/jelly/core/behavior.php → classes/Jelly/Core/Behavior.php

File renamed without changes.

classes/jelly/core/builder.php → classes/Jelly/Core/Builder.php

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -296,7 +296,7 @@ public function count($db = NULL)
  
    		// Find the count

    		$result = (int) $query

    		               ->select(array('COUNT("*")', 'total'))

    		               ->select(array(DB::expr('COUNT(*)'), 'total'))

    		               ->execute($db)

    		               ->get('total');

    @@ -337,7 +337,7 @@ public function execute($db = NULL, $type = NULL, $ignored = NULL)
  
    	 * @param  string|null  $type

    	 * @return string

    	 */

    	public function compile(Database $db, $type = NULL)

    	public function compile($db = NULL, $type = NULL)

    	{

    		$type === NULL AND $type = $this->_type;

    @@ -1011,6 +1011,28 @@ protected function _field_alias($field, $value = NULL, $join_if_sure = TRUE)
  
    		return $join ? ($alias.'.'.$column) : $column;

    	}

    	public function field_alias($field)

    	{

    		return $this->_field_alias($field);

    	}

    	/**

    	 * Return table name in query, table alias and table model

    	 *

    	 * @param $field

    	 * @return mixed

    	 */

    	public function with_alias($field)

    	{

    		$field = $this->_meta->field($field);

    		$table = $this->_meta->table();

    		$key = $field->foreign['model'].'.'.$table.':'.$field->name;

    		return $this->_model_cache[$key];

    	}

    	/**

    	 * Resolves meta-aliases.

    	 *

classes/jelly/core/collection.php → classes/Jelly/Core/Collection.php

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -91,15 +91,39 @@ public function meta()
  
    	}

    	/**

    	 * Return all of the rows in the result as an array.

    	 * Return all of the models in array.

    	 *

    	 * @param   string  $key   column for associative keys

    	 * @param   string  $value column for values

    	 * @return  array

    	 */

    	public function as_array($key = NULL, $value = NULL)

    	{

    		return $this->_result->as_array($key, $value);

    		if ($value === NULL)

    		{

    			$result = array();

    			if ($key === NULL)

    			{

    				foreach ($this as $obj)

    				{

    					$result[] = $obj;

    				}

    			}

    			else

    			{

    				foreach ($this as $obj)

    				{

    					$result[$obj->$key] = $obj;

    				}

    			}

    			return $result;

    		}

    		else

    		{

    			return $this->_result->as_array($key, $value);

    		}

    	}

    	/**

0 classes/jelly/core/event.php → classes/Jelly/Core/Event.php

File renamed without changes.

0 classes/jelly/core/event/data.php → classes/Jelly/Core/Event/Data.php

File renamed without changes.

0 classes/jelly/core/field.php → classes/Jelly/Core/Field.php

File renamed without changes.

0 classes/jelly/core/field/belongsto.php → classes/Jelly/Core/Field/BelongsTo.php

File renamed without changes.

0 classes/jelly/core/field/boolean.php → classes/Jelly/Core/Field/Boolean.php

File renamed without changes.

classes/Jelly/Core/Field/DateTime.php

-Original file line number
+Diff line change
@@ -0,0 +1,44 @@
+    <?php defined('SYSPATH') or die('No direct script access.');
+    class Jelly_Core_Field_DateTime extends Jelly_Field
+    {
+    	/**
+    	 * @var boolean convert empty values to null
+    	 */
+    	public $convert_empty = true;
+    	/**
+    	 * @var  boolean  default to converting empty values to NULL
+    	 */
+    	public $allow_null = true;
+    	/**
+    	 * @var  int  default is NULL
+    	 */
+    	public $default = null;
+    	public function __construct($options = array())
+    	{
+    		parent::__construct($options);
+    	}
+    	public function get($model, $value)
+    	{
+    		if ($value === null) {
+    			return null;
+    		}
+    		if ($value instanceof DateTime) {
+    			return $value;
+    		}
+    		return new DateTime($value);
+    	}
+    	public function save($model, $value, $loaded)
+    	{
+    		if ($value instanceof DateTime) {
+    			return $value->format('Y-m-d H:i:s');
+    		}
+    		return $value;
+    	}
+    }

0 classes/jelly/core/field/email.php → classes/Jelly/Core/Field/Email.php

File renamed without changes.

0 classes/jelly/core/field/enum.php → classes/Jelly/Core/Field/Enum.php

File renamed without changes.

0 classes/jelly/core/field/expression.php → classes/Jelly/Core/Field/Expression.php

File renamed without changes.

0 classes/jelly/core/field/file.php → classes/Jelly/Core/Field/File.php

File renamed without changes.

0 classes/jelly/core/field/float.php → classes/Jelly/Core/Field/Float.php

File renamed without changes.

classes/jelly/core/field/hasmany.php → classes/Jelly/Core/Field/HasMany.php

-Original file line number
+Diff line change
@@ Expand Up / @@ -67,7 +67,7 @@ public function initialize($model, $column) @@
     		// of this field, and the field defaults to this field's model's foreign key
     		if (empty($this->foreign))
     		{
-    			$this->foreign = inflector::singular($this->name).'.'.$model.':foreign_key';
+    			$this->foreign = Inflector::singular($this->name).'.'.$model.':foreign_key';
     		}
     		// We have a model? Default the field to this field's model's foreign key
     		elseif (FALSE === strpos($this->foreign, '.'))
@@ Expand Down @@

0 classes/jelly/core/field/hasone.php → classes/Jelly/Core/Field/HasOne.php

File renamed without changes.

0 classes/jelly/core/field/image.php → classes/Jelly/Core/Field/Image.php

File renamed without changes.

0 classes/jelly/core/field/integer.php → classes/Jelly/Core/Field/Integer.php

File renamed without changes.

0 classes/jelly/core/field/manytomany.php → classes/Jelly/Core/Field/ManyToMany.php

File renamed without changes.

0 classes/jelly/core/field/password.php → classes/Jelly/Core/Field/Password.php

File renamed without changes.

0 classes/jelly/core/field/polymorphic.php → classes/Jelly/Core/Field/Polymorphic.php

File renamed without changes.

0 classes/jelly/core/field/primary.php → classes/Jelly/Core/Field/Primary.php

File renamed without changes.

0 classes/jelly/core/field/serialized.php → classes/Jelly/Core/Field/Serialized.php

File renamed without changes.

0 classes/jelly/core/field/slug.php → classes/Jelly/Core/Field/Slug.php

File renamed without changes.

0 classes/jelly/core/field/string.php → classes/Jelly/Core/Field/String.php

File renamed without changes.

0 ...s/jelly/core/field/supports/addremove.php → ...s/Jelly/Core/Field/Supports/AddRemove.php

File renamed without changes.

0 classes/jelly/core/field/supports/has.php → classes/Jelly/Core/Field/Supports/Has.php

File renamed without changes.

0 classes/jelly/core/field/supports/join.php → classes/Jelly/Core/Field/Supports/Join.php

File renamed without changes.

0 classes/jelly/core/field/supports/save.php → classes/Jelly/Core/Field/Supports/Save.php

File renamed without changes.

0 classes/jelly/core/field/supports/with.php → classes/Jelly/Core/Field/Supports/With.php

File renamed without changes.

0 classes/jelly/core/field/text.php → classes/Jelly/Core/Field/Text.php

File renamed without changes.

0 classes/jelly/core/field/timestamp.php → classes/Jelly/Core/Field/Timestamp.php

File renamed without changes.

0 classes/jelly/core/meta.php → classes/Jelly/Core/Meta.php

File renamed without changes.

classes/jelly/core/model.php → classes/Jelly/Core/Model.php

-Original file line number
+Diff line change
@@ Expand Up / @@ -265,6 +265,36 @@ public function get($name) @@
     		}
     	}
+    	/**
+    	 * Gets the value from db for a field, no relationships supports,
+    	 * returned raw data only.
+    	 *
+    	 * @param   string       $name The field's name
+    	 * @return  string
+    	 */
+    	public function get_raw($name)
+    	{
+    		if ($field = $this->_meta->field($name))
+    		{
+    			// Alias the name to its actual name
+    			$name = $field->name;
+    			if (array_key_exists($name, $this->_changed))
+    			{
+    				return $this->_changed[$name];
+    			}
+    			else
+    			{
+    				return $this->original_raw($name);
+    			}
+    		}
+    		// Return unmapped data from custom queries
+    		elseif (isset($this->_unmapped[$name]))
+    		{
+    			return $this->_unmapped[$name];
+    		}
+    	}
     	/**
     	 * Returns the original value of a field, before it was changed.
     	 *
@@ Expand All / @@ -283,6 +313,22 @@ public function original($field) @@
     		}
     	}
+    	/**
+    	 * Returns the original value of a field, before it was changed,
+    	 * no relationships supports, returned raw data only.
+    	 *
+    	 * @param   string  $field The field's or alias name
+    	 * @return  string
+    	 */
+    	public function original_raw($field)
+    	{
+    		if ($field = $this->_meta->field($field))
+    		{
+    			// Alias the name to its actual name
+    			return $this->_original[$field->name];
+    		}
+    	}
     	/**
     	 * Returns an array of values in the fields.
     	 *
@@ Expand Down Expand Up / @@ -633,7 +679,7 @@ public function save($validation = NULL) @@
     				$value = $field->save($this, $value, $key);
     				// Only set the value to be saved if it's changed from the original
-    				if ($value !== $this->_original[$column])
+    				if ($field->set($value) !== $this->_original[$column])
     				{
     					$values[$field->name] = $value;
     				}
@@ Expand Down @@

0 classes/jelly/core/validation.php → classes/Jelly/Core/Validation.php

File renamed without changes.

0 classes/jelly/core/validation/exception.php → classes/Jelly/Core/Validation/Exception.php

File renamed without changes.

0 classes/jelly/event.php → classes/Jelly/Event.php

File renamed without changes.

0 classes/jelly/event/data.php → classes/Jelly/Event/Data.php

File renamed without changes.

0 classes/jelly/field.php → classes/Jelly/Field.php

File renamed without changes.

0 classes/jelly/field/belongsto.php → classes/Jelly/Field/BelongsTo.php

File renamed without changes.

0 classes/jelly/field/boolean.php → classes/Jelly/Field/Boolean.php

File renamed without changes.

classes/Jelly/Field/DateTime.php

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		<?php defined('SYSPATH') or die('No direct script access.');

		class Jelly_Field_DateTime extends Jelly_Core_Field_DateTime {}

0 classes/jelly/field/email.php → classes/Jelly/Field/Email.php

File renamed without changes.

0 classes/jelly/field/enum.php → classes/Jelly/Field/Enum.php

File renamed without changes.

0 classes/jelly/field/expression.php → classes/Jelly/Field/Expression.php

File renamed without changes.

0 classes/jelly/field/file.php → classes/Jelly/Field/File.php

File renamed without changes.

0 classes/jelly/field/float.php → classes/Jelly/Field/Float.php

File renamed without changes.

0 classes/jelly/field/hasmany.php → classes/Jelly/Field/HasMany.php

File renamed without changes.

0 classes/jelly/field/hasone.php → classes/Jelly/Field/HasOne.php

File renamed without changes.

0 classes/jelly/field/image.php → classes/Jelly/Field/Image.php

File renamed without changes.

0 classes/jelly/field/integer.php → classes/Jelly/Field/Integer.php

File renamed without changes.

0 classes/jelly/field/manytomany.php → classes/Jelly/Field/ManyToMany.php

File renamed without changes.

0 classes/jelly/field/password.php → classes/Jelly/Field/Password.php

File renamed without changes.

0 classes/jelly/field/polymorphic.php → classes/Jelly/Field/Polymorphic.php

File renamed without changes.

0 classes/jelly/field/primary.php → classes/Jelly/Field/Primary.php

File renamed without changes.

0 classes/jelly/field/serialized.php → classes/Jelly/Field/Serialized.php

File renamed without changes.

0 classes/jelly/field/slug.php → classes/Jelly/Field/Slug.php

File renamed without changes.

0 classes/jelly/field/string.php → classes/Jelly/Field/String.php

File renamed without changes.

0 classes/jelly/field/supports/addremove.php → classes/Jelly/Field/Supports/AddRemove.php

File renamed without changes.

0 classes/jelly/field/supports/has.php → classes/Jelly/Field/Supports/Has.php

File renamed without changes.

0 classes/jelly/field/supports/join.php → classes/Jelly/Field/Supports/Join.php

File renamed without changes.

0 classes/jelly/field/supports/save.php → classes/Jelly/Field/Supports/Save.php

File renamed without changes.

0 classes/jelly/field/supports/with.php → classes/Jelly/Field/Supports/With.php

File renamed without changes.

0 classes/jelly/field/text.php → classes/Jelly/Field/Text.php

File renamed without changes.

0 classes/jelly/field/timestamp.php → classes/Jelly/Field/Timestamp.php

File renamed without changes.

0 classes/jelly/meta.php → classes/Jelly/Meta.php

File renamed without changes.

0 classes/jelly/model.php → classes/Jelly/Model.php

File renamed without changes.

0 classes/jelly/validation.php → classes/Jelly/Validation.php

File renamed without changes.

0 classes/jelly/validation/exception.php → classes/Jelly/Validation/Exception.php

File renamed without changes.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support for kohana 3.3 #107

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Support for kohana 3.3 #107

Are you sure you want to change the base?

Uh oh!

Support for kohana 3.3 #107

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing