[Title] support sqlite

[Type] Bugfix
[Module] Toolchain /
[Priority] Major
[Jira#]
[Redmine#]
[Problem]  sqlite doesn't support prepair /execute statmaent
[Cause]
[Solution]
[TestCase]

Change-Id: I7fbfa5ff84b5094843517e37d847d4f9ebfae0ab

diff --git a/src/build_server/BuildServer.rb b/src/build_server/BuildServer.rb
index e10eb8696bf0bc5dc87b1b29f3893b322ce75d71..a3ab91c4eb13b284975df7097732e25bf4af4561 100644 (file)
--- a/src/build_server/BuildServer.rb
+++ b/src/build_server/BuildServer.rb
@@ -601,15 +601,13 @@ class BuildServer
 
                        # create table
                        db.do "CREATE TABLE server_configs ( id INTEGER PRIMARY KEY #{inc}, property VARCHAR(64) NOT NULL, value VARCHAR(256) )#{post_fix}"
-                       sth = db.prepare "INSERT INTO server_configs (property,value) VALUES (?,?)"
-                       sth.execute('db_version',@db_version)
-                       sth.execute('max_working_jobs','2')
-                       sth.execute('send_mail','NO')
-                       sth.execute('keep_time','86400')
-                       sth.execute('pkg_sync_period',600)
-                       sth.execute('changelog_check','false')
-                       sth.execute('job_log_url','')
-                       sth.finish
+                       db.do "INSERT INTO server_configs (property,value) VALUES ('db_version','#{@db_version}')"
+                       db.do "INSERT INTO server_configs (property,value) VALUES ('max_working_jobs','2')"
+                       db.do "INSERT INTO server_configs (property,value) VALUES ('send_mail','NO')"
+                       db.do "INSERT INTO server_configs (property,value) VALUES ('keep_time','86400')"
+                       db.do "INSERT INTO server_configs (property,value) VALUES ('pkg_sync_period','600')"
+                       db.do "INSERT INTO server_configs (property,value) VALUES ('changelog_check','false')"
+                       db.do "INSERT INTO server_configs (property,value) VALUES ('job_log_url','')"
                        db.do "CREATE TABLE os_category ( id INTEGER PRIMARY KEY #{inc}, name VARCHAR(32) NOT NULL UNIQUE ) #{post_fix}"
                        db.do "INSERT INTO os_category (name) VALUES ( 'linux' )"
                        db.do "INSERT INTO os_category (name) VALUES ( 'windows' )"
@@ -636,13 +634,13 @@ class BuildServer
                        # groups
                        db.do "CREATE TABLE groups ( id INTEGER PRIMARY KEY #{inc}, name VARCHAR(32) NOT NULL UNIQUE, admin VARCHAR(32) NOT NULL DEFAULT 'FALSE', description VARCHAR(256) )#{post_fix}"
                        # user groups  (users -- groups)
-                       db.do "CREATE  TABLE user_groups ( users_id INTEGER NOT NULL, groups_id INTEGER NOT NULL, status VARCHAR(32) NOT NULL DEFAULT 'ACTIVE', PRIMARY KEY ( users_id, groups_id ),
-                                       CONSTRAINT fk_users_has_groups_users1 FOREIGN KEY ( users_id ) REFERENCES users ( id ),
-                                       CONSTRAINT fk_users_has_groups_groups1 FOREIGN KEY ( groups_id ) REFERENCES groups ( id )) #{post_fix}"
+                       db.do "CREATE  TABLE user_groups ( user_id INTEGER NOT NULL, group_id INTEGER NOT NULL, status VARCHAR(32) NOT NULL DEFAULT 'ACTIVE', PRIMARY KEY ( user_id, group_id ),
+                                       CONSTRAINT fk_users_has_groups_users1 FOREIGN KEY ( user_id ) REFERENCES users ( id ),
+                                       CONSTRAINT fk_users_has_groups_groups1 FOREIGN KEY ( group_id ) REFERENCES groups ( id )) #{post_fix}"
 
                        db.do "INSERT INTO users (name,email,password_hash,password_salt) VALUES ('administrators','admin@user','$2a$10$H.w3ssI9KfuvNEXXp1qxD.b3Wm8alJG.HXviUofe4nErDn.TKUAka','$2a$10$H.w3ssI9KfuvNEXXp1qxD.')"
                        db.do "INSERT INTO groups (name, admin, description) VALUES ('admin','TRUE','')"
-                       db.do "INSERT INTO user_groups (users_id, groups_id) SELECT users.id,groups.id FROM users,groups WHERE users.email = 'admin@user' and groups.name = 'admin'"
+                       db.do "INSERT INTO user_groups (user_id, group_id) SELECT users.id,groups.id FROM users,groups WHERE users.email = 'admin@user' and groups.name = 'admin'"
 
                        # PROJECTS
                        CommonProject.create_table(db, inc, post_fix)