[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
r5926 - in trunk/gnue-appserver: samples src/gcd
|
From: |
johannes |
|
Subject: |
r5926 - in trunk/gnue-appserver: samples src/gcd |
|
Date: |
Wed, 7 Jul 2004 17:14:07 -0500 (CDT) |
Author: johannes
Date: 2004-06-22 14:23:00 -0500 (Tue, 22 Jun 2004)
New Revision: 5926
Added:
trunk/gnue-appserver/samples/setup.sh
Removed:
trunk/gnue-appserver/samples/Makefile
trunk/gnue-appserver/samples/setup-interbase.bat
trunk/gnue-appserver/samples/setup-interbase.sh
trunk/gnue-appserver/samples/setup-mysql.sh
trunk/gnue-appserver/samples/setup-pgsql.sh
Modified:
trunk/gnue-appserver/samples/README
trunk/gnue-appserver/samples/README.cvs
trunk/gnue-appserver/samples/auth.gsd
trunk/gnue-appserver/samples/sample.gsd
trunk/gnue-appserver/src/gcd/gcd2sql.py
Log:
Updated samples-directory to reflect recent changes in gnue-schema and
gnue-gcd2sql. All setup-* scripts are replaced by setup-db.sh.
Deleted: trunk/gnue-appserver/samples/Makefile
===================================================================
--- trunk/gnue-appserver/samples/Makefile 2004-06-22 19:21:26 UTC (rev
5925)
+++ trunk/gnue-appserver/samples/Makefile 2004-06-22 19:23:00 UTC (rev
5926)
@@ -1,59 +0,0 @@
-#
-# This file is part of GNU Enterprise.
-#
-# GNU Enterprise is free software; you can redistribute it
-# and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2, or (at your option) any later version.
-#
-# GNU Enterprise is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with program; see the file COPYING. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place
-# - Suite 330, Boston, MA 02111-1307, USA.
-#
-# Copyright 2001-2004 Free Software Foundation
-#
-# $Id$
-#
-
-# Which scripter to use
-SCRIPTER = $(shell type -p "gsscvs")
-ifeq ($(SCRIPTER),)
- SCRIPTER = $(shell type -p "gnue-schema")
-endif
-
-# Which processors to use
-PROCESSORS = postgresql interbase oracle mysql mssql
-
-HTML = schema.html
-
-# Which files to process
-SRC = sample.gsd
-
-OPTS =
-
-# Encoding: set encoding to 'latin1', default is UTF-8
-# OPTS = --encoding latin1
-
-# ---------------------------------------------------------------------------
-# Rules to build all SQL files
-# ---------------------------------------------------------------------------
-
-.PHONY: all clean html
-
-all: $(PROCESSORS) html
-
-$(PROCESSORS):
- rm -f address@hidden
- $(SCRIPTER) $(OPTS) --vendor=$@ address@hidden $(SRC)
-
-html:
- $(SCRIPTER) $(OPTS) --vendor=HTML --output=$(HTML) $(SRC)
-
-clean:
- rm -f *.sql *.html
Modified: trunk/gnue-appserver/samples/README
===================================================================
--- trunk/gnue-appserver/samples/README 2004-06-22 19:21:26 UTC (rev 5925)
+++ trunk/gnue-appserver/samples/README 2004-06-22 19:23:00 UTC (rev 5926)
@@ -5,23 +5,48 @@
installation instructions you can find in the file "INSTALL".
+Create an entry in your connections.conf
+----------------------------------------
+
+Add a section for your database to the connections.conf file. If you followed
+the default setup this file has already an entry 'gnue'. Please check if it
+fits your needs (provider, hostname, dbname and so on)
+
+
Creating the database
---------------------
Before you can start gnue-appserver, you have to create a database and fill it
with some basic information.
-For Interbase, MS SQL, MySQL, Oracle, and PostgreSQL, you can find SQL scripts
-here in this directory. On your database server, create a user "gnue", a
-database "gnue" where the user "gnue" has full access, and run the correct SQL
-script against that database.
+For PostgreSQL:
+---------------
-For Interbase, PostgreSQL, and MySQL, there are the shell scripts
-"setup-interbase.sh", "setup-pgsql.sh", and "setup-mysql.sh" respectively,
-that do exactly that. Contributed shell scripts for other databases are highly
-appreciated.
+Execute the script 'setup.sh' and you're done. This script will do all the
+dirty work for you
+All other backends:
+-------------------
+
+First create your database as described in your database documentation. Make
+sure you have access to this database and it fits your settings in the
+connections.conf. The call the following programs
+
+gnue-schema --connection=gnue base.gsd auth.gsd
+
+ This will create all tables needed for the classrepository
+
+gnue-gcd2sql --connection=gnue sample.gcd
+
+ This will create the sample classes and updates the classrepository
+
+gnue-schema --connection=gnue sample.gsd
+
+ This will add sample data for the sample classes
+
+
+
Running the Application Server
------------------------------
Modified: trunk/gnue-appserver/samples/README.cvs
===================================================================
--- trunk/gnue-appserver/samples/README.cvs 2004-06-22 19:21:26 UTC (rev
5925)
+++ trunk/gnue-appserver/samples/README.cvs 2004-06-22 19:23:00 UTC (rev
5926)
@@ -1,3 +1,2 @@
-To create the SQL scripts described in the README file, you have to download
+To use gnue-schema (gsscvs) described in the README file, you have to download
gnue-common from cvs in the same directory you have downloaded gnue-appserver.
-Then, type "make" to create SQL scripts for all kinds of databases.
Modified: trunk/gnue-appserver/samples/auth.gsd
===================================================================
--- trunk/gnue-appserver/samples/auth.gsd 2004-06-22 19:21:26 UTC (rev
5925)
+++ trunk/gnue-appserver/samples/auth.gsd 2004-06-22 19:23:00 UTC (rev
5926)
@@ -31,7 +31,7 @@
</definition>
<rows>
<row>
- <value field="gnue_id">00000000000000000000000000000000</value>
+ <value field="gnue_id"
key="Y">00000000000000000000000000000000</value>
<value field="gnue_name">gnue</value>
<value field="gnue_comment">GNU Enterprise System Management</value>
</row>
@@ -46,7 +46,7 @@
</definition>
<rows>
<row>
- <value field="gnue_id">00000000000000000000000000000060</value>
+ <value field="gnue_id"
key="Y">00000000000000000000000000000060</value>
<value field="gnue_module">00000000000000000000000000000000</value>
<value field="gnue_name">useraccess</value>
<value field="gnue_comment">GNU Enterprise User
Authentication</value>
@@ -67,7 +67,7 @@
</definition>
<rows>
<row>
- <value field="gnue_id">00000000000000000000000000000064</value>
+ <value field="gnue_id"
key="Y">00000000000000000000000000000064</value>
<value field="gnue_module">00000000000000000000000000000000</value>
<value field="gnue_class">00000000000000000000000000000060</value>
<value field="gnue_name">accesslist</value>
Modified: trunk/gnue-appserver/samples/sample.gsd
===================================================================
--- trunk/gnue-appserver/samples/sample.gsd 2004-06-22 19:21:26 UTC (rev
5925)
+++ trunk/gnue-appserver/samples/sample.gsd 2004-06-22 19:23:00 UTC (rev
5926)
@@ -1,343 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Schema definition created by GNUe Appserver's Schema Support. -->
-<!-- run this file through gnue-schema to create SQL scripts -->
<schema author="Appserver SchemaSupport" title="Appserver Schema Dump"
version="1.0">
- <tables>
- <import-table library="base.gsd" name="gnue_module"/>
- <import-table library="base.gsd" name="gnue_class"/>
- <import-table library="base.gsd" name="gnue_property"/>
- <import-table library="base.gsd" name="gnue_procedure"/>
- <import-table library="base.gsd" name="gnue_parameter"/>
- <import-table library="auth.gsd" name="gnue_useraccess"/>
- <table name="address_country">
- <fields>
- <field name="address_code" description="ISO-Country code" length="2"
- type="string"/>
- <field name="address_name" description="The name of the country"
- length="35" type="string"/>
- <field name="gnue_id" description="Object ID" length="32" nullable="N"
- type="string"/>
- </fields>
- <indexes/>
- <constraints/>
- <primarykey name="gnue_id_pk_address_country">
- <pkfield name="gnue_id"/>
- </primarykey>
- </table>
- <table name="address_person">
- <fields>
- <field name="address_born" description="Birthday" type="date"/>
- <field name="address_children" description="Number of children"
- length="2" type="number"/>
- <field name="address_city" description="City where the person lives"
- length="35" type="string"/>
- <field name="address_country"
- description="Country where the person lives" length="32"
type="string"/>
- <field name="address_human"
- description="Whether the person is human or not"
type="boolean"/>
- <field name="address_lastmeeting"
- description="Date and time of the last meeting"
type="datetime"/>
- <field name="address_meettime"
- description="Preferred time for meetings" type="time"/>
- <field name="address_name" description="Name of the person"
- length="35" type="string"/>
- <field name="address_street"
- description="Street where the person lives" length="35"
type="string"/>
- <field name="address_weight" description="Weight of the person in kg"
- length="4" precision="1" type="number"/>
- <field name="address_zip"
- description="Zip code of the city where the person lives"
length="35" type="string"/>
- <field name="gnue_id" description="Object ID" length="32" nullable="N"
- type="string"/>
- </fields>
- <indexes/>
- <constraints>
- <constraint name="address_person_address_country_fk" type="foreignkey">
- <constraintfield name="address_country"/>
- <constraintref name="gnue_id" table="address_country"/>
- </constraint>
- </constraints>
- <primarykey name="gnue_id_pk_address_person">
- <pkfield name="gnue_id"/>
- </primarykey>
- </table>
- </tables>
<data>
- <import-tabledata library="base.gsd" name="gnue_module_dump"
- tablename="gnue_module"/>
- <import-tabledata library="base.gsd" name="gnue_class_dump"
- tablename="gnue_class"/>
- <import-tabledata library="base.gsd" name="gnue_property_dump"
- tablename="gnue_property"/>
- <import-tabledata library="auth.gsd" name="gnue_class_dump"
- tablename="gnue_class"/>
- <import-tabledata library="auth.gsd" name="gnue_property_dump"
- tablename="gnue_property"/>
- <tabledata name="gnue_module_dump" tablename="gnue_module">
- <definition>
- <column field="gnue_comment" type="string(70)"/>
- <column field="gnue_id" type="string(32)"/>
- <column field="gnue_name" type="string(35)"/>
- </definition>
- <rows>
- <row>
- <value field="gnue_id">00000000000000000000000000001000</value>
- <value field="gnue_name">address</value>
- <value field="gnue_comment">Address Management</value>
- </row>
- </rows>
- </tabledata>
- <tabledata name="gnue_class_dump" tablename="gnue_class">
- <definition>
- <column field="gnue_comment" type="string(70)"/>
- <column field="gnue_id" type="string(32)"/>
- <column field="gnue_module" type="string(32)"/>
- <column field="gnue_name" type="string(35)"/>
- </definition>
- <rows>
- <row>
- <value field="gnue_id">00000000000000000000000000001020</value>
- <value field="gnue_module">00000000000000000000000000001000</value>
- <value field="gnue_name">country</value>
- <value field="gnue_comment">Country</value>
- </row>
- <row>
- <value field="gnue_id">00000000000000000000000000001010</value>
- <value field="gnue_module">00000000000000000000000000001000</value>
- <value field="gnue_name">person</value>
- <value field="gnue_comment">Person</value>
- </row>
- </rows>
- </tabledata>
- <tabledata name="gnue_property_dump" tablename="gnue_property">
- <definition>
- <column field="gnue_class" type="string(32)"/>
- <column field="gnue_comment" type="string(70)"/>
- <column field="gnue_id" type="string(32)"/>
- <column field="gnue_length" type="number(6)"/>
- <column field="gnue_module" type="string(32)"/>
- <column field="gnue_name" type="string(35)"/>
- <column field="gnue_scale" type="number(4)"/>
- <column field="gnue_type" type="string(35)"/>
- <column field="gnue_nullable" type="boolean"/>
- </definition>
- <rows>
- <row>
- <value field="gnue_id">00000000000000000000000000001022</value>
- <value field="gnue_module">00000000000000000000000000001000</value>
- <value field="gnue_class">00000000000000000000000000001020</value>
- <value field="gnue_name">code</value>
- <value field="gnue_type">string</value>
- <value field="gnue_length">2</value>
- <value field="gnue_comment">ISO-Country code</value>
- <value field="gnue_nullable">TRUE</value>
- </row>
- <row>
- <value field="gnue_id">00000000000000000000000000001023</value>
- <value field="gnue_module">00000000000000000000000000001000</value>
- <value field="gnue_class">00000000000000000000000000001020</value>
- <value field="gnue_name">name</value>
- <value field="gnue_type">string</value>
- <value field="gnue_length">35</value>
- <value field="gnue_comment">The name of the country</value>
- <value field="gnue_nullable">TRUE</value>
- </row>
- <row>
- <value field="gnue_id">00000000000000000000000000001021</value>
- <value field="gnue_module">00000000000000000000000000000000</value>
- <value field="gnue_class">00000000000000000000000000001020</value>
- <value field="gnue_name">id</value>
- <value field="gnue_type">id</value>
- <value field="gnue_comment">Object ID</value>
- <value field="gnue_nullable">FALSE</value>
- </row>
- <row>
- <value field="gnue_id">00000000000000000000000000001019</value>
- <value field="gnue_module">00000000000000000000000000001000</value>
- <value field="gnue_class">00000000000000000000000000001010</value>
- <value field="gnue_name">born</value>
- <value field="gnue_type">date</value>
- <value field="gnue_comment">Birthday</value>
- <value field="gnue_nullable">TRUE</value>
- </row>
- <row>
- <value field="gnue_id">00000000000000000000000000001017</value>
- <value field="gnue_module">00000000000000000000000000001000</value>
- <value field="gnue_class">00000000000000000000000000001010</value>
- <value field="gnue_name">children</value>
- <value field="gnue_type">number</value>
- <value field="gnue_length">2</value>
- <value field="gnue_comment">Number of children</value>
- <value field="gnue_nullable">TRUE</value>
- </row>
- <row>
- <value field="gnue_id">00000000000000000000000000001015</value>
- <value field="gnue_module">00000000000000000000000000001000</value>
- <value field="gnue_class">00000000000000000000000000001010</value>
- <value field="gnue_name">city</value>
- <value field="gnue_type">string</value>
- <value field="gnue_length">35</value>
- <value field="gnue_comment">City where the person lives</value>
- <value field="gnue_nullable">TRUE</value>
- </row>
- <row>
- <value field="gnue_id">00000000000000000000000000001016</value>
- <value field="gnue_module">00000000000000000000000000001000</value>
- <value field="gnue_class">00000000000000000000000000001010</value>
- <value field="gnue_name">country</value>
- <value field="gnue_type">address_country</value>
- <value field="gnue_comment">Country where the person lives</value>
- <value field="gnue_nullable">TRUE</value>
- </row>
- <row>
- <value field="gnue_id">0000000000000000000000000000101C</value>
- <value field="gnue_module">00000000000000000000000000001000</value>
- <value field="gnue_class">00000000000000000000000000001010</value>
- <value field="gnue_name">human</value>
- <value field="gnue_type">boolean</value>
- <value field="gnue_comment">Whether the person is human or
not</value>
- <value field="gnue_nullable">TRUE</value>
- </row>
- <row>
- <value field="gnue_id">0000000000000000000000000000101B</value>
- <value field="gnue_module">00000000000000000000000000001000</value>
- <value field="gnue_class">00000000000000000000000000001010</value>
- <value field="gnue_name">lastmeeting</value>
- <value field="gnue_type">datetime</value>
- <value field="gnue_comment">Date and time of the last meeting</value>
- <value field="gnue_nullable">TRUE</value>
- </row>
- <row>
- <value field="gnue_id">0000000000000000000000000000101A</value>
- <value field="gnue_module">00000000000000000000000000001000</value>
- <value field="gnue_class">00000000000000000000000000001010</value>
- <value field="gnue_name">meettime</value>
- <value field="gnue_type">time</value>
- <value field="gnue_comment">Preferred time for meetings</value>
- <value field="gnue_nullable">TRUE</value>
- </row>
- <row>
- <value field="gnue_id">00000000000000000000000000001012</value>
- <value field="gnue_module">00000000000000000000000000001000</value>
- <value field="gnue_class">00000000000000000000000000001010</value>
- <value field="gnue_name">name</value>
- <value field="gnue_type">string</value>
- <value field="gnue_length">35</value>
- <value field="gnue_comment">Name of the person</value>
- <value field="gnue_nullable">TRUE</value>
- </row>
- <row>
- <value field="gnue_id">00000000000000000000000000001013</value>
- <value field="gnue_module">00000000000000000000000000001000</value>
- <value field="gnue_class">00000000000000000000000000001010</value>
- <value field="gnue_name">street</value>
- <value field="gnue_type">string</value>
- <value field="gnue_length">35</value>
- <value field="gnue_comment">Street where the person lives</value>
- <value field="gnue_nullable">TRUE</value>
- </row>
- <row>
- <value field="gnue_id">00000000000000000000000000001018</value>
- <value field="gnue_module">00000000000000000000000000001000</value>
- <value field="gnue_class">00000000000000000000000000001010</value>
- <value field="gnue_name">weight</value>
- <value field="gnue_type">number</value>
- <value field="gnue_length">4</value>
- <value field="gnue_scale">1</value>
- <value field="gnue_comment">Weight of the person in kg</value>
- <value field="gnue_nullable">TRUE</value>
- </row>
- <row>
- <value field="gnue_id">00000000000000000000000000001014</value>
- <value field="gnue_module">00000000000000000000000000001000</value>
- <value field="gnue_class">00000000000000000000000000001010</value>
- <value field="gnue_name">zip</value>
- <value field="gnue_type">string</value>
- <value field="gnue_length">35</value>
- <value field="gnue_comment">Zip code of the city where the person
lives</value>
- <value field="gnue_nullable">TRUE</value>
- </row>
- <row>
- <value field="gnue_id">00000000000000000000000000001011</value>
- <value field="gnue_module">00000000000000000000000000000000</value>
- <value field="gnue_class">00000000000000000000000000001010</value>
- <value field="gnue_name">id</value>
- <value field="gnue_type">id</value>
- <value field="gnue_comment">Object ID</value>
- <value field="gnue_nullable">FALSE</value>
- </row>
- </rows>
- </tabledata>
- <tabledata name="gnue_procedure_dump" tablename="gnue_procedure">
- <definition>
- <column field="gnue_class" type="string(32)"/>
- <column field="gnue_code" type="string"/>
- <column field="gnue_comment" type="string(70)"/>
- <column field="gnue_compiledcode" type="string"/>
- <column field="gnue_id" type="string(32)"/>
- <column field="gnue_language" type="string(10)"/>
- <column field="gnue_module" type="string(32)"/>
- <column field="gnue_name" type="string(35)"/>
- <column field="gnue_nullable" type="boolean"/>
- </definition>
- <rows>
- <row>
- <value field="gnue_id">0000000000000000000000000000101F</value>
- <value field="gnue_module">00000000000000000000000000001000</value>
- <value field="gnue_class">00000000000000000000000000001010</value>
- <value field="gnue_name">show</value>
- <value field="gnue_language">python</value>
- <value field="gnue_code">print self.address_name</value>
- <value field="gnue_comment">Simple procedure to test
Appserver</value>
- <value field="gnue_nullable">TRUE</value>
- </row>
- <row>
- <value field="gnue_id">0000000000000000000000000000101E</value>
- <value field="gnue_module">00000000000000000000000000001000</value>
- <value field="gnue_class">00000000000000000000000000001010</value>
- <value field="gnue_name">test</value>
- <value field="gnue_language">python</value>
- <value field="gnue_code">
-if self.address_name [0] == "(":
- self.address_name = self.address_name [1:len(self.address_name)-1]
-else:
- self.address_name = "(" + self.address_name + ")"
- </value>
- <value field="gnue_comment">Simple procedure to test
Appserver</value>
- <value field="gnue_nullable">TRUE</value>
- </row>
- <row>
- <value field="gnue_id">0000000000000000000000000000101G</value>
- <value field="gnue_module">00000000000000000000000000001000</value>
- <value field="gnue_class">00000000000000000000000000001010</value>
- <value field="gnue_name">getnextmeeting</value>
- <value field="gnue_language">python</value>
- <value field="gnue_code">
-import mx.DateTime
-last = self.address_lastmeeting
-tm = self.address_meettime
-if last is not None and tm is not None:
- next = last + mx.DateTime.RelativeDateTime (days=+21, hour = tm.hour, minute
= tm.minute, second = tm.second)
- return next
-else:
- return None</value>
- <value field="gnue_comment">Calculate the next meeting date</value>
- <value field="gnue_type">datetime</value>
- <value field="gnue_nullable">TRUE</value>
- </row>
- </rows>
- </tabledata>
<tabledata name="sample_accounts" tablename="gnue_useraccess">
- <definition>
- <column field="gnue_id" type="string(32)"/>
- <column field="gnue_username" type="string(20)"/>
- <column field="gnue_password" type="string(70)"/>
- <column field="gnue_accesslist" type="string(100)"/>
- </definition>
<rows>
<row>
- <value field="gnue_id">00000000000000000000001000000001</value>
+ <value field="gnue_id"
key="Y">00000000000000000000001000000001</value>
<value field="gnue_username">test</value>
<value field="gnue_password">test</value>
<value field="gnue_accesslist">address_person,address_country</value>
@@ -351,14 +19,9 @@
</rows>
</tabledata>
<tabledata name="sample_countries" tablename="address_country">
- <definition>
- <column field="gnue_id" type="string(32)"/>
- <column field="address_code" type="string(2)"/>
- <column field="address_name" type="string(35)"/>
- </definition>
<rows>
<row>
- <value field="gnue_id">00000000000000000000002000000001</value>
+ <value field="gnue_id"
key="Y">00000000000000000000002000000001</value>
<value field="address_code">AF</value>
<value field="address_name">Afghanistan</value>
</row>
@@ -1560,23 +1223,9 @@
</rows>
</tabledata>
<tabledata name="sample_persons" tablename="address_person">
- <definition>
- <column field="gnue_id" type="string(32)"/>
- <column field="address_name" type="string(35)"/>
- <column field="address_street" type="string(35)"/>
- <column field="address_zip" type="string(35)"/>
- <column field="address_city" type="string(35)"/>
- <column field="address_country" type="string(32)"/>
- <column field="address_children" type="number(2)"/>
- <column field="address_weight" type="number(4.1)"/>
- <column field="address_born" type="date"/>
- <column field="address_meettime" type="time"/>
- <column field="address_lastmeeting" type="datetime"/>
- <column field="address_human" type="boolean"/>
- </definition>
<rows>
<row>
- <value field="gnue_id">00000000000000000000000000001100</value>
+ <value field="gnue_id"
key="Y">00000000000000000000000000001100</value>
<value field="address_name">James Tiberius Kirk</value>
<value field="address_street">Enterprise Road 17</value>
<value field="address_zip">2002</value>
Deleted: trunk/gnue-appserver/samples/setup-interbase.bat
===================================================================
--- trunk/gnue-appserver/samples/setup-interbase.bat 2004-06-22 19:21:26 UTC
(rev 5925)
+++ trunk/gnue-appserver/samples/setup-interbase.bat 2004-06-22 19:23:00 UTC
(rev 5926)
@@ -1,4 +0,0 @@
-..\..\..\..\bin\gnue-schema --vendor=interbase --output=interbase.sql
sample.gsd
-echo CREATE DATABASE 'gnue.fdb' USER 'sysdba' PASSWORD 'masterkey' DEFAULT
CHARACTER SET UTF8; > createGnueFdb.sql
-isql -i createGnueFdb.sql
-isql gnue.fdb -u sysdba -p masterkey -i interbase.sql
Deleted: trunk/gnue-appserver/samples/setup-interbase.sh
===================================================================
--- trunk/gnue-appserver/samples/setup-interbase.sh 2004-06-22 19:21:26 UTC
(rev 5925)
+++ trunk/gnue-appserver/samples/setup-interbase.sh 2004-06-22 19:23:00 UTC
(rev 5926)
@@ -1,14 +0,0 @@
-#!/bin/sh
-# Set up sample database for Interbase/Firebird
-# The current user must have permission to create databases
-
-if [ ! -f interbase.sql ]; then
- make interbase
-fi
-
-isqlCommand=/usr/lib/firebird/bin/isql
-export isqlCommand
-
-echo "CREATE DATABASE 'gnue.fdb' USER 'sysdba' PASSWORD 'masterkey' DEFAULT
CHARACTER SET UTF8;" > createGnueFdb.sql
-$isqlCommand -i createGnueFdb.sql
-$isqlCommand gnue.fdb -u sysdba -p masterkey -i interbase.sql
Deleted: trunk/gnue-appserver/samples/setup-mysql.sh
===================================================================
--- trunk/gnue-appserver/samples/setup-mysql.sh 2004-06-22 19:21:26 UTC (rev
5925)
+++ trunk/gnue-appserver/samples/setup-mysql.sh 2004-06-22 19:23:00 UTC (rev
5926)
@@ -1,11 +0,0 @@
-#!/bin/sh
-# Set up sample database for MySQL
-# The current user must have permission to create databases
-
-if [ ! -f mysql.sql ]; then
- make mysql
-fi
-
-echo "create database gnue;" | mysql -p
-
-mysql gnue -p < mysql.sql
Deleted: trunk/gnue-appserver/samples/setup-pgsql.sh
===================================================================
--- trunk/gnue-appserver/samples/setup-pgsql.sh 2004-06-22 19:21:26 UTC (rev
5925)
+++ trunk/gnue-appserver/samples/setup-pgsql.sh 2004-06-22 19:23:00 UTC (rev
5926)
@@ -1,11 +0,0 @@
-#!/bin/sh
-# Set up sample database for PostgreSQL
-# The current user must have permission to create databases
-
-if [ ! -f postgresql.sql ]; then
- make postgresql
-fi
-
-createuser --createdb --adduser gnue
-createdb gnue
-psql gnue < postgresql.sql
Added: trunk/gnue-appserver/samples/setup.sh
===================================================================
--- trunk/gnue-appserver/samples/setup.sh 2004-06-22 19:21:26 UTC (rev
5925)
+++ trunk/gnue-appserver/samples/setup.sh 2004-06-22 19:23:00 UTC (rev
5926)
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+gsscvs --connection=gnue --createdb base.gsd auth.gsd
+gcdcvs --connection=gnue sample.gcd
+gsscvs --connection=gnue sample.gsd
Property changes on: trunk/gnue-appserver/samples/setup.sh
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/gnue-appserver/src/gcd/gcd2sql.py
===================================================================
--- trunk/gnue-appserver/src/gcd/gcd2sql.py 2004-06-22 19:21:26 UTC (rev
5925)
+++ trunk/gnue-appserver/src/gcd/gcd2sql.py 2004-06-22 19:23:00 UTC (rev
5926)
@@ -82,6 +82,13 @@
help = _("If this flag is set, only code is sent to the output file "
"and the schema is not created automatically."))
+ self.addCommandOption ('username', 'u', argument="user",
+ help = _("Set the username for the database. If the database is to be "
+ "created, this username will be it's owner."))
+
+ self.addCommandOption ('password', 'p', argument="password",
+ help = _("Set the password for the database."))
+
ConfigOptions = {}
GClientApp.__init__ (self, connections, 'gcd2sql', ConfigOptions)
@@ -349,9 +356,13 @@
given output file (if requested by options).
"""
- connection = self.connections.getConnection (self.OPTIONS ['connection'],
- login = True)
+ connection = self.connections.getConnection (self.OPTIONS ['connection'])
+ connection.parameters ['username'] = self.OPTIONS ['username'] or "gnue"
+ connection.parameters ['password'] = self.OPTIONS ['password'] or ""
+
+ self.connections.loginToConnection (connection)
+
print _("Updating schema ...")
code = connection.updateSchema (self.tables, self.OPTIONS ['file-only'])
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- r5926 - in trunk/gnue-appserver: samples src/gcd,
johannes <=