Merge branch 'test-feat-change' fix issue #45

data/armor.sql

@@ -62,7 +62,6 @@ VALUES
   (13, 1, '275', 4, 2, 'Full plate', '30 gp', 30.0, 6, 0, -3, -10, 18, 6, 4, 'TODO');
 
 
-
 -- TODO INSERT into armor_traits table
 INSERT INTO armor_traits (armor_id, trait_id)
 VALUES

data/bulks.sql

@@ -4,7 +4,7 @@
 
 PRAGMA foreign_keys = ON; -- database requires foreign key checking to be turned
                           -- on PER CONNECTION
-INSERT INTO bulk (
+INSERT INTO bulks (
   bulk_id,
   sources_id,
   sources_pages,

gendb.bat

@@ -5,6 +5,7 @@ del pf2.db
 sqlite3 pf2.db < schema/sources.sql
 sqlite3 pf2.db < schema/backgrounds.sql
 sqlite3 pf2.db < schema/abilityscores.sql
+sqlite3 pf2.db < schema/bulks.sql
 sqlite3 pf2.db < schema/sizes.sql
 sqlite3 pf2.db < schema/langs.sql
 sqlite3 pf2.db < schema/traits.sql
@@ -17,6 +18,7 @@ sqlite3 pf2.db < schema/armor.sql
 sqlite3 pf2.db < data/sources.sql
 sqlite3 pf2.db < data/backgrounds.sql
 sqlite3 pf2.db < data/abilityscores.sql
+sqlite3 pf2.db < data/bulks.sql
 sqlite3 pf2.db < data/senses.sql
 sqlite3 pf2.db < data/sizes.sql
 sqlite3 pf2.db < data/langs.sql

gendb.sh

@@ -8,7 +8,7 @@ sqlite3 pf2.db < schema/backgrounds.sql
 echo '3'
 sqlite3 pf2.db < schema/abilityscores.sql
 echo '4'
-sqlite3 pf2.db < schema/bulk.sql
+sqlite3 pf2.db < schema/bulks.sql
 echo '5'
 sqlite3 pf2.db < schema/sizes.sql
 echo '6'
@@ -38,7 +38,7 @@ sqlite3 pf2.db < data/backgrounds.sql
 echo '3'
 sqlite3 pf2.db < data/abilityscores.sql
 echo '4'
-sqlite3 pf2.db < data/bulk.sql
+sqlite3 pf2.db < data/bulks.sql
 echo '5'
 sqlite3 pf2.db < data/senses.sql
 echo '6'

schema/armor.sql

@@ -30,7 +30,7 @@ CREATE TABLE armor (
 	bulk_id INTEGER NOT NULL,
 	grp_id INTEGER,
 	descr TEXT NOT NULL,
-	FOREIGN KEY (bulk_id) REFERENCES bulk(bulk_id),
+	FOREIGN KEY (bulk_id) REFERENCES bulks(bulk_id),
 	FOREIGN KEY (grp_id) REFERENCES armorgroup(grp_id),
   FOREIGN KEY (sources_id) REFERENCES sources(sources_id)
 );

schema/bulks.sql

@@ -1,4 +1,4 @@
-CREATE TABLE bulk (
+CREATE TABLE bulks (
 	bulk_id INTEGER PRIMARY KEY,
   sources_id INTEGER NOT NULL,
   sources_pages TEXT NOT NULL,