[interchange-cvs] interchange - racke modified 18 files
interchange-core@icdevgroup.org
interchange-core@icdevgroup.org
Sun Dec 29 19:49:00 2002
User: racke
Date: 2002-12-30 00:48:36 GMT
Modified: dist/foundation/dbconf/mysql affiliate.mysql area.mysql
Modified: cat.mysql country.mysql forum.mysql
Modified: gift_certs.mysql inventory.mysql
Modified: merchandising.mysql mysql.cfg options.mysql
Modified: order_returns.mysql orderline.mysql pricing.mysql
Modified: products.mysql state.mysql transactions.mysql
Modified: tree.mysql userdb.mysql
Log:
set (My)SQL username/password in one place with the DatabaseDefault directive
Revision Changes Path
2.1 +0 -6 interchange/dist/foundation/dbconf/mysql/affiliate.mysql
rev 2.1, prev_rev 2.0
Index: affiliate.mysql
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/dbconf/mysql/affiliate.mysql,v
retrieving revision 2.0
retrieving revision 2.1
diff -u -r2.0 -r2.1
--- affiliate.mysql 18 Jul 2001 02:20:53 -0000 2.0
+++ affiliate.mysql 30 Dec 2002 00:48:36 -0000 2.1
@@ -1,9 +1,3 @@
Database affiliate affiliate.txt __SQLDSN__
-ifdef SQLUSER
-Database affiliate USER __SQLUSER__
-endif
-ifdef SQLPASS
-Database affiliate PASS __SQLPASS__
-endif
Database affiliate COLUMN_DEF "code=char(12) NOT NULL PRIMARY KEY"
Database affiliate DEFAULT_TYPE text
2.1 +0 -6 interchange/dist/foundation/dbconf/mysql/area.mysql
rev 2.1, prev_rev 2.0
Index: area.mysql
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/dbconf/mysql/area.mysql,v
retrieving revision 2.0
retrieving revision 2.1
diff -u -r2.0 -r2.1
--- area.mysql 18 Jul 2001 02:20:53 -0000 2.0
+++ area.mysql 30 Dec 2002 00:48:36 -0000 2.1
@@ -1,10 +1,4 @@
Database area area.txt __SQLDSN__
-ifdef SQLUSER
-Database area USER __SQLUSER__
-endif
-ifdef SQLPASS
-Database area PASS __SQLPASS__
-endif
Database area DEFAULT_TYPE text
Database area COLUMN_DEF "code=char(8) NOT NULL PRIMARY KEY"
Database area COLUMN_DEF "name=char(128) DEFAULT '' NOT NULL"
2.1 +0 -6 interchange/dist/foundation/dbconf/mysql/cat.mysql
rev 2.1, prev_rev 2.0
Index: cat.mysql
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/dbconf/mysql/cat.mysql,v
retrieving revision 2.0
retrieving revision 2.1
diff -u -r2.0 -r2.1
--- cat.mysql 18 Jul 2001 02:20:53 -0000 2.0
+++ cat.mysql 30 Dec 2002 00:48:36 -0000 2.1
@@ -1,10 +1,4 @@
Database cat cat.txt __SQLDSN__
-ifdef SQLUSER
-Database cat USER __SQLUSER__
-endif
-ifdef SQLPASS
-Database cat PASS __SQLPASS__
-endif
Database cat DEFAULT_TYPE text
Database cat COLUMN_DEF "code=char(20) NOT NULL PRIMARY KEY"
Database cat COLUMN_DEF "sel=CHAR(64) DEFAULT '' NOT NULL, index(sel)"
2.2 +0 -6 interchange/dist/foundation/dbconf/mysql/country.mysql
rev 2.2, prev_rev 2.1
Index: country.mysql
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/dbconf/mysql/country.mysql,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -r2.1 -r2.2
--- country.mysql 13 Dec 2002 21:01:40 -0000 2.1
+++ country.mysql 30 Dec 2002 00:48:36 -0000 2.2
@@ -1,10 +1,4 @@
Database country country.txt __SQLDSN__
-ifdef SQLUSER
-Database country USER __SQLUSER__
-endif
-ifdef SQLPASS
-Database country PASS __SQLPASS__
-endif
Database country COLUMN_DEF "code=CHAR(3) NOT NULL PRIMARY KEY"
Database country COLUMN_DEF "selector=CHAR(3)"
Database country COLUMN_DEF "shipmodes=VARCHAR(255)"
1.2 +0 -6 interchange/dist/foundation/dbconf/mysql/forum.mysql
rev 1.2, prev_rev 1.1
Index: forum.mysql
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/dbconf/mysql/forum.mysql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- forum.mysql 6 Oct 2002 01:37:42 -0000 1.1
+++ forum.mysql 30 Dec 2002 00:48:36 -0000 1.2
@@ -1,10 +1,4 @@
Database forum forum.txt __SQLDSN__
-ifdef SQLUSER
-Database forum USER __SQLUSER__
-endif
-ifdef SQLPASS
-Database forum PASS __SQLPASS__
-endif
Database forum AUTO_NUMBER 100000
2.1 +0 -6 interchange/dist/foundation/dbconf/mysql/gift_certs.mysql
rev 2.1, prev_rev 2.0
Index: gift_certs.mysql
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/dbconf/mysql/gift_certs.mysql,v
retrieving revision 2.0
retrieving revision 2.1
diff -u -r2.0 -r2.1
--- gift_certs.mysql 18 Jul 2001 02:20:53 -0000 2.0
+++ gift_certs.mysql 30 Dec 2002 00:48:36 -0000 2.1
@@ -1,10 +1,4 @@
Database gift_certs gift_certs.txt __SQLDSN__
-ifdef SQLUSER
-Database gift_certs USER __SQLUSER__
-endif
-ifdef SQLPASS
-Database gift_certs PASS __SQLPASS__
-endif
Database gift_certs COLUMN_DEF "code=char(14) NOT NULL PRIMARY KEY"
Database gift_certs COLUMN_DEF "username=CHAR(20) default '' NOT NULL"
Database gift_certs COLUMN_DEF "order_date=varchar(32) NOT NULL"
2.1 +0 -6 interchange/dist/foundation/dbconf/mysql/inventory.mysql
rev 2.1, prev_rev 2.0
Index: inventory.mysql
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/dbconf/mysql/inventory.mysql,v
retrieving revision 2.0
retrieving revision 2.1
diff -u -r2.0 -r2.1
--- inventory.mysql 18 Jul 2001 02:20:53 -0000 2.0
+++ inventory.mysql 30 Dec 2002 00:48:36 -0000 2.1
@@ -1,10 +1,4 @@
Database inventory inventory.txt __SQLDSN__
-ifdef SQLUSER
-Database inventory USER __SQLUSER__
-endif
-ifdef SQLPASS
-Database inventory PASS __SQLPASS__
-endif
Database inventory COLUMN_DEF "sku=char(64) NOT NULL PRIMARY KEY"
Database inventory COLUMN_DEF "quantity=INT"
Database inventory COLUMN_DEF "stock_msg=char(64)"
2.1 +0 -6 interchange/dist/foundation/dbconf/mysql/merchandising.mysql
rev 2.1, prev_rev 2.0
Index: merchandising.mysql
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/dbconf/mysql/merchandising.mysql,v
retrieving revision 2.0
retrieving revision 2.1
diff -u -r2.0 -r2.1
--- merchandising.mysql 18 Jul 2001 02:20:53 -0000 2.0
+++ merchandising.mysql 30 Dec 2002 00:48:36 -0000 2.1
@@ -1,10 +1,4 @@
Database merchandising merchandising.txt __SQLDSN__
-ifdef SQLUSER
-Database merchandising USER __SQLUSER__
-endif
-ifdef SQLPASS
-Database merchandising PASS __SQLPASS__
-endif
Database merchandising DEFAULT_TYPE text
Database merchandising COLUMN_DEF "sku=char(64) NOT NULL PRIMARY KEY"
Database merchandising COLUMN_DEF "featured=CHAR(32) NOT NULL DEFAULT ''"
2.2 +2 -4 interchange/dist/foundation/dbconf/mysql/mysql.cfg
rev 2.2, prev_rev 2.1
Index: mysql.cfg
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/dbconf/mysql/mysql.cfg,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -r2.1 -r2.2
--- mysql.cfg 20 Jul 2001 04:23:59 -0000 2.1
+++ mysql.cfg 30 Dec 2002 00:48:36 -0000 2.2
@@ -3,10 +3,8 @@
Message -i -n Using MySQL, DSN=__SQLDSN__...
-# These variables are usually set in variable.txt now, but
-# you can uncomment these lines and set them here if needed.
-#Variable SQLUSER foo
-#Variable SQLPASS bar
+DatabaseDefault USER __SQLUSER__
+DatabaseDefault PASS __SQLPASS__
# Include each table definition from its separate file.
include dbconf/mysql/*.mysql
2.2 +1 -8 interchange/dist/foundation/dbconf/mysql/options.mysql
rev 2.2, prev_rev 2.1
Index: options.mysql
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/dbconf/mysql/options.mysql,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -r2.1 -r2.2
--- options.mysql 13 Dec 2002 21:01:40 -0000 2.1
+++ options.mysql 30 Dec 2002 00:48:36 -0000 2.2
@@ -1,11 +1,4 @@
-Database options options.txt SQL
-Database options DSN __SQLDSN__
-ifdef SQLUSER
-Database options USER __SQLUSER__
-endif
-ifdef SQLPASS
-Database options PASS __SQLPASS__
-endif
+Database options options.txt __SQLDSN__
Database options DEFAULT_TYPE text
#Database options NUMERIC price wholesale
Database options AUTO_NUMBER 100001
2.1 +0 -6 interchange/dist/foundation/dbconf/mysql/order_returns.mysql
rev 2.1, prev_rev 2.0
Index: order_returns.mysql
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/dbconf/mysql/order_returns.mysql,v
retrieving revision 2.0
retrieving revision 2.1
diff -u -r2.0 -r2.1
--- order_returns.mysql 18 Jul 2001 02:20:53 -0000 2.0
+++ order_returns.mysql 30 Dec 2002 00:48:36 -0000 2.1
@@ -1,10 +1,4 @@
Database order_returns order_returns.txt __SQLDSN__
-ifdef SQLUSER
-Database order_returns USER __SQLUSER__
-endif
-ifdef SQLPASS
-Database order_returns PASS __SQLPASS__
-endif
Database order_returns COLUMN_DEF "code=char(14) NOT NULL PRIMARY KEY"
Database order_returns COLUMN_DEF "order_number=CHAR(14) NOT NULL"
Database order_returns COLUMN_DEF "session=CHAR(32) NOT NULL"
2.3 +0 -6 interchange/dist/foundation/dbconf/mysql/orderline.mysql
rev 2.3, prev_rev 2.2
Index: orderline.mysql
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/dbconf/mysql/orderline.mysql,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -r2.2 -r2.3
--- orderline.mysql 13 Dec 2002 21:01:40 -0000 2.2
+++ orderline.mysql 30 Dec 2002 00:48:36 -0000 2.3
@@ -1,10 +1,4 @@
Database orderline orderline.txt __SQLDSN__
-ifdef SQLUSER
-Database orderline USER __SQLUSER__
-endif
-ifdef SQLPASS
-Database orderline PASS __SQLPASS__
-endif
Database orderline DEFAULT_TYPE varchar(128)
Database orderline COLUMN_DEF "code=char(14) NOT NULL PRIMARY KEY"
Database orderline COLUMN_DEF "store_id=varchar(9) DEFAULT '' NOT NULL"
2.1 +0 -6 interchange/dist/foundation/dbconf/mysql/pricing.mysql
rev 2.1, prev_rev 2.0
Index: pricing.mysql
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/dbconf/mysql/pricing.mysql,v
retrieving revision 2.0
retrieving revision 2.1
diff -u -r2.0 -r2.1
--- pricing.mysql 18 Jul 2001 02:20:53 -0000 2.0
+++ pricing.mysql 30 Dec 2002 00:48:36 -0000 2.1
@@ -1,10 +1,4 @@
Database pricing pricing.txt __SQLDSN__
-ifdef SQLUSER
-Database pricing USER __SQLUSER__
-endif
-ifdef SQLPASS
-Database pricing PASS __SQLPASS__
-endif
Database pricing KEY sku
Database pricing COLUMN_DEF "price_group=CHAR(12) DEFAULT '' NOT NULL"
Database pricing INDEX price_group
2.1 +0 -6 interchange/dist/foundation/dbconf/mysql/products.mysql
rev 2.1, prev_rev 2.0
Index: products.mysql
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/dbconf/mysql/products.mysql,v
retrieving revision 2.0
retrieving revision 2.1
diff -u -r2.0 -r2.1
--- products.mysql 18 Jul 2001 02:20:53 -0000 2.0
+++ products.mysql 30 Dec 2002 00:48:36 -0000 2.1
@@ -1,10 +1,4 @@
Database products products.txt __SQLDSN__
-ifdef SQLUSER
-Database products USER __SQLUSER__
-endif
-ifdef SQLPASS
-Database products PASS __SQLPASS__
-endif
Database products KEY sku
Database products COLUMN_DEF "sku=char(64) NOT NULL PRIMARY KEY"
Database products COLUMN_DEF "description=VARCHAR(128) NOT NULL"
2.1 +0 -6 interchange/dist/foundation/dbconf/mysql/state.mysql
rev 2.1, prev_rev 2.0
Index: state.mysql
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/dbconf/mysql/state.mysql,v
retrieving revision 2.0
retrieving revision 2.1
diff -u -r2.0 -r2.1
--- state.mysql 18 Jul 2001 02:20:53 -0000 2.0
+++ state.mysql 30 Dec 2002 00:48:36 -0000 2.1
@@ -1,10 +1,4 @@
Database state state.txt __SQLDSN__
-ifdef SQLUSER
-Database state USER __SQLUSER__
-endif
-ifdef SQLPASS
-Database state PASS __SQLPASS__
-endif
Database state AUTO_NUMBER 00001
Database state COLUMN_DEF "code=CHAR(8) NOT NULL PRIMARY KEY"
Database state COLUMN_DEF "country=CHAR(20) DEFAULT '' NOT NULL"
2.5 +0 -6 interchange/dist/foundation/dbconf/mysql/transactions.mysql
rev 2.5, prev_rev 2.4
Index: transactions.mysql
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/dbconf/mysql/transactions.mysql,v
retrieving revision 2.4
retrieving revision 2.5
diff -u -r2.4 -r2.5
--- transactions.mysql 13 Dec 2002 21:01:40 -0000 2.4
+++ transactions.mysql 30 Dec 2002 00:48:36 -0000 2.5
@@ -1,10 +1,4 @@
Database transactions transactions.txt __SQLDSN__
-ifdef SQLUSER
-Database transactions USER __SQLUSER__
-endif
-ifdef SQLPASS
-Database transactions PASS __SQLPASS__
-endif
Database transactions DEFAULT_TYPE varchar(128)
Database transactions COLUMN_DEF "code=char(14) NOT NULL PRIMARY KEY"
Database transactions COLUMN_DEF "store_id=varchar(9) DEFAULT '' NOT NULL"
1.3 +0 -6 interchange/dist/foundation/dbconf/mysql/tree.mysql
rev 1.3, prev_rev 1.2
Index: tree.mysql
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/dbconf/mysql/tree.mysql,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tree.mysql 13 Oct 2002 03:42:49 -0000 1.2
+++ tree.mysql 30 Dec 2002 00:48:36 -0000 1.3
@@ -1,10 +1,4 @@
Database tree tree.txt __SQLDSN__
-ifdef SQLUSER
-Database tree USER __SQLUSER__
-endif
-ifdef SQLPASS
-Database tree PASS __SQLPASS__
-endif
Database tree DEFAULT_TYPE varchar(255)
Database tree AUTO_SEQUENCE tree_seq
2.3 +0 -6 interchange/dist/foundation/dbconf/mysql/userdb.mysql
rev 2.3, prev_rev 2.2
Index: userdb.mysql
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/dbconf/mysql/userdb.mysql,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -r2.2 -r2.3
--- userdb.mysql 13 Dec 2002 21:01:40 -0000 2.2
+++ userdb.mysql 30 Dec 2002 00:48:36 -0000 2.3
@@ -1,10 +1,4 @@
Database userdb userdb.txt __SQLDSN__
-ifdef SQLUSER
-Database userdb USER __SQLUSER__
-endif
-ifdef SQLPASS
-Database userdb PASS __SQLPASS__
-endif
Database userdb COLUMN_DEF "code=char(20) NOT NULL PRIMARY KEY"
Database userdb COLUMN_DEF "password=CHAR(20) NOT NULL"
Database userdb COLUMN_DEF "acl=text"