diff options
Diffstat (limited to 'pyenc/enumerate_classes.py')
| -rw-r--r-- | pyenc/enumerate_classes.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/pyenc/enumerate_classes.py b/pyenc/enumerate_classes.py index d4197bd..c6ccf47 100644 --- a/pyenc/enumerate_classes.py +++ b/pyenc/enumerate_classes.py @@ -122,9 +122,9 @@ def enumerate_files(path_base, environment): # This works in at least postgres and sqlite3 db.engine.execute(text(""" - INSERT INTO puppet_file (path, environment, checksum) + INSERT INTO puppet_file (path, environment_id, checksum) VALUES (:path, :environment, :checksum) - ON CONFLICT (path, environment) + ON CONFLICT (path, environment_id) DO UPDATE SET checksum = EXCLUDED.checksum """), { 'path': os.path.relpath(puppet_file.path, path), @@ -144,13 +144,13 @@ def ensure_environment(name): otherwise create it and return that. """ environment = model \ - .PuppetEnvironment \ + .Environment \ .query \ - .where(model.PuppetEnvironment.name == name) \ + .where(model.Environment.name == name) \ .one_or_none() if not environment: - environment = model.PuppetEnvironment(name=name) + environment = model.Environment(name=name) db.session.add(environment) # This also updates our environment object, filling in # autogenerated fieldsfields. @@ -187,8 +187,8 @@ def run(path_base: Path = '/etc/puppetlabs/code/environments', count = base.count() result = base \ - .join(model.PuppetEnvironment) \ - .add_column(model.PuppetEnvironment.name) \ + .join(model.Environment) \ + .add_column(model.Environment.name) \ .all() db.session.commit() @@ -245,22 +245,22 @@ def run(path_base: Path = '/etc/puppetlabs/code/environments', # Add classs (if not exists) db.engine.execute(text(""" - INSERT INTO puppet_class (class_name) + INSERT INTO puppet_class (name) VALUES (:name) - ON CONFLICT (class_name) DO NOTHING + ON CONFLICT (name) DO NOTHING """), {'name': class_name}) # Add class to environment (if not already there) db.engine.execute(text(""" INSERT INTO environment_classes (environment_id, class_id) - SELECT :env, id FROM puppet_class WHERE class_name = :name + SELECT :env, id FROM puppet_class WHERE puppet_class.name = :name ON CONFLICT (environment_id, class_id) DO NOTHING """), {'env': environment.id, 'name': class_name}) # Add class to file mapping (if not already there) db.engine.execute(text(""" INSERT INTO class_files (file_id, class_id) - SELECT :file, id FROM puppet_class WHERE class_name = :name + SELECT :file, id FROM puppet_class WHERE puppet_class.name = :name ON CONFLICT (file_id, class_id) DO NOTHING """), {'file': file_content.file_id, 'name': class_name}) |