Permalink
Browse files

Some internal documentation on things

  • Loading branch information...
1 parent 27cd94e commit 565f922fd2a88db0c8839dd0779183088c404661 timdorr committed Jun 23, 2010
Showing with 11 additions and 11 deletions.
  1. +4 −2 app/Config.sample.php
  2. +5 −0 app/build.properties
  3. +1 −8 app/runtime-conf.xml
  4. +1 −1 lib/Bee/Db/Propel.php
View
@@ -1,12 +1,14 @@
<?php
-$CONFIG['db_type'] = 'MySQL';
+$CONFIG['db_type'] = 'Propel';
+
+// Needed only for the MySQL db_type and Db session_type
$CONFIG['db_host'] = 'localhost';
$CONFIG['db_user'] = 'user';
$CONFIG['db_pass'] = 'password';
$CONFIG['db_name'] = 'colony';
-$CONFIG['session_type'] = "Db";
+$CONFIG['session_type'] = "Propel";
$CONFIG['session_timeout'] = 3600;
$CONFIG['session_domain'] = '';
$CONFIG['session_path'] = '/';
View
@@ -1,8 +1,13 @@
+# !!DO NOT CHANGE!!
propel.project = colony
propel.database = mysql
propel.output.dir = ${propel.project.dir}/model
+propel.php.dir = ${propel.project.dir}/model
+# !!DO NOT CHANGE!!
+
+# Update the configuration below for your database environment to automatically insert SQL
propel.database.url = mysql:host=localhost;dbname=colony
propel.database.user = root
propel.database.password = pants
View
@@ -1,18 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<config>
- <!-- Uncomment this if you have PEAR Log installed
- <log>
- <type>file</type>
- <name>/path/to/propel.log</name>
- <ident>propel-bookstore</ident>
- <level>7</level>
- </log>
- -->
<propel>
<datasources default="colony">
<datasource id="colony">
<adapter>mysql</adapter>
<connection>
+ <!-- Please update the login information below for your environment -->
<dsn>mysql:host=localhost;dbname=colony</dsn>
<user>root</user>
<password>pants</password>
View
@@ -62,7 +62,7 @@ public function __construct( $config = array() )
Propel::init( 'app/model/conf/colony-conf.php' );
// Make sure we can see the models
- set_include_path( 'app/model/classes' . PATH_SEPARATOR . get_include_path() );
+ set_include_path( 'app/model' . PATH_SEPARATOR . get_include_path() );
}
}

0 comments on commit 565f922

Please sign in to comment.