Kohana v3.3.2

modules/database/classes/Kohana/Database/MySQL.php

@@ -240,6 +240,7 @@ class Kohana_Database_MySQL extends Database {
 			'fixed'                     => array('type' => 'float', 'exact' => TRUE),
 			'fixed unsigned'            => array('type' => 'float', 'exact' => TRUE, 'min' => '0'),
 			'float unsigned'            => array('type' => 'float', 'min' => '0'),
+			'geometry'                  => array('type' => 'string', 'binary' => TRUE),
 			'int unsigned'              => array('type' => 'int', 'min' => '0', 'max' => '4294967295'),
 			'integer unsigned'          => array('type' => 'int', 'min' => '0', 'max' => '4294967295'),
 			'longblob'                  => array('type' => 'string', 'binary' => TRUE, 'character_maximum_length' => '4294967295'),

modules/database/composer.json

@@ -0,0 +1,37 @@
+{
+	"name":        "kohana/database",
+	"type":        "kohana-module",
+	"description": "The official Kohana module for database interactions, building queries, and prepared statements",
+	"homepage":    "http://kohanaframework.org",
+	"license":     "BSD-3-Clause",
+	"keywords":    ["kohana", "framework", "database"],
+	"authors": [
+		{
+			"name":     "Kohana Team",
+			"email":    "team@kohanaframework.org",
+			"homepage": "http://kohanaframework.org/team",
+			"role":     "developer"
+		}
+	],
+	"support": {
+		"issues":   "http://dev.kohanaframework.org",
+		"forum":    "http://forum.kohanaframework.org",
+		"irc":      "irc://irc.freenode.net/kohana",
+		"source":   "http://github.com/kohana/core"
+	},
+	"require": {
+		"composer/installers": "~1.0",
+		"kohana/core":         ">=3.3",
+		"php":                 ">=5.3.3"
+	},
+	"suggest": {
+		"ext-mysql":   "*",
+		"ext-pdo":     "*"
+	},
+	"extra": {
+		"branch-alias": {
+			"dev-3.3/develop": "3.3.x-dev",
+			"dev-3.4/develop": "3.4.x-dev"
+		}
+	}
+}

modules/database/guide/database/config.md

@@ -25,6 +25,21 @@ CONNECTION_ARRAY
 TABLE_PREFIX
 :  Prefix that will be added to all table names by the [query builder](#query_building).
 
+CHARACTER_SET
+:  The character set to use for the connection with the database.
+
+[!!] Setting Character Set won't work for PDO based connections because of incompatibility with PHP prior to 5.3.6. Use the DSN or options config instead. Example Below:
+
+    return array
+    (
+        'default' => array
+        (
+            'type'       => 'PDO',
+            'connection' => array(
+                 'options' => array(PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES utf8"),
+            ),
+        ),
+    );
 
 ## Example