From cf934aea11a9d0a8a5814d0a2b0f7097f490d234 Mon Sep 17 00:00:00 2001 From: icyleaf Date: Fri, 4 Jun 2010 14:53:11 +0800 Subject: [PATCH] Added dbmanager module and tracking submodules --- .gitignore | 3 +++ .gitmodules | 3 +++ application/bootstrap.php | 1 + kohana/modules/dbmanager | 1 + kohana/modules/orm | 2 +- kohana/system | 2 +- 6 files changed, 10 insertions(+), 2 deletions(-) create mode 160000 kohana/modules/dbmanager diff --git a/.gitignore b/.gitignore index 911761e..3bfcfb2 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,6 @@ nbproject # PHPStorm project config folders .idea + +# modules +kohana/modules/dbm diff --git a/.gitmodules b/.gitmodules index f4f8023..571b5ee 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ [submodule "kohana/modules/pagination"] path = kohana/modules/pagination url = http://github.com/kohana/pagination.git +[submodule "kohana/modules/dbmanager"] + path = kohana/modules/dbmanager + url = http://github.com/icyleaf/dbmanager.git diff --git a/application/bootstrap.php b/application/bootstrap.php index 40a4b06..9b092bd 100644 --- a/application/bootstrap.php +++ b/application/bootstrap.php @@ -83,6 +83,7 @@ 'orm' => MODPATH.'orm', // KO3 Object Relationship Mapping 'pagination' => MODPATH.'pagination', // Paging of results 'imailer' => MODPATH.'imailer', // PHPMailer + 'dbmanager' => MODPATH.'dbmanager', // Database manager )); /** diff --git a/kohana/modules/dbmanager b/kohana/modules/dbmanager new file mode 160000 index 0000000..77b0101 --- /dev/null +++ b/kohana/modules/dbmanager @@ -0,0 +1 @@ +Subproject commit 77b0101b73972028882458618637e616264479f6 diff --git a/kohana/modules/orm b/kohana/modules/orm index 99038e6..1920bee 160000 --- a/kohana/modules/orm +++ b/kohana/modules/orm @@ -1 +1 @@ -Subproject commit 99038e666d33d7bab05666b626e9b66ce06b3308 +Subproject commit 1920bee46d56e830e97bf04bb0574c525502558e diff --git a/kohana/system b/kohana/system index d637d57..b7aa13d 160000 --- a/kohana/system +++ b/kohana/system @@ -1 +1 @@ -Subproject commit d637d570e9435d9bbb461828a3efaff573a87528 +Subproject commit b7aa13dac330add85883692b2d063882169f1b0e