Index: openacs-4/packages/acs-core-docs/www/tutorial-database.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/tutorial-database.html,v diff -u -N -r1.40.2.2 -r1.40.2.3 --- openacs-4/packages/acs-core-docs/www/tutorial-database.html 12 Dec 2010 00:07:03 -0000 1.40.2.2 +++ openacs-4/packages/acs-core-docs/www/tutorial-database.html 12 Dec 2010 01:37:25 -0000 1.40.2.3 @@ -1,19 +1,9 @@ -<<<<<<< tutorial-database.html - -
We create all database objects with scripts in the - myfirstpackage/sql/ directory. All -======= -
We create all database objects with scripts in the
myfirstpackage/sql/
directory. All
->>>>>>> 1.42
database scripts are database-specific and are thus in either
the myfirstpackage/sql/oracle
or
myfirstpackage/sql/postgresql
directory.
@@ -42,23 +32,13 @@
repository functions to simplify our database creation. (More
information about ACS Objects. More information about the
Content Repository.)
-<<<<<<< tutorial-database.html
-
The top of each sql file has some -======= -
The top of each sql file has some ->>>>>>> 1.42 +
The top of each sql file has some
standard comments, including doc tags such as
@author
which will be picked up
by the API browser. The string
-<<<<<<< tutorial-database.html
- $Id$ will automatically be
- expanded when the file is checked in to cvs.
[$OPENACS_SERVICE_NAME ~]$ cd /var/lib/aolserver/$OPENACS_SERVICE_NAME/packages/myfirstpackage/sql/postgresql
-[$OPENACS_SERVICE_NAME postgresql]$ emacs myfirstpackage-create.sql
Paste the text below into the file, save, and close.
Figure 9.3. The Database Creation Script
-- creation script -=======$Id$
will automatically be expanded when the file is checked in to cvs.[$OPENACS_SERVICE_NAME ~]$cd /var/lib/aolserver/$OPENACS_SERVICE_NAME/packages/myfirstpackage/sql/postgresql
-[$OPENACS_SERVICE_NAME postgresql]$emacs myfirstpackage-create.sql
Paste the text below into the file, save, and close.
Figure 8.3. The Database Creation Script
-- creation script ->>>>>>> 1.42 +[$OPENACS_SERVICE_NAME postgresql]$emacs myfirstpackage-create.sql
Paste the text below into the file, save, and close.
Figure 9.3. The Database Creation Script
-- creation script -- -- @author joel@aufrecht.org -- @cvs-id &Id:$ @@ -82,11 +62,7 @@ object. Notice the use of "mfp." This is derived from "My First Package" and ensures that our object is unlikely to conflict with objects from other packages.Create a database file to drop everything if the package is uninstalled.
-<<<<<<< tutorial-database.html -[$OPENACS_SERVICE_NAME postgresql]$ emacs myfirstpackage-drop.sqlFigure 9.4. Database Deletion Script
-- drop script -======= -[$OPENACS_SERVICE_NAME postgresql]$emacs myfirstpackage-drop.sql
Figure 8.4. Database Deletion Script
-- drop script ->>>>>>> 1.42 +[$OPENACS_SERVICE_NAME postgresql]$emacs myfirstpackage-drop.sql
Figure 9.4. Database Deletion Script
-- drop script -- -- @author joel@aufrecht.org -- @cvs-id &Id:$ @@ -113,8 +89,4 @@ 0 (1 row) -<<<<<<< tutorial-database.html -[$OPENACS_SERVICE_NAME postgresql]$Once both scripts are working without errors, run the create script one last time and proceed.
[$OPENACS_SERVICE_NAME postgresql]$ psql service0 -f myfirstpackage-create.sqlView comments on this page at openacs.org -======= [$OPENACS_SERVICE_NAME postgresql]$Once both scripts are working without errors, run the create script one last time and proceed.
[$OPENACS_SERVICE_NAME postgresql]$psql service0 -f myfirstpackage-create.sql
View comments on this page at openacs.org ->>>>>>> 1.42