Merge pull request #11 from manuelj555/nuevo_dir

nueva estructura de directorios y namespaces
KumbiaPHP · Mar 12, 2014 · 32f847f · 32f847f
2 parents 58a0558 + 2a2e89a
commit 32f847f
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 16 deletions.
diff --git a/ActiveRecord.php → lib/Kumbia/ActiveRecord/ActiveRecord.php b/ActiveRecord.php → lib/Kumbia/ActiveRecord/ActiveRecord.php
@@ -18,7 +18,7 @@
  * @license    http://wiki.kumbiaphp.com/Licencia     New BSD License
  */
 
-namespace ActiveRecord;
+namespace Kumbia\ActiveRecord;
 
 // @see LiteRecord
 require_once __DIR__ . '/LiteRecord.php';

diff --git a/Db.php → lib/Kumbia/ActiveRecord/Db.php b/Db.php → lib/Kumbia/ActiveRecord/Db.php
@@ -18,7 +18,7 @@
  * @license    http://wiki.kumbiaphp.com/Licencia     New BSD License
  */
 
-namespace ActiveRecord;
+namespace Kumbia\ActiveRecord;
 
 use PDO;
 

diff --git a/LiteRecord.php → lib/Kumbia/ActiveRecord/LiteRecord.php b/LiteRecord.php → lib/Kumbia/ActiveRecord/LiteRecord.php
@@ -18,7 +18,7 @@
  * @license    http://wiki.kumbiaphp.com/Licencia     New BSD License
  */
 
-namespace ActiveRecord;
+namespace Kumbia\ActiveRecord;
 
 // @see Db
 require_once __DIR__ . '/Db.php';

diff --git a/Metadata/Metadata.php → ...Kumbia/ActiveRecord/Metadata/Metadata.php b/Metadata/Metadata.php → ...Kumbia/ActiveRecord/Metadata/Metadata.php
@@ -20,7 +20,7 @@
  * @license    http://wiki.kumbiaphp.com/Licencia     New BSD License
  */
 
-namespace ActiveRecord\Metadata;
+namespace Kumbia\ActiveRecord\Metadata;
 
 /**
  * Metadata de tabla

diff --git a/Metadata/MysqlMetadata.php → ...a/ActiveRecord/Metadata/MysqlMetadata.php b/Metadata/MysqlMetadata.php → ...a/ActiveRecord/Metadata/MysqlMetadata.php
@@ -20,7 +20,10 @@
  * @license    http://wiki.kumbiaphp.com/Licencia     New BSD License
  */
 
-namespace ActiveRecord\Metadata;
+namespace Kumbia\ActiveRecord\Metadata;
+
+use Kumbia\ActiveRecord\Db;
+use PDO;
 
 /**
  * Adaptador de Metadata para Mysql
@@ -40,13 +43,13 @@ class MysqlMetadata extends Metadata
     protected function queryFields($database, $table, $schema = null)
     {
         if (!$schema) {
-            $describe = \ActiveRecord\Db::get($database)->query("DESCRIBE `$table`");
+            $describe = Db::get($database)->query("DESCRIBE `$table`");
         } else {
-            $describe = \ActiveRecord\Db::get($database)->query("DESCRIBE `$schema`.`$table`");
+            $describe = Db::get($database)->query("DESCRIBE `$schema`.`$table`");
         }
 
         $fields = array();
-        while(( $value = $describe->fetch(\PDO::FETCH_OBJ))) {
+        while(( $value = $describe->fetch(PDO::FETCH_OBJ))) {
             $fields[$value->Field] = array(
                 'Type' => $value->Type,
                 'Null' => $value->Null != 'NO',

diff --git a/Metadata/PgsqlMetadata.php → ...a/ActiveRecord/Metadata/PgsqlMetadata.php b/Metadata/PgsqlMetadata.php → ...a/ActiveRecord/Metadata/PgsqlMetadata.php
@@ -19,7 +19,9 @@
  * @license    http://wiki.kumbiaphp.com/Licencia     New BSD License
  */
 
-namespace ActiveRecord\Metadata;
+namespace Kumbia\ActiveRecord\Metadata;
+
+use Kumbia\ActiveRecord\Db;
 
 /**
  * Adaptador de Metadata para Pgsql
@@ -40,7 +42,7 @@ protected function queryFields($database, $table, $schema = null)
         if(!$schema) $schema = 'public';
 
         // Nota: Se excluyen claves compuestas
-        $describe = \ActiveRecord\Db::get($database)->query("
+        $describe = Db::get($database)->query("
             SELECT DISTINCT
                 c.column_name AS field,
                 c.udt_name AS type,

diff --git a/Paginator.php → lib/Kumbia/ActiveRecord/Paginator.php b/Paginator.php → lib/Kumbia/ActiveRecord/Paginator.php
@@ -18,7 +18,7 @@
  * @license    http://wiki.kumbiaphp.com/Licencia     New BSD License
  */
 
-namespace ActiveRecord;
+namespace Kumbia\ActiveRecord;
 
 /**
  * Implementación de paginador

diff --git a/Query/mysql_last_insert_id.php → ...tiveRecord/Query/mysql_last_insert_id.php b/Query/mysql_last_insert_id.php → ...tiveRecord/Query/mysql_last_insert_id.php
@@ -19,7 +19,7 @@
  * @license    http://wiki.kumbiaphp.com/Licencia     New BSD License
  */
 
-namespace ActiveRecord\Query;
+namespace Kumbia\ActiveRecord\Query;
 
 /**
  * Obtiene el último id generado en mysql

diff --git a/Query/mysql_limit.php → ...Kumbia/ActiveRecord/Query/mysql_limit.php b/Query/mysql_limit.php → ...Kumbia/ActiveRecord/Query/mysql_limit.php
@@ -19,7 +19,7 @@
  * @license    http://wiki.kumbiaphp.com/Licencia     New BSD License
  */
 
-namespace ActiveRecord\Query;
+namespace Kumbia\ActiveRecord\Query;
 
 /**
  * Adiciona limit y offset a la consulta sql en mysql

diff --git a/Query/pgsql_last_insert_id.php → ...tiveRecord/Query/pgsql_last_insert_id.php b/Query/pgsql_last_insert_id.php → ...tiveRecord/Query/pgsql_last_insert_id.php
@@ -19,7 +19,7 @@
  * @license    http://wiki.kumbiaphp.com/Licencia     New BSD License
  */
 
-namespace ActiveRecord\Query;
+namespace Kumbia\ActiveRecord\Query;
 
 /**
  * Obtiene el último id generado en pgsql

diff --git a/Query/pgsql_limit.php → ...Kumbia/ActiveRecord/Query/pgsql_limit.php b/Query/pgsql_limit.php → ...Kumbia/ActiveRecord/Query/pgsql_limit.php
@@ -19,7 +19,7 @@
  * @license    http://wiki.kumbiaphp.com/Licencia     New BSD License
  */
 
-namespace ActiveRecord\Query;
+namespace Kumbia\ActiveRecord\Query;
 
 /**
  * Adiciona limit y offset a la consulta sql en pgsql

diff --git a/Query/query_exec.php → lib/Kumbia/ActiveRecord/Query/query_exec.php b/Query/query_exec.php → lib/Kumbia/ActiveRecord/Query/query_exec.php
@@ -19,7 +19,7 @@
  * @license    http://wiki.kumbiaphp.com/Licencia     New BSD License
  */
 
-namespace ActiveRecord\Query;
+namespace Kumbia\ActiveRecord\Query;
 
 /**
  * Ejecuta una consulta