[interchange-cvs] interchange - jon modified 3 files
interchange-core@icdevgroup.org
interchange-core@icdevgroup.org
Tue Mar 25 12:44:01 2003
User: jon
Date: 2003-03-25 17:43:59 GMT
Modified: dist/foundation/dbconf/mysql options.mysql
Modified: dist/foundation/dbconf/pgsql options.pgsql variants.pgsql
Log:
Fix some mismatches with the new options/variants table structure --
old indexes, too short price field, etc. Tested with PostgreSQL only.
Revision Changes Path
2.3 +19 -25 interchange/dist/foundation/dbconf/mysql/options.mysql
rev 2.3, prev_rev 2.2
Index: options.mysql
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/dbconf/mysql/options.mysql,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -u -r2.2 -r2.3
--- options.mysql 30 Dec 2002 00:48:36 -0000 2.2
+++ options.mysql 25 Mar 2003 17:43:59 -0000 2.3
@@ -1,31 +1,25 @@
Database options options.txt __SQLDSN__
+ifdef SQLUSER
+Database options USER __SQLUSER__
+endif
+ifdef SQLPASS
+Database options PASS __SQLPASS__
+endif
Database options DEFAULT_TYPE text
-#Database options NUMERIC price wholesale
Database options AUTO_NUMBER 100001
Database options NO_SEARCH 1
+Database options ChopBlanks 1
-Database options COLUMN_DEF "code=char(64) primary key NOT NULL"
-Database options COLUMN_DEF "o_matrix=char(1)"
-Database options COLUMN_DEF "o_modular=char(1)"
-Database options COLUMN_DEF "o_master=char(64) NOT NULL DEFAULT '', index(o_master)"
-Database options COLUMN_DEF "sku=char(64) NOT NULL DEFAULT '', index(sku)"
-Database options COLUMN_DEF "o_group=char(20) NOT NULL DEFAULT '', index(o_group)"
-Database options COLUMN_DEF "o_sort=char(16) NOT NULL DEFAULT '', index(o_sort)"
-Database options COLUMN_DEF "o_enable=char(1) NOT NULL DEFAULT '', index(o_enable)"
-Database options COLUMN_DEF "o_default=char(64)"
-Database options COLUMN_DEF "phantom=char(1)"
-Database options COLUMN_DEF "price=varchar(20)"
-Database options COLUMN_DEF "wholesale=varchar(20)"
-Database options COLUMN_DEF "volume=varchar(20)"
-Database options COLUMN_DEF "weight=varchar(20)"
-Database options COLUMN_DEF "mv_shipmode=varchar(255)"
-Database options COLUMN_DEF "o_height=int"
-Database options COLUMN_DEF "o_width=int"
+Database options COLUMN_DEF "code=varchar(64) primary key NOT NULL"
+Database options COLUMN_DEF "sku=varchar(64) NOT NULL DEFAULT ''"
+Database options COLUMN_DEF "o_group=varchar(64) NOT NULL DEFAULT ''"
+Database options COLUMN_DEF "o_sort=varchar(16) NOT NULL DEFAULT ''"
+Database options COLUMN_DEF "o_default=varchar(128)"
+Database options COLUMN_DEF "o_height=integer"
+Database options COLUMN_DEF "o_width=integer"
+Database options COLUMN_DEF "price=varchar(250)"
+Database options COLUMN_DEF "wholesale=varchar(250)"
-# These are set to type text by DEFAULT_TYPE
-#Database options COLUMN_DEF "description=text"
-#Database options COLUMN_DEF "differential=text"
-#Database options COLUMN_DEF "o_label=text"
-#Database options COLUMN_DEF "o_value=text"
-
-Database options INDEX o_master sku o_group o_sort o_enable
+Database options PREFER_NULL o_height o_width
+Database options NUMERIC o_height o_width
+Database options INDEX sku o_group o_sort
2.3 +15 -30 interchange/dist/foundation/dbconf/pgsql/options.pgsql
rev 2.3, prev_rev 2.2
Index: options.pgsql
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/dbconf/pgsql/options.pgsql,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -u -r2.2 -r2.3
--- options.pgsql 13 Dec 2002 21:01:41 -0000 2.2
+++ options.pgsql 25 Mar 2003 17:43:59 -0000 2.3
@@ -1,5 +1,4 @@
-Database options options.txt SQL
-Database options DSN __SQLDSN__
+Database options options.txt __SQLDSN__
ifdef SQLUSER
Database options USER __SQLUSER__
endif
@@ -7,34 +6,20 @@
Database options PASS __SQLPASS__
endif
Database options DEFAULT_TYPE text
-#Database options NUMERIC price wholesale
Database options AUTO_NUMBER 100001
Database options NO_SEARCH 1
+Database options ChopBlanks 1
-Database options COLUMN_DEF "code=varchar(64) primary key NOT NULL"
-Database options COLUMN_DEF "description=text"
-Database options COLUMN_DEF "differential=varchar(20)"
-Database options COLUMN_DEF "mv_shipmode=varchar(255)"
-Database options COLUMN_DEF "o_default=varchar(64)"
-Database options COLUMN_DEF "o_enable=varchar(1)"
-Database options COLUMN_DEF "o_group=varchar(20)"
-Database options COLUMN_DEF "o_height=int"
-Database options COLUMN_DEF "o_label=text"
-Database options COLUMN_DEF "o_master=varchar(64)"
-Database options COLUMN_DEF "o_matrix=varchar(1)"
-Database options COLUMN_DEF "o_modular=varchar(1)"
-Database options COLUMN_DEF "o_sort=varchar(16)"
-Database options COLUMN_DEF "o_value=text"
-Database options COLUMN_DEF "o_width=int"
-Database options COLUMN_DEF "phantom=varchar(1)"
-Database options COLUMN_DEF "price=varchar(20)"
-Database options COLUMN_DEF "sku=varchar(64)"
-Database options COLUMN_DEF "volume=varchar(20)"
-Database options COLUMN_DEF "weight=varchar(20)"
-Database options COLUMN_DEF "wholesale=varchar(20)"
-Database options INDEX o_enable
-Database options INDEX o_group
-Database options INDEX o_master
-Database options INDEX o_sort
-Database options INDEX sku
-Database options ChopBlanks 1
+Database options COLUMN_DEF "code=varchar(64) primary key NOT NULL"
+Database options COLUMN_DEF "sku=varchar(64) NOT NULL DEFAULT ''"
+Database options COLUMN_DEF "o_group=varchar(64) NOT NULL DEFAULT ''"
+Database options COLUMN_DEF "o_sort=varchar(16) NOT NULL DEFAULT ''"
+Database options COLUMN_DEF "o_default=varchar(128)"
+Database options COLUMN_DEF "o_height=integer"
+Database options COLUMN_DEF "o_width=integer"
+Database options COLUMN_DEF "price=varchar(250)"
+Database options COLUMN_DEF "wholesale=varchar(250)"
+
+Database options PREFER_NULL o_height o_width
+Database options NUMERIC o_height o_width
+Database options INDEX sku o_group o_sort
1.2 +6 -0 interchange/dist/foundation/dbconf/pgsql/variants.pgsql
rev 1.2, prev_rev 1.1
Index: variants.pgsql
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/dbconf/pgsql/variants.pgsql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- variants.pgsql 12 Feb 2003 03:59:11 -0000 1.1
+++ variants.pgsql 25 Mar 2003 17:43:59 -0000 1.2
@@ -1,4 +1,10 @@
Database variants variants.txt __SQLDSN__
+ifdef SQLUSER
+Database variants USER __SQLUSER__
+endif
+ifdef SQLPASS
+Database variants PASS __SQLPASS__
+endif
Database variants DEFAULT_TYPE varchar(255)
Database variants COLUMN_DEF "code=varchar(64) NOT NULL PRIMARY KEY"
Database variants COLUMN_DEF "sku=varchar(64)"