Merge from 3.2 branch.

Beginning of Prado 3.2 development

2 files changed, 55 insertions, 0 deletions

diff --git a/demos/northwind-db/index_php.php b/demos/northwind-db/index_php.php
new file mode 100644
index 00000000..d3fe038b
--- /dev/null
+++ b/demos/northwind-db/index_php.php
@@ -0,0 +1,26 @@
+<?php
+
+$basePath=dirname(__FILE__);
+$frameworkPath=$basePath.'/../../framework/prado.php';
+$assetsPath=$basePath.'/assets';
+$runtimePath=$basePath.'/protected/runtime';
+
+if(!is_file($frameworkPath))
+	die("Unable to find prado framework path $frameworkPath.");
+if(!is_writable($assetsPath))
+	die("Please make sure that the directory $assetsPath is writable by Web server process.");
+if(!is_writable($runtimePath))
+	die("Please make sure that the directory $runtimePath is writable by Web server process.");
+
+/** SQLite Northwind database file **/
+$sqlite_dir = $basePath.'/protected/data';
+$sqlite_db = $sqlite_dir.'/Northwind.db';
+if(!is_writable($sqlite_dir))
+	die("Please make sure that the directory $sqlite_dir is writable by Web server process.");
+if(!is_writable($sqlite_db))
+	die("Please make sure that the sqlite database file $sqlite_db is writable by Web server process.");
+
+require_once($frameworkPath);
+
+$application=new TApplication('protected',false,TApplication::CONFIG_TYPE_PHP);
+$application->run();
\ No newline at end of file
diff --git a/demos/northwind-db/protected/application.php b/demos/northwind-db/protected/application.php
new file mode 100644
index 00000000..2d6d4ec7
--- /dev/null
+++ b/demos/northwind-db/protected/application.php
@@ -0,0 +1,29 @@
+<?php
+return array(
+	'application' => array(
+		'id' => 'northwind-db',
+		'mode' => 'Debug'
+	),
+	'paths' => array(
+		'using'=>array(
+			'System.Data.*',
+			'System.Data.ActiveRecord.*',
+			'System.Data.ActiveRecord.Scaffold.*',
+			'Application.database.*',
+		),
+	),
+	'modules' => array(
+		'db' => array(
+			'class' => 'TActiveRecordConfig',
+			'database' => array(
+				'ConnectionString' => 'sqlite:protected/data/Northwind.db',
+			),
+		),
+		'i81n' => array(
+			'class' => 'System.I18N.TGlobalization',
+			'properties' => array(
+				'DefaultCharSet'=>'UTF-8',
+			),
+		),
+	),
+);
\ No newline at end of file