@tricoteuses/senat 3.1.20 → 3.1.22

package/lib/src/server/dosleg.js

@@ -58,7 +58,6 @@ export async function* findAllDossiers() {
         "loi.url_jo3 as url_JO_correctif_2",
         // Lectures
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("dosleg_lecture as lecture")
             .leftJoin("dosleg_typlec as typlec", "typlec.typleccod", "lecture.typleccod")
             .select((eb2) => [
@@ -68,7 +67,6 @@ export async function* findAllDossiers() {
             "typlec.typlecord as ordre_lecture_num",
             // Lectures par assemblée
             jsonArrayFrom(eb2
-                .withSchema("senat")
                 .selectFrom("dosleg_lecass as lecass")
                 .leftJoin("dosleg_ass as ass", "ass.codass", "lecass.codass")
                 .leftJoin("dosleg_org as org", "org.orgcod", "lecass.orgcod")
@@ -114,7 +112,6 @@ export async function* findAllDossiers() {
                 sql `lecass.lecassamecomadoses::int`.as("session_liasse_amendements_adoptes_commission"),
                 // Textes
                 jsonArrayFrom(eb3
-                    .withSchema("senat")
                     .selectFrom("dosleg_texte as texte")
                     .leftJoin("dosleg_oritxt as oritxt", "oritxt.oritxtcod", "texte.oritxtcod")
                     .leftJoin("dosleg_typtxt as typtxt", "typtxt.typtxtcod", "texte.typtxtcod")
@@ -158,7 +155,6 @@ export async function* findAllDossiers() {
                     "texte.prix as prix",
                     // Auteurs du texte
                     jsonArrayFrom(eb4
-                        .withSchema("senat")
                         .selectFrom("dosleg_auteur as auteur")
                         .leftJoin("dosleg_ecr as ecr", "ecr.autcod", "auteur.autcod")
                         .leftJoin("dosleg_rolsig as rolsig", "rolsig.signataire", "ecr.signataire")
@@ -178,7 +174,6 @@ export async function* findAllDossiers() {
                     .orderBy(sql `array_position(array['0','2','1'], oritxt.oriordre)`)).as("textes"),
                 // Rapports
                 jsonArrayFrom(eb3
-                    .withSchema("senat")
                     .selectFrom("dosleg_rap as rap")
                     .leftJoin("dosleg_raporg as raporg", "raporg.rapcod", "rap.rapcod")
                     .leftJoin("dosleg_denrap as denrap", "denrap.coddenrap", "rap.coddenrap")
@@ -228,7 +223,6 @@ export async function* findAllDossiers() {
                     "lecassrap.lecassrapord as ordre_rapport",
                     // Auteurs du rapport
                     jsonArrayFrom(eb4
-                        .withSchema("senat")
                         .selectFrom("dosleg_auteur as auteur")
                         .leftJoin("dosleg_ecr as ecr", "ecr.autcod", "auteur.autcod")
                         .leftJoin("dosleg_rolsig as rolsig", "rolsig.signataire", "ecr.signataire")
@@ -244,7 +238,6 @@ export async function* findAllDossiers() {
                         .whereRef("ecr.rapcod", "=", "rap.rapcod")).as("auteurs"),
                     // Documents annexes
                     jsonArrayFrom(eb4
-                        .withSchema("senat")
                         .selectFrom("dosleg_docatt as docatt")
                         .leftJoin("dosleg_typatt as typatt", "typatt.typattcod", "docatt.typattcod")
                         .select(["docatt.docatturl as url", "typatt.typattlib as type_document"])
@@ -253,7 +246,6 @@ export async function* findAllDossiers() {
                     .whereRef("lecassrap.lecassidt", "=", "lecass.lecassidt")).as("rapports"),
                 // Dates de séances
                 jsonArrayFrom(eb3
-                    .withSchema("senat")
                     .selectFrom("dosleg_date_seance as date_seance")
                     .select([
                     "date_seance.code as code",
@@ -264,7 +256,6 @@ export async function* findAllDossiers() {
                 // Commissions saisies (source : ameli.sai)
                 // Fusionnées avec la commission au fond (lecass.orgcod) en post-traitement
                 jsonArrayFrom(eb3
-                    .withSchema("senat")
                     .selectFrom("ameli_sai as sai")
                     .innerJoin("ameli_txt_ameli as txt_a", "txt_a.id", "sai.txtid")
                     .innerJoin("ameli_com_ameli as com_a", "com_a.entid", "sai.comid")
@@ -285,7 +276,6 @@ export async function* findAllDossiers() {
                     .groupBy(["com_a.lib", "com_a.lil", "sai.saityp", "sai.isdelegfond"])).as("commissions_saisies_ameli"),
                 // Réunions de commission (source : dosleg_aud)
                 jsonArrayFrom(eb3
-                    .withSchema("senat")
                     .selectFrom("dosleg_aud as aud")
                     .innerJoin("dosleg_org as org_a", "org_a.orgcod", "aud.orgcod")
                     .select([
@@ -305,7 +295,6 @@ export async function* findAllDossiers() {
             .orderBy(sql `COALESCE(typlec.typlecord::int, 9999)`, "asc")).as("lectures"),
         // Thèmes
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("dosleg_the as the")
             .leftJoin("dosleg_loithe as loithe", "loithe.thecle", "the.thecle")
             .select(["the.thelib as libelle"])

package/lib/src/server/questions.js

@@ -63,7 +63,6 @@ export async function* findAll() {
       )`.as("themes"),
         // Réponses
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("questions_tam_reponses as tam_reponses")
             .select([
             sql `to_char(tam_reponses.datejorep, 'YYYY-MM-DD')`.as("date_reponse_JO"),

package/lib/src/server/scrutins.js

@@ -33,7 +33,6 @@ export async function* findAllScrutins(fromSession) {
         sql `${eb.ref("scr.scrpousea")}::text`.as("nombre_pour_seance"),
         // Votes individuels
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("dosleg_votsen as votsen")
             .leftJoin("dosleg_titsen as titsen", "titsen.titsencod", "votsen.titsencod")
             .leftJoin("dosleg_stavot as stavot", "stavot.stavotidt", "votsen.stavotidt")
@@ -57,9 +56,7 @@ export async function* findAllScrutins(fromSession) {
             .orderBy("memgrppol.memgrppoldatdeb", (ob) => ob.desc().nullsLast())).as("votes"),
         // Groupes votants (avec déduplication via window function)
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom(eb
-            .withSchema("senat")
             .selectFrom("dosleg_votsen as votsen")
             .leftJoin("dosleg_posvot as posvot", "posvot.posvotcod", "votsen.posvotcod")
             .leftJoin("dosleg_stavot as stavot", "stavot.stavotidt", "votsen.stavotidt")
@@ -93,7 +90,6 @@ export async function* findAllScrutins(fromSession) {
             .groupBy("unique_votes.grppolcod")).as("groupes_votants"),
         // Mises au point (corrections)
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("dosleg_corscr as corscr")
             .select([
             "corscr.corscrtxt as texte",

package/lib/src/server/sens.js

@@ -37,14 +37,12 @@ export async function* findAll() {
         "sen.sendaiurl as url_hatvp",
         // URLs
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("sens_senurl as senurl")
             .select(["senurl.typurlcod as code_url", "senurl.senurlurl as url", "senurl.senurlnumtri as order_num"])
             .whereRef("senurl.senmat", "=", "sen.senmat")
             .orderBy("senurl.senurlnumtri", "asc")).as("urls"),
         // Mandats sénatoriaux
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("sens_elusen as elusen")
             .leftJoin("sens_etadebman as etadebman", "etadebman.etadebmancod", "elusen.etadebmancod")
             .leftJoin("sens_etafinman as etafinman", "etafinman.etafinmancod", "elusen.etafinmancod")
@@ -61,7 +59,6 @@ export async function* findAll() {
             .orderBy("elusen.eludatdeb", (ob) => ob.desc().nullsLast())).as("mandats_senateur"),
         // Commissions
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("sens_memcom as memcom")
             .leftJoin("sens_com as com2", "com2.orgcod", "memcom.orgcod")
             .leftJoin("sens_typorg as typorg", "typorg.typorgcod", "com2.typorgcod")
@@ -76,7 +73,6 @@ export async function* findAll() {
             "memcom.memcomdatdeb as order_date",
             // Fonctions dans la commission
             jsonArrayFrom(eb2
-                .withSchema("senat")
                 .selectFrom("sens_fonmemcom as fonmemcom")
                 .leftJoin("sens_foncom as foncom", "foncom.foncomcod", "fonmemcom.foncomcod")
                 .select([
@@ -95,7 +91,6 @@ export async function* findAll() {
             .orderBy("memcom.memcomdatdeb", (ob) => ob.desc().nullsLast())).as("commissions"),
         // Délégations
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("sens_memdelega as memdelega")
             .leftJoin("sens_delega as delega", "delega.orgcod", "memdelega.orgcod")
             .leftJoin("sens_designorg as designorg", "designorg.designcod", "memdelega.designcod")
@@ -111,7 +106,6 @@ export async function* findAll() {
             "memdelega.memdelegadatdeb as order_date",
             // Fonctions dans la délégation
             jsonArrayFrom(eb2
-                .withSchema("senat")
                 .selectFrom("sens_fonmemdelega as fonmemdelega")
                 .leftJoin("sens_fondelega as fondelega", "fondelega.fondelcod", "fonmemdelega.fondelcod")
                 .select([
@@ -130,7 +124,6 @@ export async function* findAll() {
             .orderBy("memdelega.memdelegadatdeb", (ob) => ob.desc().nullsLast())).as("delegations"),
         // Groupes politiques
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("sens_memgrppol as memgrppol")
             .leftJoin("sens_grppol as grppol2", "grppol2.grppolcod", "memgrppol.grppolcod")
             .leftJoin("sens_typapppol as typapppol", "typapppol.typapppolcod", "memgrppol.typapppolcod")
@@ -146,7 +139,6 @@ export async function* findAll() {
             "memgrppol.memgrppoldatdeb as order_date",
             // Fonctions dans le groupe politique
             jsonArrayFrom(eb2
-                .withSchema("senat")
                 .selectFrom("sens_fonmemgrppol as fonmemgrppol")
                 .leftJoin("sens_fongrppol as fongrppol", "fongrppol.fongrppolcod", "fonmemgrppol.fongrppolcod")
                 .select([
@@ -165,7 +157,6 @@ export async function* findAll() {
             .orderBy("memgrppol.memgrppoldatdeb", (ob) => ob.desc().nullsLast())).as("groupes"),
         // Organismes divers (groupes d'études, missions, etc.)
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("sens_memorg as memorg")
             .leftJoin("sens_org as org", "org.orgcod", "memorg.orgcod")
             .leftJoin("sens_typorg as typorg4", "typorg4.typorgcod", "org.typorgcod")
@@ -180,7 +171,6 @@ export async function* findAll() {
             "memorg.memorgdatdeb as order_date",
             // Fonctions dans l'organisme
             jsonArrayFrom(eb2
-                .withSchema("senat")
                 .selectFrom("sens_fonmemorg as fonmemorg")
                 .leftJoin("sens_fonorg as fonorg", "fonorg.fonorgcod", "fonmemorg.fonorgcod")
                 .select([
@@ -199,9 +189,7 @@ export async function* findAll() {
             .orderBy("memorg.memorgdatdeb", (ob) => ob.desc().nullsLast())).as("organismes"),
         // Groupes sénatoriaux (groupes d'amitié)
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom(eb
-            .withSchema("senat")
             .selectFrom("sens_memgrpsen as memgrpsen_raw")
             .select([
             "memgrpsen_raw.orgcod as orgcod",
@@ -231,7 +219,6 @@ export async function* findAll() {
             "memgrpsen.memgrpsendatent as order_date",
             // Fonctions dans le groupe sénatorial
             jsonArrayFrom(eb2
-                .withSchema("senat")
                 .selectFrom("sens_fonmemgrpsen as fonmemgrpsen")
                 .leftJoin("sens_fongrpsen as fongrpsen", "fongrpsen.fongrpsencod", "fonmemgrpsen.fongrpsencod")
                 .select([
@@ -249,7 +236,6 @@ export async function* findAll() {
             .orderBy("memgrpsen.memgrpsendatent", (ob) => ob.desc().nullsLast())).as("groupes_senatoriaux"),
         // Fonctions au bureau du Sénat
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("sens_senbur as senbur")
             .leftJoin("sens_bur as bur", "bur.burcod", "senbur.burcod")
             .select([
@@ -266,7 +252,6 @@ export async function* findAll() {
             .orderBy("senbur.senburdatdeb", (ob) => ob.desc().nullsLast())).as("fonctions_bureau"),
         // Points de contact
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("sens_poicon as poicon")
             .select((eb2) => [
             sql `poicon.poiconid::text`.as("id"),
@@ -275,7 +260,6 @@ export async function* findAll() {
             "poicon.poiconnumtri as order_num",
             // Adresses
             jsonArrayFrom(eb2
-                .withSchema("senat")
                 .selectFrom("sens_adresse as adresse")
                 .select([
                 "adresse.adrnumvoi as numero_voie",
@@ -293,7 +277,6 @@ export async function* findAll() {
                 .orderBy("adresse.adrnumtri", "asc")).as("adresses"),
             // Téléphones
             jsonArrayFrom(eb2
-                .withSchema("senat")
                 .selectFrom("sens_telephone as telephone")
                 .select([
                 "telephone.typtelcod as type",